| Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.h
|
| diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.h b/third_party/WebKit/Source/web/FrameLoaderClientImpl.h
|
| index 75ae5b30afd56a1d847803127ae214cc7239d068..032351c5c7a804110050457b0a2c7672409536d4 100644
|
| --- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.h
|
| +++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.h
|
| @@ -32,215 +32,15 @@
|
| #ifndef FrameLoaderClientImpl_h
|
| #define FrameLoaderClientImpl_h
|
|
|
| -#include "core/loader/FrameLoaderClient.h"
|
| -#include "platform/heap/Handle.h"
|
| -#include "platform/weborigin/KURL.h"
|
| -#include "public/platform/WebInsecureRequestPolicy.h"
|
| -#include "wtf/RefPtr.h"
|
| +#include "LocalFrameClientImpl.h"
|
| +
|
| #include <memory>
|
|
|
| namespace blink {
|
|
|
| -class WebDevToolsAgentImpl;
|
| -class WebLocalFrameImpl;
|
| -
|
| -class FrameLoaderClientImpl final : public FrameLoaderClient {
|
| - public:
|
| - static FrameLoaderClientImpl* create(WebLocalFrameImpl*);
|
| -
|
| - ~FrameLoaderClientImpl() override;
|
| -
|
| - DECLARE_VIRTUAL_TRACE();
|
| -
|
| - WebLocalFrameImpl* webFrame() const { return m_webFrame.get(); }
|
| -
|
| - // FrameLoaderClient ----------------------------------------------
|
| -
|
| - void didCreateNewDocument() override;
|
| - // 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
|
| - // parsing begins.
|
| - void dispatchDidClearWindowObjectInMainWorld() override;
|
| - void documentElementAvailable() override;
|
| - void runScriptsAtDocumentElementAvailable() override;
|
| - void runScriptsAtDocumentReady(bool documentIsEmpty) override;
|
| -
|
| - void didCreateScriptContext(v8::Local<v8::Context>,
|
| - int worldId) override;
|
| - void willReleaseScriptContext(v8::Local<v8::Context>, int worldId) override;
|
| -
|
| - // Returns true if we should allow register V8 extensions to be added.
|
| - bool allowScriptExtensions() override;
|
| -
|
| - bool hasWebView() const override;
|
| - bool inShadowTree() const override;
|
| - Frame* opener() const override;
|
| - void setOpener(Frame*) override;
|
| - Frame* parent() const override;
|
| - Frame* top() const override;
|
| - Frame* nextSibling() const override;
|
| - Frame* firstChild() const override;
|
| - void willBeDetached() override;
|
| - void detached(FrameDetachType) override;
|
| - void dispatchWillSendRequest(ResourceRequest&) override;
|
| - void dispatchDidReceiveResponse(const ResourceResponse&) override;
|
| - void dispatchDidLoadResourceFromMemoryCache(const ResourceRequest&,
|
| - const ResourceResponse&) override;
|
| - void dispatchDidHandleOnloadEvents() override;
|
| - void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
|
| - void dispatchDidNavigateWithinPage(HistoryItem*,
|
| - HistoryCommitType,
|
| - bool contentInitiated) override;
|
| - void dispatchWillCommitProvisionalLoad() override;
|
| - void dispatchDidStartProvisionalLoad(DocumentLoader*) override;
|
| - void dispatchDidReceiveTitle(const String&) override;
|
| - void dispatchDidChangeIcons(IconType) override;
|
| - void dispatchDidCommitLoad(HistoryItem*, HistoryCommitType) override;
|
| - void dispatchDidFailProvisionalLoad(const ResourceError&,
|
| - HistoryCommitType) override;
|
| - void dispatchDidFailLoad(const ResourceError&, HistoryCommitType) override;
|
| - void dispatchDidFinishDocumentLoad() override;
|
| - void dispatchDidFinishLoad() override;
|
| -
|
| - void dispatchDidChangeThemeColor() override;
|
| - NavigationPolicy decidePolicyForNavigation(const ResourceRequest&,
|
| - DocumentLoader*,
|
| - NavigationType,
|
| - NavigationPolicy,
|
| - bool shouldReplaceCurrentEntry,
|
| - bool isClientRedirect,
|
| - HTMLFormElement*) override;
|
| - void dispatchWillSendSubmitEvent(HTMLFormElement*) override;
|
| - void dispatchWillSubmitForm(HTMLFormElement*) override;
|
| - void didStartLoading(LoadStartType) override;
|
| - void didStopLoading() override;
|
| - void progressEstimateChanged(double progressEstimate) override;
|
| - void loadURLExternally(const ResourceRequest&,
|
| - NavigationPolicy,
|
| - const String& suggestedName,
|
| - bool shouldReplaceCurrentEntry) override;
|
| - void loadErrorPage(int reason) override;
|
| - bool navigateBackForward(int offset) const override;
|
| - void didAccessInitialDocument() override;
|
| - void didDisplayInsecureContent() override;
|
| - void didRunInsecureContent(SecurityOrigin*, const KURL& insecureURL) override;
|
| - void didDetectXSS(const KURL&, bool didBlockEntirePage) override;
|
| - void didDispatchPingLoader(const KURL&) override;
|
| - void didDisplayContentWithCertificateErrors(const KURL&) override;
|
| - void didRunContentWithCertificateErrors(const KURL&) override;
|
| - void didChangePerformanceTiming() override;
|
| - void didObserveLoadingBehavior(WebLoadingBehaviorFlag) override;
|
| - void selectorMatchChanged(const Vector<String>& addedSelectors,
|
| - const Vector<String>& removedSelectors) override;
|
| - DocumentLoader* createDocumentLoader(LocalFrame*,
|
| - const ResourceRequest&,
|
| - const SubstituteData&,
|
| - ClientRedirectPolicy) override;
|
| - WTF::String userAgent() override;
|
| - WTF::String doNotTrackValue() override;
|
| - void transitionToCommittedForNewPage() override;
|
| - LocalFrame* createFrame(const FrameLoadRequest&,
|
| - const WTF::AtomicString& name,
|
| - HTMLFrameOwnerElement*) override;
|
| - virtual bool canCreatePluginWithoutRenderer(const String& mimeType) const;
|
| - Widget* createPlugin(HTMLPlugInElement*,
|
| - const KURL&,
|
| - const Vector<WTF::String>&,
|
| - const Vector<WTF::String>&,
|
| - const WTF::String&,
|
| - bool loadManually,
|
| - DetachedPluginPolicy) override;
|
| - std::unique_ptr<WebMediaPlayer> createWebMediaPlayer(
|
| - HTMLMediaElement&,
|
| - const WebMediaPlayerSource&,
|
| - WebMediaPlayerClient*) override;
|
| - WebRemotePlaybackClient* createWebRemotePlaybackClient(
|
| - HTMLMediaElement&) override;
|
| - ObjectContentType getObjectContentType(
|
| - const KURL&,
|
| - const WTF::String& mimeType,
|
| - bool shouldPreferPlugInsForImages) override;
|
| - void didChangeScrollOffset() override;
|
| - void didUpdateCurrentHistoryItem() override;
|
| - bool allowScript(bool enabledPerSettings) override;
|
| - bool allowScriptFromSource(bool enabledPerSettings,
|
| - const KURL& scriptURL) override;
|
| - bool allowPlugins(bool enabledPerSettings) override;
|
| - bool allowImage(bool enabledPerSettings, const KURL& imageURL) override;
|
| - bool allowRunningInsecureContent(bool enabledPerSettings,
|
| - SecurityOrigin*,
|
| - const KURL&) override;
|
| - bool allowAutoplay(bool defaultValue) override;
|
| - void passiveInsecureContentFound(const KURL&) override;
|
| - void didNotAllowScript() override;
|
| - void didNotAllowPlugins() override;
|
| -
|
| - WebCookieJar* cookieJar() const override;
|
| - void frameFocused() const override;
|
| - void didChangeName(const String& name, const String& uniqueName) override;
|
| - void didEnforceInsecureRequestPolicy(WebInsecureRequestPolicy) override;
|
| - void didUpdateToUniqueOrigin() override;
|
| - void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override;
|
| - void didSetFeaturePolicyHeader(
|
| - const WebParsedFeaturePolicyHeader& parsedHeader) override;
|
| - void didAddContentSecurityPolicy(
|
| - const String& headerValue,
|
| - ContentSecurityPolicyHeaderType,
|
| - ContentSecurityPolicyHeaderSource,
|
| - const std::vector<WebContentSecurityPolicyPolicy>&) override;
|
| - void didChangeFrameOwnerProperties(HTMLFrameElementBase*) override;
|
| -
|
| - void dispatchWillStartUsingPeerConnectionHandler(
|
| - WebRTCPeerConnectionHandler*) override;
|
| -
|
| - bool allowWebGL(bool enabledPerSettings) override;
|
| -
|
| - void dispatchWillInsertBody() override;
|
| -
|
| - std::unique_ptr<WebServiceWorkerProvider> createServiceWorkerProvider()
|
| - override;
|
| - bool isControlledByServiceWorker(DocumentLoader&) override;
|
| - int64_t serviceWorkerID(DocumentLoader&) override;
|
| - SharedWorkerRepositoryClient* sharedWorkerRepositoryClient() override;
|
| -
|
| - std::unique_ptr<WebApplicationCacheHost> createApplicationCacheHost(
|
| - WebApplicationCacheHostClient*) override;
|
| -
|
| - void dispatchDidChangeManifest() override;
|
| -
|
| - unsigned backForwardLength() override;
|
| -
|
| - void suddenTerminationDisablerChanged(bool present,
|
| - SuddenTerminationDisablerType) override;
|
| -
|
| - BlameContext* frameBlameContext() override;
|
| -
|
| - LinkResource* createServiceWorkerLinkResource(HTMLLinkElement*) override;
|
| -
|
| - WebEffectiveConnectionType getEffectiveConnectionType() override;
|
| -
|
| - KURL overrideFlashEmbedWithHTML(const KURL&) override;
|
| -
|
| - void setHasReceivedUserGesture() override;
|
| -
|
| - private:
|
| - explicit FrameLoaderClientImpl(WebLocalFrameImpl*);
|
| -
|
| - bool isFrameLoaderClientImpl() const override { return true; }
|
| - WebDevToolsAgentImpl* devToolsAgent();
|
| -
|
| - // The WebFrame that owns this object and manages its lifetime. Therefore,
|
| - // the web frame object is guaranteed to exist.
|
| - Member<WebLocalFrameImpl> m_webFrame;
|
| -
|
| - String m_userAgent;
|
| -};
|
| -
|
| -DEFINE_TYPE_CASTS(FrameLoaderClientImpl,
|
| - FrameLoaderClient,
|
| - client,
|
| - client->isFrameLoaderClientImpl(),
|
| - client.isFrameLoaderClientImpl());
|
| +// TODO(slangley): Remove this file once all users are including
|
| +// LocalFrameClientImpl.h instead.
|
| +using FrameLoaderClientImpl = LocalFrameClientImpl;
|
|
|
| } // namespace blink
|
|
|
|
|