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 14 matching lines...) Expand all Loading... |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "ProgressTracker.h" | 27 #include "ProgressTracker.h" |
28 | 28 |
29 #include "DocumentLoader.h" | 29 #include "DocumentLoader.h" |
30 #include "Frame.h" | 30 #include "Frame.h" |
31 #include "FrameLoader.h" | 31 #include "FrameLoader.h" |
32 #include "FrameLoaderClient.h" | 32 #include "FrameLoaderClient.h" |
33 #include "FrameLoaderStateMachine.h" | 33 #include "FrameLoaderStateMachine.h" |
34 #include "InspectorInstrumentation.h" | 34 #include "InspectorInstrumentation.h" |
35 #include "Logging.h" | 35 #include "core/platform/Logging.h" |
36 #include "core/platform/network/ResourceResponse.h" | 36 #include "core/platform/network/ResourceResponse.h" |
37 #include <wtf/CurrentTime.h> | 37 #include <wtf/CurrentTime.h> |
38 #include <wtf/text/CString.h> | 38 #include <wtf/text/CString.h> |
39 | 39 |
40 using std::min; | 40 using std::min; |
41 | 41 |
42 namespace WebCore { | 42 namespace WebCore { |
43 | 43 |
44 // Always start progress at initialProgressValue. This helps provide feedback as
| 44 // Always start progress at initialProgressValue. This helps provide feedback as
|
45 // soon as a load starts. | 45 // soon as a load starts. |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 return; | 234 return; |
235 | 235 |
236 // Adjust the total expected bytes to account for any overage/underage. | 236 // Adjust the total expected bytes to account for any overage/underage. |
237 long long delta = item->bytesReceived - item->estimatedLength; | 237 long long delta = item->bytesReceived - item->estimatedLength; |
238 m_totalPageAndResourceBytesToLoad += delta; | 238 m_totalPageAndResourceBytesToLoad += delta; |
239 | 239 |
240 m_progressItems.remove(identifier); | 240 m_progressItems.remove(identifier); |
241 } | 241 } |
242 | 242 |
243 } | 243 } |
OLD | NEW |