Commit b7f25a14 authored by japhet@chromium.org's avatar japhet@chromium.org

Move isLoading() from WebFrame to WebLocalFrame

It is a concept that doesn't make sense for a remote frame (whether the load
event has fired), and all callsites are using WebLocalFrames

BUG=

Review URL: https://codereview.chromium.org/555953002

git-svn-id: svn://svn.chromium.org/blink/trunk@181689 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 64bf04b3
...@@ -394,12 +394,6 @@ void WebRemoteFrameImpl::loadHTMLString( ...@@ -394,12 +394,6 @@ void WebRemoteFrameImpl::loadHTMLString(
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
bool WebRemoteFrameImpl::isLoading() const
{
ASSERT_NOT_REACHED();
return false;
}
void WebRemoteFrameImpl::stopLoading() void WebRemoteFrameImpl::stopLoading()
{ {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
......
...@@ -86,7 +86,6 @@ public: ...@@ -86,7 +86,6 @@ public:
virtual void loadHTMLString( virtual void loadHTMLString(
const WebData& html, const WebURL& baseURL, const WebURL& unreachableURL, const WebData& html, const WebURL& baseURL, const WebURL& unreachableURL,
bool replace) OVERRIDE; bool replace) OVERRIDE;
virtual bool isLoading() const OVERRIDE;
virtual void stopLoading() OVERRIDE; virtual void stopLoading() OVERRIDE;
virtual WebDataSource* provisionalDataSource() const OVERRIDE; virtual WebDataSource* provisionalDataSource() const OVERRIDE;
virtual WebDataSource* dataSource() const OVERRIDE; virtual WebDataSource* dataSource() const OVERRIDE;
......
...@@ -371,9 +371,6 @@ public: ...@@ -371,9 +371,6 @@ public:
const WebURL& unreachableURL = WebURL(), const WebURL& unreachableURL = WebURL(),
bool replace = false) = 0; bool replace = false) = 0;
// Returns true if the current frame is busy loading content.
virtual bool isLoading() const = 0;
// Stops any pending loads on the frame and its children. // Stops any pending loads on the frame and its children.
virtual void stopLoading() = 0; virtual void stopLoading() = 0;
......
...@@ -41,6 +41,9 @@ public: ...@@ -41,6 +41,9 @@ public:
// Navigation State ------------------------------------------------------- // Navigation State -------------------------------------------------------
// Returns true if the current frame's load event has not completed.
virtual bool isLoading() const = 0;
// Returns true if any resource load is currently in progress. Exposed // Returns true if any resource load is currently in progress. Exposed
// primarily for use in layout tests. You probably want isLoading() // primarily for use in layout tests. You probably want isLoading()
// instead. // instead.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment