Conversion of more places in Blink to use WebLocalFrame

I'm breaking up my local mega patch to land in several chunks. This is
the Blink portion that's needed to build blink_tests successfully with
WebLocalFrame subclassing WebFrame.

Overall, the changes are pretty straightforward. One method changed back
to taking a WebFrame*. It's not yet clear how we're going to coordinate
frame detach for remote frames. Once there's a clear story, I'll update
it appropriately.

The typedef remains for now, as I work on landing the Chrome bits that
depend on this.

BUG=346764
R=eseidel@chromium.org

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

git-svn-id: svn://svn.chromium.org/blink/trunk@170717 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

@@ -722,7 +722,7 @@ bool FrameLoaderClientImpl::willCheckAndDispatchMessageEvent(
     if (!m_webFrame->client())
         return false;
 
-    WebFrame* source = 0;
+    WebLocalFrame* source = 0;
     if (event && event->source() && event->source()->toDOMWindow() && event->source()->toDOMWindow()->document())
         source = WebFrameImpl::fromFrame(event->source()->toDOMWindow()->document()->frame());
     return m_webFrame->client()->willCheckAndDispatchMessageEvent(

third_party/WebKit/Source/web/WebDOMFileSystem.cpp

@@ -57,7 +57,7 @@ WebDOMFileSystem WebDOMFileSystem::fromV8Value(v8::Handle<v8::Value> value)
 }
 
 WebDOMFileSystem WebDOMFileSystem::create(
-    WebFrame* frame,
+    WebLocalFrame* frame,
     WebFileSystemType type,
     const WebString& name,
     const WebURL& rootURL,

third_party/WebKit/Source/web/WebDocument.cpp

@@ -102,7 +102,7 @@ WebURL WebDocument::openSearchDescriptionURL() const
     return const_cast<Document*>(constUnwrap<Document>())->openSearchDescriptionURL();
 }
 
-WebFrame* WebDocument::frame() const
+WebLocalFrame* WebDocument::frame() const
 {
     return WebFrameImpl::fromFrame(constUnwrap<Document>()->frame());
 }

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

@@ -206,14 +206,14 @@ void WebEmbeddedWorkerImpl::prepareShadowPageForLoader()
 }
 
 void WebEmbeddedWorkerImpl::willSendRequest(
-    WebFrame* frame, unsigned, WebURLRequest& request,
+    WebLocalFrame* frame, unsigned, WebURLRequest& request,
     const WebURLResponse& redirectResponse)
 {
     if (m_networkProvider)
         m_networkProvider->willSendRequest(frame->dataSource(), request);
 }
 
