| Index: Source/web/WebLocalFrameImpl.cpp
|
| diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
|
| index 4ed3d84b79ed8cf92ccbfbf500873526525e86f2..93f5483a6bf057b5791ed330235400e9d712e3f8 100644
|
| --- a/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/Source/web/WebLocalFrameImpl.cpp
|
| @@ -96,6 +96,7 @@
|
| #include "core/editing/TextIterator.h"
|
| #include "core/editing/htmlediting.h"
|
| #include "core/editing/markup.h"
|
| +#include "core/fetch/ResourceFetcher.h"
|
| #include "core/frame/Console.h"
|
| #include "core/frame/LocalDOMWindow.h"
|
| #include "core/frame/FrameHost.h"
|
| @@ -874,9 +875,16 @@ void WebLocalFrameImpl::sendPings(const WebNode& linkNode, const WebURL& destina
|
|
|
| bool WebLocalFrameImpl::isLoading() const
|
| {
|
| - if (!frame())
|
| + if (!frame() || !frame()->document())
|
| + return false;
|
| + return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || !frame()->document()->loadEventFinished();
|
| +}
|
| +
|
| +bool WebLocalFrameImpl::isResourceLoadInProgress() const
|
| +{
|
| + if (!frame() || !frame()->document())
|
| return false;
|
| - return frame()->loader().isLoading();
|
| + return frame()->document()->fetcher()->requestCount();
|
| }
|
|
|
| void WebLocalFrameImpl::stopLoading()
|
|
|