| Index: Source/web/FrameLoaderClientImpl.h
|
| diff --git a/Source/web/FrameLoaderClientImpl.h b/Source/web/FrameLoaderClientImpl.h
|
| index 08f23ad1a25f26c3e9fceaeabfa64bba2093f281..31a34204fd0646970751cb7324fc350742985224 100644
|
| --- a/Source/web/FrameLoaderClientImpl.h
|
| +++ b/Source/web/FrameLoaderClientImpl.h
|
| @@ -43,14 +43,14 @@ class WebLocalFrameImpl;
|
| class WebPluginContainerImpl;
|
| class WebPluginLoadObserver;
|
|
|
| -class FrameLoaderClientImpl FINAL : public WebCore::FrameLoaderClient {
|
| +class FrameLoaderClientImpl FINAL : public blink::FrameLoaderClient {
|
| public:
|
| FrameLoaderClientImpl(WebLocalFrameImpl* webFrame);
|
| virtual ~FrameLoaderClientImpl();
|
|
|
| WebLocalFrameImpl* webFrame() const { return m_webFrame; }
|
|
|
| - // WebCore::FrameLoaderClient ----------------------------------------------
|
| + // blink::FrameLoaderClient ----------------------------------------------
|
|
|
| // Notifies the WebView delegate that the JS window object has been cleared,
|
| // giving it a chance to bind native objects to the window before script
|
| @@ -66,90 +66,90 @@ public:
|
| virtual bool allowScriptExtension(const String& extensionName, int extensionGroup, int worldId) OVERRIDE;
|
|
|
| virtual bool hasWebView() const OVERRIDE;
|
| - virtual WebCore::Frame* opener() const OVERRIDE;
|
| - virtual void setOpener(WebCore::Frame*) OVERRIDE;
|
| - virtual WebCore::Frame* parent() const OVERRIDE;
|
| - virtual WebCore::Frame* top() const OVERRIDE;
|
| - virtual WebCore::Frame* previousSibling() const OVERRIDE;
|
| - virtual WebCore::Frame* nextSibling() const OVERRIDE;
|
| - virtual WebCore::Frame* firstChild() const OVERRIDE;
|
| - virtual WebCore::Frame* lastChild() const OVERRIDE;
|
| + virtual blink::Frame* opener() const OVERRIDE;
|
| + virtual void setOpener(blink::Frame*) OVERRIDE;
|
| + virtual blink::Frame* parent() const OVERRIDE;
|
| + virtual blink::Frame* top() const OVERRIDE;
|
| + virtual blink::Frame* previousSibling() const OVERRIDE;
|
| + virtual blink::Frame* nextSibling() const OVERRIDE;
|
| + virtual blink::Frame* firstChild() const OVERRIDE;
|
| + virtual blink::Frame* lastChild() const OVERRIDE;
|
| virtual void detachedFromParent() OVERRIDE;
|
| - virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) OVERRIDE;
|
| - virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) OVERRIDE;
|
| - virtual void dispatchDidChangeResourcePriority(unsigned long identifier, WebCore::ResourceLoadPriority, int intraPriorityValue) OVERRIDE;
|
| - virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) OVERRIDE;
|
| - virtual void dispatchDidLoadResourceFromMemoryCache(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) OVERRIDE;
|
| + virtual void dispatchWillSendRequest(blink::DocumentLoader*, unsigned long identifier, blink::ResourceRequest&, const blink::ResourceResponse& redirectResponse) OVERRIDE;
|
| + virtual void dispatchDidReceiveResponse(blink::DocumentLoader*, unsigned long identifier, const blink::ResourceResponse&) OVERRIDE;
|
| + virtual void dispatchDidChangeResourcePriority(unsigned long identifier, blink::ResourceLoadPriority, int intraPriorityValue) OVERRIDE;
|
| + virtual void dispatchDidFinishLoading(blink::DocumentLoader*, unsigned long identifier) OVERRIDE;
|
| + virtual void dispatchDidLoadResourceFromMemoryCache(const blink::ResourceRequest&, const blink::ResourceResponse&) OVERRIDE;
|
| virtual void dispatchDidHandleOnloadEvents() OVERRIDE;
|
| virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() OVERRIDE;
|
| - virtual void dispatchDidNavigateWithinPage(WebCore::HistoryItem*, WebCore::HistoryCommitType) OVERRIDE;
|
| + virtual void dispatchDidNavigateWithinPage(blink::HistoryItem*, blink::HistoryCommitType) OVERRIDE;
|
| virtual void dispatchWillClose() OVERRIDE;
|
| virtual void dispatchDidStartProvisionalLoad(bool isTransitionNavigation) OVERRIDE;
|
| virtual void dispatchDidReceiveTitle(const String&) OVERRIDE;
|
| - virtual void dispatchDidChangeIcons(WebCore::IconType) OVERRIDE;
|
| - virtual void dispatchDidCommitLoad(WebCore::LocalFrame*, WebCore::HistoryItem*, WebCore::HistoryCommitType) OVERRIDE;
|
| - virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) OVERRIDE;
|
| - virtual void dispatchDidFailLoad(const WebCore::ResourceError&) OVERRIDE;
|
| + virtual void dispatchDidChangeIcons(blink::IconType) OVERRIDE;
|
| + virtual void dispatchDidCommitLoad(blink::LocalFrame*, blink::HistoryItem*, blink::HistoryCommitType) OVERRIDE;
|
| + virtual void dispatchDidFailProvisionalLoad(const blink::ResourceError&) OVERRIDE;
|
| + virtual void dispatchDidFailLoad(const blink::ResourceError&) OVERRIDE;
|
| virtual void dispatchDidFinishDocumentLoad() OVERRIDE;
|
| virtual void dispatchDidFinishLoad() OVERRIDE;
|
| virtual void dispatchDidFirstVisuallyNonEmptyLayout() OVERRIDE;
|
|
|
| virtual void dispatchDidChangeThemeColor() OVERRIDE;
|
| - virtual WebCore::NavigationPolicy decidePolicyForNavigation(const WebCore::ResourceRequest&, WebCore::DocumentLoader*, WebCore::NavigationPolicy, bool isTransitionNavigation) OVERRIDE;
|
| + virtual blink::NavigationPolicy decidePolicyForNavigation(const blink::ResourceRequest&, blink::DocumentLoader*, blink::NavigationPolicy, bool isTransitionNavigation) OVERRIDE;
|
| virtual void dispatchAddNavigationTransitionData(const String& allowedDestinationOrigin, const String& selector, const String& markup) OVERRIDE;
|
| - virtual void dispatchWillRequestResource(WebCore::FetchRequest*) OVERRIDE;
|
| - virtual void dispatchWillSendSubmitEvent(WebCore::HTMLFormElement*) OVERRIDE;
|
| - virtual void dispatchWillSubmitForm(WebCore::HTMLFormElement*) OVERRIDE;
|
| - virtual void didStartLoading(WebCore::LoadStartType) OVERRIDE;
|
| + virtual void dispatchWillRequestResource(blink::FetchRequest*) OVERRIDE;
|
| + virtual void dispatchWillSendSubmitEvent(blink::HTMLFormElement*) OVERRIDE;
|
| + virtual void dispatchWillSubmitForm(blink::HTMLFormElement*) OVERRIDE;
|
| + virtual void didStartLoading(blink::LoadStartType) OVERRIDE;
|
| virtual void didStopLoading() OVERRIDE;
|
| virtual void progressEstimateChanged(double progressEstimate) OVERRIDE;
|
| - virtual void loadURLExternally(const WebCore::ResourceRequest&, WebCore::NavigationPolicy, const String& suggestedName = String()) OVERRIDE;
|
| + virtual void loadURLExternally(const blink::ResourceRequest&, blink::NavigationPolicy, const String& suggestedName = String()) OVERRIDE;
|
| virtual bool navigateBackForward(int offset) const OVERRIDE;
|
| virtual void didAccessInitialDocument() OVERRIDE;
|
| virtual void didDisplayInsecureContent() OVERRIDE;
|
| - virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL& insecureURL) OVERRIDE;
|
| - virtual void didDetectXSS(const WebCore::KURL&, bool didBlockEntirePage) OVERRIDE;
|
| - virtual void didDispatchPingLoader(const WebCore::KURL&) OVERRIDE;
|
| + virtual void didRunInsecureContent(blink::SecurityOrigin*, const blink::KURL& insecureURL) OVERRIDE;
|
| + virtual void didDetectXSS(const blink::KURL&, bool didBlockEntirePage) OVERRIDE;
|
| + virtual void didDispatchPingLoader(const blink::KURL&) OVERRIDE;
|
| virtual void selectorMatchChanged(const Vector<String>& addedSelectors, const Vector<String>& removedSelectors) OVERRIDE;
|
| - virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(WebCore::LocalFrame*, const WebCore::ResourceRequest&, const WebCore::SubstituteData&) OVERRIDE;
|
| - virtual WTF::String userAgent(const WebCore::KURL&) OVERRIDE;
|
| + virtual PassRefPtr<blink::DocumentLoader> createDocumentLoader(blink::LocalFrame*, const blink::ResourceRequest&, const blink::SubstituteData&) OVERRIDE;
|
| + virtual WTF::String userAgent(const blink::KURL&) OVERRIDE;
|
| virtual WTF::String doNotTrackValue() OVERRIDE;
|
| virtual void transitionToCommittedForNewPage() OVERRIDE;
|
| - virtual PassRefPtr<WebCore::LocalFrame> createFrame(const WebCore::KURL&, const WTF::AtomicString& name, const WebCore::Referrer&, WebCore::HTMLFrameOwnerElement*) OVERRIDE;
|
| + virtual PassRefPtr<blink::LocalFrame> createFrame(const blink::KURL&, const WTF::AtomicString& name, const blink::Referrer&, blink::HTMLFrameOwnerElement*) OVERRIDE;
|
| virtual bool canCreatePluginWithoutRenderer(const String& mimeType) const;
|
| - virtual PassRefPtr<WebCore::Widget> createPlugin(
|
| - WebCore::HTMLPlugInElement*, const WebCore::KURL&,
|
| + virtual PassRefPtr<blink::Widget> createPlugin(
|
| + blink::HTMLPlugInElement*, const blink::KURL&,
|
| const Vector<WTF::String>&, const Vector<WTF::String>&,
|
| const WTF::String&, bool loadManually, DetachedPluginPolicy) OVERRIDE;
|
| - virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(
|
| - WebCore::HTMLAppletElement*,
|
| - const WebCore::KURL& /* base_url */,
|
| + virtual PassRefPtr<blink::Widget> createJavaAppletWidget(
|
| + blink::HTMLAppletElement*,
|
| + const blink::KURL& /* base_url */,
|
| const Vector<WTF::String>& paramNames,
|
| const Vector<WTF::String>& paramValues) OVERRIDE;
|
| - virtual WebCore::ObjectContentType objectContentType(
|
| - const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) OVERRIDE;
|
| + virtual blink::ObjectContentType objectContentType(
|
| + const blink::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) OVERRIDE;
|
| virtual void didChangeScrollOffset() OVERRIDE;
|
| virtual void didUpdateCurrentHistoryItem() OVERRIDE;
|
| virtual bool allowScript(bool enabledPerSettings) OVERRIDE;
|
| - virtual bool allowScriptFromSource(bool enabledPerSettings, const WebCore::KURL& scriptURL) OVERRIDE;
|
| + virtual bool allowScriptFromSource(bool enabledPerSettings, const blink::KURL& scriptURL) OVERRIDE;
|
| virtual bool allowPlugins(bool enabledPerSettings) OVERRIDE;
|
| - virtual bool allowImage(bool enabledPerSettings, const WebCore::KURL& imageURL) OVERRIDE;
|
| - virtual bool allowMedia(const WebCore::KURL& mediaURL) OVERRIDE;
|
| - virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, WebCore::SecurityOrigin*, const WebCore::KURL&) OVERRIDE;
|
| - virtual bool allowRunningInsecureContent(bool enabledPerSettings, WebCore::SecurityOrigin*, const WebCore::KURL&) OVERRIDE;
|
| + virtual bool allowImage(bool enabledPerSettings, const blink::KURL& imageURL) OVERRIDE;
|
| + virtual bool allowMedia(const blink::KURL& mediaURL) OVERRIDE;
|
| + virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, blink::SecurityOrigin*, const blink::KURL&) OVERRIDE;
|
| + virtual bool allowRunningInsecureContent(bool enabledPerSettings, blink::SecurityOrigin*, const blink::KURL&) OVERRIDE;
|
| virtual void didNotAllowScript() OVERRIDE;
|
| virtual void didNotAllowPlugins() OVERRIDE;
|
|
|
| virtual WebCookieJar* cookieJar() const OVERRIDE;
|
| - virtual bool willCheckAndDispatchMessageEvent(WebCore::SecurityOrigin* target, WebCore::MessageEvent*) const OVERRIDE;
|
| + virtual bool willCheckAndDispatchMessageEvent(blink::SecurityOrigin* target, blink::MessageEvent*) const OVERRIDE;
|
| virtual void didChangeName(const String&) OVERRIDE;
|
|
|
| - virtual void dispatchWillOpenSocketStream(WebCore::SocketStreamHandle*) OVERRIDE;
|
| + virtual void dispatchWillOpenSocketStream(blink::SocketStreamHandle*) OVERRIDE;
|
| virtual void dispatchWillOpenWebSocket(blink::WebSocketHandle*) OVERRIDE;
|
|
|
| virtual void dispatchWillStartUsingPeerConnectionHandler(blink::WebRTCPeerConnectionHandler*) OVERRIDE;
|
|
|
| - virtual void didRequestAutocomplete(WebCore::HTMLFormElement*) OVERRIDE;
|
| + virtual void didRequestAutocomplete(blink::HTMLFormElement*) OVERRIDE;
|
|
|
| virtual bool allowWebGL(bool enabledPerSettings) OVERRIDE;
|
| virtual void didLoseWebGLContext(int arbRobustnessContextLostReason) OVERRIDE;
|
| @@ -157,7 +157,7 @@ public:
|
| virtual void dispatchWillInsertBody() OVERRIDE;
|
|
|
| virtual PassOwnPtr<WebServiceWorkerProvider> createServiceWorkerProvider() OVERRIDE;
|
| - virtual WebCore::SharedWorkerRepositoryClient* sharedWorkerRepositoryClient() OVERRIDE;
|
| + virtual blink::SharedWorkerRepositoryClient* sharedWorkerRepositoryClient() OVERRIDE;
|
|
|
| virtual PassOwnPtr<WebApplicationCacheHost> createApplicationCacheHost(WebApplicationCacheHostClient*) OVERRIDE;
|
|
|
| @@ -168,14 +168,14 @@ public:
|
| private:
|
| virtual bool isFrameLoaderClientImpl() const OVERRIDE { return true; }
|
|
|
| - PassOwnPtr<WebPluginLoadObserver> pluginLoadObserver(WebCore::DocumentLoader*);
|
| + PassOwnPtr<WebPluginLoadObserver> pluginLoadObserver(blink::DocumentLoader*);
|
|
|
| // The WebFrame that owns this object and manages its lifetime. Therefore,
|
| // the web frame object is guaranteed to exist.
|
| WebLocalFrameImpl* m_webFrame;
|
| };
|
|
|
| -DEFINE_TYPE_CASTS(FrameLoaderClientImpl, WebCore::FrameLoaderClient, client, client->isFrameLoaderClientImpl(), client.isFrameLoaderClientImpl());
|
| +DEFINE_TYPE_CASTS(FrameLoaderClientImpl, blink::FrameLoaderClient, client, client->isFrameLoaderClientImpl(), client.isFrameLoaderClientImpl());
|
|
|
| } // namespace blink
|
|
|
|
|