OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 13 matching lines...) Expand all Loading... |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "core/loader/ProgressTracker.h" | 27 #include "core/loader/ProgressTracker.h" |
28 | 28 |
29 #include "core/inspector/InspectorInstrumentation.h" | 29 #include "core/inspector/InspectorInstrumentation.h" |
30 #include "core/loader/FrameLoader.h" | 30 #include "core/loader/FrameLoader.h" |
31 #include "core/loader/FrameLoaderClient.h" | 31 #include "core/loader/FrameLoaderClient.h" |
32 #include "core/page/Frame.h" | 32 #include "core/page/Frame.h" |
33 #include "core/page/FrameView.h" | 33 #include "core/page/FrameView.h" |
34 #include "core/platform/Logging.h" | 34 #include "platform/Logging.h" |
35 #include "core/platform/network/ResourceResponse.h" | 35 #include "core/platform/network/ResourceResponse.h" |
36 #include "wtf/CurrentTime.h" | 36 #include "wtf/CurrentTime.h" |
37 #include "wtf/text/CString.h" | 37 #include "wtf/text/CString.h" |
38 | 38 |
39 using std::min; | 39 using std::min; |
40 | 40 |
41 namespace WebCore { | 41 namespace WebCore { |
42 | 42 |
43 // Always start progress at initialProgressValue. This helps provide feedback as | 43 // Always start progress at initialProgressValue. This helps provide feedback as |
44 // soon as a load starts. | 44 // soon as a load starts. |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 return; | 233 return; |
234 | 234 |
235 // Adjust the total expected bytes to account for any overage/underage. | 235 // Adjust the total expected bytes to account for any overage/underage. |
236 long long delta = item->bytesReceived - item->estimatedLength; | 236 long long delta = item->bytesReceived - item->estimatedLength; |
237 m_totalPageAndResourceBytesToLoad += delta; | 237 m_totalPageAndResourceBytesToLoad += delta; |
238 | 238 |
239 m_progressItems.remove(identifier); | 239 m_progressItems.remove(identifier); |
240 } | 240 } |
241 | 241 |
242 } | 242 } |
OLD | NEW |