-void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebFrame* frame)
+void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame)
 {
     ASSERT(!m_mainScriptLoader);
     ASSERT(!m_networkProvider);

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h

@@ -69,9 +69,9 @@ private:
 
     // WebFrameClient overrides.
     virtual void willSendRequest(
-        WebFrame*, unsigned identifier, WebURLRequest&,
+        WebLocalFrame*, unsigned identifier, WebURLRequest&,
         const WebURLResponse& redirectResponse) OVERRIDE;
-    virtual void didFinishDocumentLoad(WebFrame*) OVERRIDE;
+    virtual void didFinishDocumentLoad(WebLocalFrame*) OVERRIDE;
 
     void onScriptLoaderFinished();
 

third_party/WebKit/Source/web/WebFrameImpl.cpp

@@ -1626,7 +1626,7 @@ WebString WebFrameImpl::layerTreeAsText(bool showDebugInfo) const
 
 // WebFrameImpl public ---------------------------------------------------------
 
-WebFrame* WebFrame::create(WebFrameClient* client)
+WebLocalFrame* WebFrame::create(WebFrameClient* client)
 {
     return WebFrameImpl::create(client);
 }

third_party/WebKit/Source/web/WebHelperPluginImpl.cpp

@@ -44,7 +44,7 @@ namespace blink {
 
 DEFINE_TYPE_CASTS(WebHelperPluginImpl, WebHelperPlugin, plugin, true, true);
 
-WebHelperPlugin* WebHelperPlugin::create(const WebString& pluginType, WebFrame* frame)
+WebHelperPlugin* WebHelperPlugin::create(const WebString& pluginType, WebLocalFrame* frame)
 {
     OwnPtr<WebHelperPlugin> plugin = adoptPtr<WebHelperPlugin>(new WebHelperPluginImpl());
     if (!toWebHelperPluginImpl(plugin.get())->initialize(pluginType, toWebFrameImpl(frame)))

third_party/WebKit/Source/web/WebLeakDetector.cpp

@@ -77,7 +77,7 @@ void numberOfDOMObjects(blink::WebFrame *frame, unsigned* numberOfLiveDocuments,
 
 namespace blink {
 
-void WebLeakDetector::collectGarbargeAndGetDOMCounts(WebFrame* frame, unsigned* numberOfLiveDocuments, unsigned* numberOfLiveNodes)
+void WebLeakDetector::collectGarbargeAndGetDOMCounts(WebLocalFrame* frame, unsigned* numberOfLiveDocuments, unsigned* numberOfLiveNodes)
 {
     // FIXME: Count other DOM objects using WTF::dumpRefCountedInstanceCounts.
     cleanUpDOMObjects(frame);

third_party/WebKit/Source/web/WebPageSerializer.cpp

@@ -194,7 +194,7 @@ WebCString WebPageSerializer::serializeToMHTMLUsingBinaryEncoding(WebView* view)
     return WebCString(mhtml->data(), mhtml->size());
 }
 
-bool WebPageSerializer::serialize(WebFrame* frame,
+bool WebPageSerializer::serialize(WebLocalFrame* frame,
                                   bool recursive,
                                   WebPageSerializerClient* client,
                                   const WebVector<WebURL>& links,

third_party/WebKit/Source/web/WebRange.cpp

@@ -114,7 +114,7 @@ WebRange WebRange::expandedToParagraph() const
 }
 
 // static
-WebRange WebRange::fromDocumentRange(WebFrame* frame, int start, int length)
+WebRange WebRange::fromDocumentRange(WebLocalFrame* frame, int start, int length)
 {
     WebCore::LocalFrame* webFrame = toWebFrameImpl(frame)->frame();
     Element* selectionRoot = webFrame->selection().rootEditableElement();

third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

@@ -205,14 +205,14 @@ void WebSharedWorkerImpl::initializeLoader(const WebURL& url)
     webFrame->frame()->loader().load(FrameLoadRequest(0, ResourceRequest(url), SubstituteData(buffer, "text/html", "UTF-8", KURL())));
 }
 
-WebApplicationCacheHost* WebSharedWorkerImpl::createApplicationCacheHost(WebFrame*, WebApplicationCacheHostClient* appcacheHostClient)
+WebApplicationCacheHost* WebSharedWorkerImpl::createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient* appcacheHostClient)
 {
     if (client())
         return client()->createApplicationCacheHost(appcacheHostClient);
     return 0;
 }
 
-void WebSharedWorkerImpl::didFinishDocumentLoad(WebFrame* frame)
+void WebSharedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame)
 {
     ASSERT(!m_loadingDocument);
     ASSERT(!m_mainScriptLoader);

third_party/WebKit/Source/web/WebSharedWorkerImpl.h

@@ -89,8 +89,8 @@ public:
     virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<WebCore::ExecutionContextTask>) OVERRIDE;
 
     // WebFrameClient methods to support resource loading thru the 'shadow page'.
-    virtual WebApplicationCacheHost* createApplicationCacheHost(WebFrame*, WebApplicationCacheHostClient*) OVERRIDE;
-    virtual void didFinishDocumentLoad(WebFrame*) OVERRIDE;
+    virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) OVERRIDE;
+    virtual void didFinishDocumentLoad(WebLocalFrame*) OVERRIDE;
 
     // WebSharedWorker methods:
     virtual void startWorkerContext(const WebURL&, const WebString& name, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType) OVERRIDE;

third_party/WebKit/Source/web/WebTestingSupport.cpp

@@ -32,13 +32,13 @@
 
 namespace blink {
 
-void WebTestingSupport::injectInternalsObject(WebFrame* frame)
+void WebTestingSupport::injectInternalsObject(WebLocalFrame* frame)
 {
     v8::HandleScope handleScope(v8::Isolate::GetCurrent());
     WebCoreTestSupport::injectInternalsObject(frame->mainWorldScriptContext());
 }
 
-void WebTestingSupport::resetInternalsObject(WebFrame* frame)
+void WebTestingSupport::resetInternalsObject(WebLocalFrame* frame)
 {
     v8::HandleScope handleScope(v8::Isolate::GetCurrent());
     WebCoreTestSupport::resetInternalsObject(frame->mainWorldScriptContext());

third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.cpp

@@ -48,7 +48,7 @@ namespace {
 
 class TestWebFrameClient : public WebFrameClient {
 public:
-    WebString userAgentOverride(WebFrame* frame, const WebURL& url) OVERRIDE
+    WebString userAgentOverride(WebLocalFrame* frame, const WebURL& url) OVERRIDE
     {
         if (m_userAgentOverride.isEmpty())
             return WebString();

third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp

@@ -145,7 +145,7 @@ void WebViewHelper::reset()
     }
 }
 
-WebFrame* TestWebFrameClient::createChildFrame(WebFrame* parent, const WebString& frameName)
+WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, const WebString& frameName)
 {
     WebFrame* frame = WebFrame::create(this);
     parent->appendChild(frame);

third_party/WebKit/Source/web/tests/FrameTestHelpers.h

@@ -75,7 +75,7 @@ private:
 // frames and need further specialization of WebFrameClient behavior should subclass this.
 class TestWebFrameClient : public WebFrameClient {
 public:
-    virtual WebFrame* createChildFrame(WebFrame* parent, const WebString& frameName) OVERRIDE;
+    virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString& frameName) OVERRIDE;
     virtual void frameDetached(WebFrame*) OVERRIDE;
 };
 

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

@@ -353,13 +353,13 @@ TEST_F(WebFrameTest, LocationSetEmptyPort)
 class CSSCallbackWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     CSSCallbackWebFrameClient() : m_updateCount(0) { }
-    virtual void didMatchCSS(WebFrame*, const WebVector<WebString>& newlyMatchingSelectors, const WebVector<WebString>& stoppedMatchingSelectors) OVERRIDE;
+    virtual void didMatchCSS(WebLocalFrame*, const WebVector<WebString>& newlyMatchingSelectors, const WebVector<WebString>& stoppedMatchingSelectors) OVERRIDE;
 
-    std::map<WebFrame*, std::set<std::string> > m_matchedSelectors;
+    std::map<WebLocalFrame*, std::set<std::string> > m_matchedSelectors;
     int m_updateCount;
 };
 
-void CSSCallbackWebFrameClient::didMatchCSS(WebFrame* frame, const WebVector<WebString>& newlyMatchingSelectors, const WebVector<WebString>& stoppedMatchingSelectors)
+void CSSCallbackWebFrameClient::didMatchCSS(WebLocalFrame* frame, const WebVector<WebString>& newlyMatchingSelectors, const WebVector<WebString>& stoppedMatchingSelectors)
 {
     ++m_updateCount;
     std::set<std::string>& frameSelectors = m_matchedSelectors[frame];
@@ -380,7 +380,7 @@ protected:
     WebFrameCSSCallbackTest()
     {
 
-        m_frame = m_helper.initializeAndLoad("about:blank", true, &m_client)->mainFrame();
+        m_frame = m_helper.initializeAndLoad("about:blank", true, &m_client)->mainFrame()->toWebLocalFrame();
     }
 
     ~WebFrameCSSCallbackTest()
@@ -418,7 +418,7 @@ protected:
 
     CSSCallbackWebFrameClient m_client;
     FrameTestHelpers::WebViewHelper m_helper;
-    WebFrame* m_frame;
+    WebLocalFrame* m_frame;
 };
 
 TEST_F(WebFrameCSSCallbackTest, AuthorStyleSheet)
@@ -2665,7 +2665,7 @@ TEST_F(WebFrameTest, DivScrollIntoEditableTest)
 class TestReloadDoesntRedirectWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     virtual WebNavigationPolicy decidePolicyForNavigation(
-        WebFrame*, WebDataSource::ExtraData*, const WebURLRequest&, WebNavigationType,
+        WebLocalFrame*, WebDataSource::ExtraData*, const WebURLRequest&, WebNavigationType,
         WebNavigationPolicy defaultPolicy, bool isRedirect) OVERRIDE
     {
         EXPECT_FALSE(isRedirect);
@@ -2803,7 +2803,7 @@ class ContextLifetimeTestWebFrameClient : public FrameTestHelpers::TestWebFrameC
 public:
     struct Notification {
     public:
-        Notification(WebFrame* frame, v8::Handle<v8::Context> context, int worldId)
+        Notification(WebLocalFrame* frame, v8::Handle<v8::Context> context, int worldId)
             : frame(frame)
             , context(context->GetIsolate(), context)
             , worldId(worldId)
@@ -2820,7 +2820,7 @@ public:
             return other && frame == other->frame && context == other->context && worldId == other->worldId;
         }
 
-        WebFrame* frame;
+        WebLocalFrame* frame;
         v8::Persistent<v8::Context> context;
         int worldId;
     };
@@ -2846,12 +2846,12 @@ public:
     std::vector<Notification*> releaseNotifications;
 
  private:
-    virtual void didCreateScriptContext(WebFrame* frame, v8::Handle<v8::Context> context, int extensionGroup, int worldId) OVERRIDE
+    virtual void didCreateScriptContext(WebLocalFrame* frame, v8::Handle<v8::Context> context, int extensionGroup, int worldId) OVERRIDE
     {
         createNotifications.push_back(new Notification(frame, context, worldId));
     }
 
-    virtual void willReleaseScriptContext(WebFrame* frame, v8::Handle<v8::Context> context, int worldId) OVERRIDE
+    virtual void willReleaseScriptContext(WebLocalFrame* frame, v8::Handle<v8::Context> context, int worldId) OVERRIDE
     {
         releaseNotifications.push_back(new Notification(frame, context, worldId));
     }
@@ -3120,7 +3120,7 @@ TEST_F(WebFrameTest, GetFullHtmlOfPage)
 
 class TestExecuteScriptDuringDidCreateScriptContext : public FrameTestHelpers::TestWebFrameClient {
 public:
-    virtual void didCreateScriptContext(WebFrame* frame, v8::Handle<v8::Context> context, int extensionGroup, int worldId) OVERRIDE
+    virtual void didCreateScriptContext(WebLocalFrame* frame, v8::Handle<v8::Context> context, int extensionGroup, int worldId) OVERRIDE
     {
         frame->executeScript(WebScriptSource("window.history = 'replaced';"));
     }
@@ -4067,13 +4067,13 @@ public:
     {
     }
 
-    virtual void didFailProvisionalLoad(WebFrame* frame, const WebURLError& error)
+    virtual void didFailProvisionalLoad(WebLocalFrame* frame, const WebURLError& error)
     {
         frame->loadHTMLString("This should appear", toKURL("data:text/html,chromewebdata"), error.unreachableURL, true);
         runPendingTasks();
     }
 
-    virtual void didCommitProvisionalLoad(WebFrame* frame, bool)
+    virtual void didCommitProvisionalLoad(WebLocalFrame* frame, bool)
     {
         if (frame->dataSource()->response().url() != WebURL(URLTestHelpers::toKURL("about:blank")))
             m_commitCalled = true;
@@ -4125,18 +4125,18 @@ public:
     {
     }
 
-    virtual void didCommitProvisionalLoad(WebFrame*, bool) OVERRIDE
+    virtual void didCommitProvisionalLoad(WebLocalFrame*, bool) OVERRIDE
     {
         m_numBodies = 0;
         m_didLoad = true;
     }
 
-    virtual void didCreateDocumentElement(WebFrame*) OVERRIDE
+    virtual void didCreateDocumentElement(WebLocalFrame*) OVERRIDE
     {
         EXPECT_EQ(0, m_numBodies);
     }
 
-    virtual void willInsertBody(WebFrame*) OVERRIDE
+    virtual void willInsertBody(WebLocalFrame*) OVERRIDE
     {
         m_numBodies++;
     }
@@ -4461,7 +4461,7 @@ public:
     {
     }
 
-    virtual void didAccessInitialDocument(WebFrame* frame)
+    virtual void didAccessInitialDocument(WebLocalFrame* frame)
     {
         EXPECT_TRUE(!m_didAccessInitialDocument);
         m_didAccessInitialDocument = true;
@@ -4619,7 +4619,7 @@ public:
     bool wasProgrammaticScroll() const { return m_didScrollMainFrame && m_wasProgrammaticScroll; }
 
     // WebFrameClient:
-    virtual void didChangeScrollOffset(WebFrame* frame) OVERRIDE
+    virtual void didChangeScrollOffset(WebLocalFrame* frame) OVERRIDE
     {
         if (frame->parent())
             return;
@@ -4742,7 +4742,7 @@ TEST_F(WebFrameTest, FirstPartyForCookiesForRedirect)
 class TestNavigationPolicyWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
 
-    virtual void didNavigateWithinPage(WebFrame*, bool)
+    virtual void didNavigateWithinPage(WebLocalFrame*, bool)
     {
         EXPECT_TRUE(false);
     }
@@ -4768,7 +4768,7 @@ TEST_F(WebFrameTest, SimulateFragmentAnchorMiddleClick)
 
 class TestNewWindowWebViewClient : public WebViewClient {
 public:
-    virtual WebView* createView(WebFrame*, const WebURLRequest&, const WebWindowFeatures&,
+    virtual WebView* createView(WebLocalFrame*, const WebURLRequest&, const WebWindowFeatures&,
         const WebString&, WebNavigationPolicy, bool) OVERRIDE
     {
         EXPECT_TRUE(false);
@@ -4783,7 +4783,7 @@ public:
     {
     }
 
-    virtual WebNavigationPolicy decidePolicyForNavigation(WebFrame*, WebDataSource::ExtraData*, const WebURLRequest&,
+    virtual WebNavigationPolicy decidePolicyForNavigation(WebLocalFrame*, WebDataSource::ExtraData*, const WebURLRequest&,
         WebNavigationType, WebNavigationPolicy policy, bool) OVERRIDE
     {
         m_decidePolicyCallCount++;
@@ -4927,7 +4927,7 @@ public:
     int willSendRequestCallCount() const { return m_willSendRequestCallCount; }
     int childFrameCreationCount() const { return m_childFrameCreationCount; }
 
-    virtual WebFrame* createChildFrame(WebFrame* parent, const WebString&)
+    virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString&)
     {
         m_childFrameCreationCount++;
         WebFrame* frame = WebFrame::create(m_client);
@@ -4942,7 +4942,7 @@ public:
         frame->close();
     }
 
-    virtual void willSendRequest(WebFrame* frame, unsigned, WebURLRequest& request, const WebURLResponse&) OVERRIDE
+    virtual void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest& request, const WebURLResponse&) OVERRIDE
     {
         m_policy = request.cachePolicy();
         m_willSendRequestCallCount++;
@@ -5008,7 +5008,7 @@ public:
     {
     }
 
-    virtual void willSendRequest(WebFrame* frame, unsigned, WebURLRequest&, const WebURLResponse&)
+    virtual void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest&, const WebURLResponse&)
     {
         if (toWebFrameImpl(frame)->frame()->loader().loadType() == WebCore::FrameLoadTypeSame)
             m_frameLoadTypeSameSeen = true;
@@ -5113,7 +5113,7 @@ public:
         m_replacesCurrentHistoryItem = false;
         m_frame = 0;
     }
-    void didStartProvisionalLoad(WebFrame* frame)
+    void didStartProvisionalLoad(WebLocalFrame* frame)
     {
         WebDataSource* ds = frame->provisionalDataSource();
         m_replacesCurrentHistoryItem = ds->replacesCurrentHistoryItem();
@@ -5275,7 +5275,7 @@ class FailCreateChildFrame : public WebFrameClient {
 public:
     FailCreateChildFrame() : m_callCount(0) { }
 
-    virtual WebFrame* createChildFrame(WebFrame* parent, const WebString& frameName) OVERRIDE
+    virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString& frameName) OVERRIDE
     {
         ++m_callCount;
         return 0;

third_party/WebKit/Source/web/tests/WebHelperPluginTest.cpp

@@ -30,7 +30,7 @@ public:
     WebHelperPluginFrameClient() : m_createPlaceholder(false) { }
     virtual ~WebHelperPluginFrameClient() { }
 
-    virtual WebPlugin* createPlugin(WebFrame* frame, const WebPluginParams& params) OVERRIDE
+    virtual WebPlugin* createPlugin(WebLocalFrame* frame, const WebPluginParams& params) OVERRIDE
     {
         return m_createPlaceholder ? new FakePlaceholderWebPlugin(frame, params) : new FakeWebPlugin(frame, params);
     }
@@ -63,7 +63,7 @@ protected:
 
 TEST_F(WebHelperPluginTest, CreateAndDestroyAfterWebViewDestruction)
 {
-    m_plugin = adoptPtr(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()));
+    m_plugin = adoptPtr(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()->toWebLocalFrame()));
     EXPECT_TRUE(m_plugin);
     EXPECT_TRUE(m_plugin->getPlugin());
 
@@ -73,7 +73,7 @@ TEST_F(WebHelperPluginTest, CreateAndDestroyAfterWebViewDestruction)
 
 TEST_F(WebHelperPluginTest, CreateAndDestroyBeforeWebViewDestruction)
 {
-    m_plugin = adoptPtr(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()));
+    m_plugin = adoptPtr(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()->toWebLocalFrame()));
     EXPECT_TRUE(m_plugin);
     EXPECT_TRUE(m_plugin->getPlugin());
 
@@ -85,7 +85,7 @@ TEST_F(WebHelperPluginTest, CreateFailsWithPlaceholder)
 {
     m_frameClient.setCreatePlaceholder(true);
 
-    m_plugin = adoptPtr(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()));
+    m_plugin = adoptPtr(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()->toWebLocalFrame()));
     EXPECT_EQ(0, m_plugin.get());
 }
 

third_party/WebKit/Source/web/tests/WebPageNewSerializerTest.cpp

@@ -409,7 +409,7 @@ TEST_F(WebPageNewSerializeTest, NamespaceElementsDontCrash)
     // We just want to make sure nothing crazy happens, namely that no
     // assertions are hit. As a sanity check, we also make sure that some data
     // was returned.
-    WebPageSerializer::serialize(webView()->mainFrame(), true, &client, localLinks, localPaths, WebString(""));
+    WebPageSerializer::serialize(webView()->mainFrame()->toWebLocalFrame(), true, &client, localLinks, localPaths, WebString(""));
 
     EXPECT_GT(counter, 0U);
 }

third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp

@@ -85,7 +85,7 @@ public:
 };
 
 class TestPluginWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
-    virtual WebPlugin* createPlugin(WebFrame* frame, const WebPluginParams& params) OVERRIDE
+    virtual WebPlugin* createPlugin(WebLocalFrame* frame, const WebPluginParams& params) OVERRIDE
     {
         if (params.mimeType == WebString::fromUTF8("application/x-webkit-test-webplugin"))
             return new TestPlugin(frame, params);

third_party/WebKit/Source/web/tests/WebViewTest.cpp

@@ -1273,7 +1273,7 @@ public:
     }
 
     // WebViewClient methods
-    virtual WebView* createView(WebFrame*, const WebURLRequest&, const WebWindowFeatures&, const WebString& name, WebNavigationPolicy, bool) OVERRIDE
+    virtual WebView* createView(WebLocalFrame*, const WebURLRequest&, const WebWindowFeatures&, const WebString& name, WebNavigationPolicy, bool) OVERRIDE
     {
         return m_webViewHelper.initialize(true, 0, 0);
     }
@@ -1458,7 +1458,7 @@ TEST_F(WebViewTest, SmartClipData)
 class CreateChildCounterFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     CreateChildCounterFrameClient() : m_count(0) { }
-    virtual WebFrame* createChildFrame(WebFrame* parent, const WebString& frameName) OVERRIDE;
+    virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString& frameName) OVERRIDE;
 
     int count() const { return m_count; }
 
@@ -1466,7 +1466,7 @@ private:
     int m_count;
 };
 
-WebFrame* CreateChildCounterFrameClient::createChildFrame(WebFrame* parent, const WebString& frameName)
+WebFrame* CreateChildCounterFrameClient::createChildFrame(WebLocalFrame* parent, const WebString& frameName)
 {
     ++m_count;
     return TestWebFrameClient::createChildFrame(parent, frameName);

third_party/WebKit/public/web/WebFrameClient.h

@@ -141,7 +141,7 @@ public:
 
     // This frame is about to be closed. This is called after frameDetached,
     // when the document is being unloaded, due to new one committing.
-    virtual void willClose(WebLocalFrame*) { }
+    virtual void willClose(WebFrame*) { }
 
     // This frame's name has changed.
     virtual void didChangeName(WebLocalFrame*, const WebString&) { }
@@ -294,7 +294,7 @@ public:
         WebLocalFrame*, unsigned identifier, const blink::WebURLRequest::Priority&) { }
 
     virtual void didChangeResourcePriority(
-        WebFrame* webFrame, unsigned identifier, const blink::WebURLRequest::Priority& priority, int) { didChangeResourcePriority(webFrame, identifier, priority); }
+        WebLocalFrame* webFrame, unsigned identifier, const blink::WebURLRequest::Priority& priority, int) { didChangeResourcePriority(webFrame, identifier, priority); }
 
     // The resource request given by identifier succeeded.
     virtual void didFinishResourceLoad(