| Index: Source/core/loader/ProgressTracker.cpp
|
| diff --git a/Source/core/loader/ProgressTracker.cpp b/Source/core/loader/ProgressTracker.cpp
|
| index bf36774238b8974e32b3ce8bdfdb02f57cc47505..349ae6776c997ea8e6042fd40625eb2d2e41d209 100644
|
| --- a/Source/core/loader/ProgressTracker.cpp
|
| +++ b/Source/core/loader/ProgressTracker.cpp
|
| @@ -30,8 +30,8 @@
|
| #include "core/loader/DocumentLoader.h"
|
| #include "core/loader/FrameLoader.h"
|
| #include "core/loader/FrameLoaderClient.h"
|
| -#include "core/loader/FrameLoaderStateMachine.h"
|
| #include "core/page/Frame.h"
|
| +#include "core/page/FrameView.h"
|
| #include "core/platform/Logging.h"
|
| #include "core/platform/network/ResourceResponse.h"
|
| #include <wtf/CurrentTime.h>
|
| @@ -196,7 +196,7 @@ void ProgressTracker::incrementProgress(unsigned long identifier, const char*, i
|
| percentOfRemainingBytes = 1.0;
|
|
|
| // For documents that use WebCore's layout system, treat first layout as the half-way point.
|
| - bool useClampedMaxProgress = !frame->loader()->stateMachine()->firstLayoutDone();
|
| + bool useClampedMaxProgress = !frame->view()->didFirstLayout();
|
| double maxProgressValue = useClampedMaxProgress ? 0.5 : finalProgressValue;
|
| increment = (maxProgressValue - m_progressValue) * percentOfRemainingBytes;
|
| m_progressValue += increment;
|
|
|