Chromium Code Reviews| Index: third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.h |
| diff --git a/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.h b/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.h |
| index 10dc7a0cb4c89e7c63546beb1687885e339f0f91..7f764a76db7f61ef1d5d92a98b8e345e9f3a22bf 100644 |
| --- a/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.h |
| +++ b/third_party/WebKit/Source/bindings/core/v8/ConditionalFeatures.h |
| @@ -5,14 +5,12 @@ |
| #ifndef ConditionalFeatures_h |
| #define ConditionalFeatures_h |
| +#include <v8.h> |
| #include "core/CoreExport.h" |
| -#include "platform/feature_policy/FeaturePolicy.h" |
| #include "wtf/text/WTFString.h" |
| -#include <v8.h> |
| namespace blink { |
| -class LocalFrame; |
| class ScriptState; |
| struct WrapperTypeInfo; |
| @@ -25,16 +23,16 @@ using InstallPendingConditionalFeatureFunction = void (*)(const String&, |
| const ScriptState*); |
| // Sets the function to be called by |installConditionalFeatures|. The function |
| -// is initially set to the private |installConditionalFeaturesCore| function, |
| +// is initially set to the private |installConditionalFeaturesDefault| function, |
| // but can be overridden by this function. A pointer to the previously set |
| // function is returned, so that functions can be chained. |
| CORE_EXPORT InstallConditionalFeaturesFunction |
| setInstallConditionalFeaturesFunction(InstallConditionalFeaturesFunction); |
| // Sets the function to be called by |installPendingConditionalFeature|. This |
| -// Initially set to the private |installPendingConditionalFeatureCore| function, |
| -// but can be overridden by this function. A pointer to the previously set |
| -// function is returned, so that functions can be chained. |
| +// Initially set to the private |installPendingConditionalFeatureDefault| |
|
Yuki
2017/02/20 09:34:29
typo: s/Initially/is initially/
|
| +// function, but can be overridden by this function. A pointer to the previously |
| +// set function is returned, so that functions can be chained. |
| CORE_EXPORT InstallPendingConditionalFeatureFunction |
| setInstallPendingConditionalFeatureFunction( |
| InstallPendingConditionalFeatureFunction); |
| @@ -48,12 +46,6 @@ CORE_EXPORT void installConditionalFeatures(const WrapperTypeInfo*, |
| v8::Local<v8::Object>, |
| v8::Local<v8::Function>); |
| -// Installs all of the conditionally enabled V8 bindings on the Window object. |
| -// This is called separately from other objects so that attributes and |
| -// interfaces which need to be visible on the global object are installed even |
| -// when the V8 context is reused (i.e., after navigation) |
| -CORE_EXPORT void installConditionalFeaturesOnWindow(const ScriptState*); |
| - |
| // Installs all of the conditionally enabled V8 bindings for a feature, if |
| // needed. This is called to install a newly-enabled feature on any existing |
| // objects. If the target object hasn't been created, nothing is installed. The |
| @@ -62,9 +54,6 @@ CORE_EXPORT void installConditionalFeaturesOnWindow(const ScriptState*); |
| CORE_EXPORT void installPendingConditionalFeature(const String&, |
| const ScriptState*); |
| -CORE_EXPORT bool isFeatureEnabledInFrame(const FeaturePolicy::Feature&, |
| - const LocalFrame*); |
| - |
| } // namespace blink |
| #endif // ConditionalFeatures_h |