| Index: third_party/WebKit/Source/core/loader/FrameLoaderClient.h
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameLoaderClient.h b/third_party/WebKit/Source/core/loader/FrameLoaderClient.h
|
| index fd6c0ab4a0c589afd869025f0a78b0498f4a8a79..ee189167ddaa3489d9ee33edd1640165b65ea0d8 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoaderClient.h
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoaderClient.h
|
| @@ -1,5 +1,6 @@
|
| /*
|
| - * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
|
| + * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
|
| + * reserved.
|
| * Copyright (C) 2012 Google Inc. All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| @@ -135,18 +136,18 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
|
|
|
| virtual bool navigateBackForward(int offset) const = 0;
|
|
|
| - // Another page has accessed the initial empty document of this frame.
|
| - // It is no longer safe to display a provisional URL, since a URL spoof
|
| - // is now possible.
|
| + // Another page has accessed the initial empty document of this frame. It is
|
| + // no longer safe to display a provisional URL, since a URL spoof is now
|
| + // possible.
|
| virtual void didAccessInitialDocument() {}
|
|
|
| // This frame has displayed inactive content (such as an image) from an
|
| // insecure source. Inactive content cannot spread to other frames.
|
| virtual void didDisplayInsecureContent() = 0;
|
|
|
| - // The indicated security origin has run active content (such as a
|
| - // script) from an insecure source. Note that the insecure content can
|
| - // spread to other frames in the same origin.
|
| + // The indicated security origin has run active content (such as a script)
|
| + // from an insecure source. Note that the insecure content can spread to
|
| + // other frames in the same origin.
|
| virtual void didRunInsecureContent(SecurityOrigin*, const KURL&) = 0;
|
| virtual void didDetectXSS(const KURL&, bool didBlockEntirePage) = 0;
|
| virtual void didDispatchPingLoader(const KURL&) = 0;
|
| @@ -160,12 +161,11 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
|
| virtual void didChangePerformanceTiming() {}
|
|
|
| // Will be called when a particular loading code path has been used. This
|
| - // propogates renderer loading behavior to the browser process for
|
| - // histograms.
|
| + // propogates renderer loading behavior to the browser process for histograms.
|
| virtual void didObserveLoadingBehavior(WebLoadingBehaviorFlag) {}
|
|
|
| - // Transmits the change in the set of watched CSS selectors property
|
| - // that match any element on the frame.
|
| + // Transmits the change in the set of watched CSS selectors property that
|
| + // match any element on the frame.
|
| virtual void selectorMatchChanged(const Vector<String>& addedSelectors,
|
| const Vector<String>& removedSelectors) = 0;
|
|
|
| @@ -182,7 +182,8 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
|
| virtual LocalFrame* createFrame(const FrameLoadRequest&,
|
| const AtomicString& name,
|
| HTMLFrameOwnerElement*) = 0;
|
| - // Whether or not plugin creation should fail if the HTMLPlugInElement isn't in the DOM after plugin initialization.
|
| + // Whether or not plugin creation should fail if the HTMLPlugInElement isn't
|
| + // in the DOM after plugin initialization.
|
| enum DetachedPluginPolicy {
|
| FailOnDetachedPlugin,
|
| AllowDetachedPlugin,
|
| @@ -246,16 +247,16 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
|
| }
|
| virtual bool allowAutoplay(bool defaultValue) { return defaultValue; }
|
|
|
| - // Reports that passive mixed content was found at the provided URL. It may
|
| - // or may not be actually displayed later, what would be flagged by
|
| + // Reports that passive mixed content was found at the provided URL. It may or
|
| + // may not be actually displayed later, what would be flagged by
|
| // didDisplayInsecureContent.
|
| virtual void passiveInsecureContentFound(const KURL&) {}
|
|
|
| // This callback notifies the client that the frame was about to run
|
| - // JavaScript but did not because allowScript returned false. We
|
| - // have a separate callback here because there are a number of places
|
| - // that need to know if JavaScript is enabled but are not necessarily
|
| - // preparing to execute script.
|
| + // JavaScript but did not because allowScript returned false. We have a
|
| + // separate callback here because there are a number of places that need to
|
| + // know if JavaScript is enabled but are not necessarily preparing to execute
|
| + // script.
|
| virtual void didNotAllowScript() {}
|
| // This callback is similar, but for plugins.
|
| virtual void didNotAllowPlugins() {}
|
| @@ -273,10 +274,9 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
|
|
|
| virtual void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) {}
|
|
|
| - // Called when a new Content Security Policy is added to the frame's
|
| - // document. This can be triggered by handling of HTTP headers, handling
|
| - // of <meta> element, or by inheriting CSP from the parent (in case of
|
| - // about:blank).
|
| + // Called when a new Content Security Policy is added to the frame's document.
|
| + // This can be triggered by handling of HTTP headers, handling of <meta>
|
| + // element, or by inheriting CSP from the parent (in case of about:blank).
|
| virtual void didAddContentSecurityPolicy(const String& headerValue,
|
| ContentSecurityPolicyHeaderType,
|
| ContentSecurityPolicyHeaderSource) {}
|
| @@ -290,7 +290,8 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
|
| return enabledPerSettings;
|
| }
|
|
|
| - // If an HTML document is being loaded, informs the embedder that the document will have its <body> attached soon.
|
| + // If an HTML document is being loaded, informs the embedder that the document
|
| + // will have its <body> attached soon.
|
| virtual void dispatchWillInsertBody() {}
|
|
|
| virtual std::unique_ptr<WebServiceWorkerProvider>
|
| @@ -313,9 +314,9 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
|
|
|
| virtual bool isFrameLoaderClientImpl() const { return false; }
|
|
|
| - // Called when elements preventing the sudden termination of the frame
|
| - // become present or stop being present. |type| is the type of element
|
| - // (BeforeUnload handler, Unload handler).
|
| + // Called when elements preventing the sudden termination of the frame become
|
| + // present or stop being present. |type| is the type of element (BeforeUnload
|
| + // handler, Unload handler).
|
| enum SuddenTerminationDisablerType {
|
| BeforeUnloadHandler,
|
| UnloadHandler,
|
| @@ -333,8 +334,8 @@ class CORE_EXPORT FrameLoaderClient : public FrameClient {
|
| return WebEffectiveConnectionType::TypeUnknown;
|
| }
|
|
|
| - // Overwrites the given URL to use an HTML5 embed if possible.
|
| - // An empty URL is returned if the URL is not overriden.
|
| + // Overwrites the given URL to use an HTML5 embed if possible. An empty URL is
|
| + // returned if the URL is not overriden.
|
| virtual KURL overrideFlashEmbedWithHTML(const KURL&) { return KURL(); }
|
| };
|
|
|
|
|