From 8711bf43a83fc9bf387c3abe0acb4818de7a656d Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 2 Dec 2014 14:29:16 -0800 Subject: [PATCH] Remove heap/Handle usage from v8_inspector I also removed it from a bunch of core/ as almost all the places its included it is not actually needed. BUG=435243 TBR=yurys@chromium.org Review URL: https://codereview.chromium.org/775803002 --- engine/bindings/core/v8/CustomElementWrapper.h | 1 - engine/bindings/core/v8/ScriptPromise.h | 2 -- engine/bindings/core/v8/ScriptWrappable.h | 2 -- engine/bindings/core/v8/SerializedScriptValue.cpp | 1 - engine/bindings/core/v8/WindowProxy.cpp | 1 - engine/bindings/core/v8/WrapperTypeInfo.h | 1 - engine/build/scripts/templates/ElementFactory.h.tmpl | 5 ++--- engine/core/animation/Animation.h | 1 - engine/core/animation/AnimationEffect.h | 2 -- engine/core/animation/AnimationNode.h | 1 - engine/core/animation/KeyframeEffectModel.h | 3 --- engine/core/animation/animatable/AnimatableValue.h | 1 - engine/core/css/BasicShapeFunctions.h | 1 - engine/core/css/CSSFilterRule.h | 1 - engine/core/css/CSSFontFaceRule.h | 1 - engine/core/css/CSSFontSelector.h | 5 ----- engine/core/css/CSSSegmentedFontFace.h | 1 - engine/core/css/DocumentFontFaceSet.h | 1 - engine/core/css/MediaQueryListListener.h | 3 --- engine/core/css/StyleRule.h | 3 --- engine/core/inspector/ScriptArguments.h | 1 + engine/v8_inspector/InspectorBaseAgent.h | 1 - engine/v8_inspector/InspectorState.h | 1 - 23 files changed, 3 insertions(+), 37 deletions(-) diff --git a/engine/bindings/core/v8/CustomElementWrapper.h b/engine/bindings/core/v8/CustomElementWrapper.h index 0c4dc47a025..928ce15ddd1 100644 --- a/engine/bindings/core/v8/CustomElementWrapper.h +++ b/engine/bindings/core/v8/CustomElementWrapper.h @@ -31,7 +31,6 @@ #ifndef SKY_ENGINE_BINDINGS_CORE_V8_CUSTOMELEMENTWRAPPER_H_ #define SKY_ENGINE_BINDINGS_CORE_V8_CUSTOMELEMENTWRAPPER_H_ -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/PassRefPtr.h" #include "v8/include/v8.h" diff --git a/engine/bindings/core/v8/ScriptPromise.h b/engine/bindings/core/v8/ScriptPromise.h index 03b85dd3bde..f4706e50dcf 100644 --- a/engine/bindings/core/v8/ScriptPromise.h +++ b/engine/bindings/core/v8/ScriptPromise.h @@ -34,8 +34,6 @@ #include "sky/engine/bindings/core/v8/ScriptValue.h" #include "sky/engine/bindings/core/v8/V8ThrowException.h" #include "sky/engine/core/dom/ExceptionCode.h" -#include "sky/engine/platform/heap/Handle.h" -#include "sky/engine/wtf/PassOwnPtr.h" #include "sky/engine/wtf/PassRefPtr.h" #include "sky/engine/wtf/text/WTFString.h" #include "v8/include/v8.h" diff --git a/engine/bindings/core/v8/ScriptWrappable.h b/engine/bindings/core/v8/ScriptWrappable.h index d5e64680fae..ebf81493e82 100644 --- a/engine/bindings/core/v8/ScriptWrappable.h +++ b/engine/bindings/core/v8/ScriptWrappable.h @@ -32,8 +32,6 @@ #define SKY_ENGINE_BINDINGS_CORE_V8_SCRIPTWRAPPABLE_H_ #include "sky/engine/bindings/core/v8/WrapperTypeInfo.h" -#include "sky/engine/platform/ScriptForbiddenScope.h" -#include "sky/engine/platform/heap/Handle.h" #include "v8/include/v8.h" namespace blink { diff --git a/engine/bindings/core/v8/SerializedScriptValue.cpp b/engine/bindings/core/v8/SerializedScriptValue.cpp index b529bd37851..c010ae472df 100644 --- a/engine/bindings/core/v8/SerializedScriptValue.cpp +++ b/engine/bindings/core/v8/SerializedScriptValue.cpp @@ -50,7 +50,6 @@ #include "sky/engine/core/html/ImageData.h" #include "sky/engine/core/html/canvas/DataView.h" #include "sky/engine/platform/SharedBuffer.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/public/platform/Platform.h" #include "sky/engine/wtf/ArrayBuffer.h" #include "sky/engine/wtf/ArrayBufferContents.h" diff --git a/engine/bindings/core/v8/WindowProxy.cpp b/engine/bindings/core/v8/WindowProxy.cpp index 93ec90c3344..886c9e7a512 100644 --- a/engine/bindings/core/v8/WindowProxy.cpp +++ b/engine/bindings/core/v8/WindowProxy.cpp @@ -49,7 +49,6 @@ #include "sky/engine/core/loader/FrameLoaderClient.h" #include "sky/engine/platform/ScriptForbiddenScope.h" #include "sky/engine/platform/TraceEvent.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/public/platform/Platform.h" #include "sky/engine/wtf/Assertions.h" #include "sky/engine/wtf/OwnPtr.h" diff --git a/engine/bindings/core/v8/WrapperTypeInfo.h b/engine/bindings/core/v8/WrapperTypeInfo.h index 5baa335bfee..0c3ccc537f5 100644 --- a/engine/bindings/core/v8/WrapperTypeInfo.h +++ b/engine/bindings/core/v8/WrapperTypeInfo.h @@ -32,7 +32,6 @@ #define SKY_ENGINE_BINDINGS_CORE_V8_WRAPPERTYPEINFO_H_ #include "gin/public/wrapper_info.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/Assertions.h" #include "v8/include/v8.h" diff --git a/engine/build/scripts/templates/ElementFactory.h.tmpl b/engine/build/scripts/templates/ElementFactory.h.tmpl index a74909a8366..a46d6983a6b 100644 --- a/engine/build/scripts/templates/ElementFactory.h.tmpl +++ b/engine/build/scripts/templates/ElementFactory.h.tmpl @@ -4,9 +4,8 @@ #ifndef {{namespace}}ElementFactory_h #define {{namespace}}ElementFactory_h -#include "platform/heap/Handle.h" -#include "wtf/Forward.h" -#include "wtf/PassRefPtr.h" +#include "sky/engine/wtf/Forward.h" +#include "sky/engine/wtf/PassRefPtr.h" namespace blink { diff --git a/engine/core/animation/Animation.h b/engine/core/animation/Animation.h index ad77d3d6fee..c4126b66702 100644 --- a/engine/core/animation/Animation.h +++ b/engine/core/animation/Animation.h @@ -35,7 +35,6 @@ #include "sky/engine/core/animation/AnimationNode.h" #include "sky/engine/core/animation/EffectInput.h" #include "sky/engine/core/animation/TimingInput.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/RefPtr.h" namespace blink { diff --git a/engine/core/animation/AnimationEffect.h b/engine/core/animation/AnimationEffect.h index fc78b87a17d..5830c337f9d 100644 --- a/engine/core/animation/AnimationEffect.h +++ b/engine/core/animation/AnimationEffect.h @@ -33,8 +33,6 @@ #include "gen/sky/core/CSSPropertyNames.h" #include "sky/engine/bindings/core/v8/ScriptWrappable.h" -#include "sky/engine/platform/heap/Handle.h" -#include "sky/engine/wtf/HashMap.h" #include "sky/engine/wtf/PassOwnPtr.h" #include "sky/engine/wtf/RefCounted.h" diff --git a/engine/core/animation/AnimationNode.h b/engine/core/animation/AnimationNode.h index 9c0ef14aa4f..2502aebfa0a 100644 --- a/engine/core/animation/AnimationNode.h +++ b/engine/core/animation/AnimationNode.h @@ -33,7 +33,6 @@ #include "sky/engine/bindings/core/v8/ScriptWrappable.h" #include "sky/engine/core/animation/Timing.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/OwnPtr.h" #include "sky/engine/wtf/PassOwnPtr.h" #include "sky/engine/wtf/RefCounted.h" diff --git a/engine/core/animation/KeyframeEffectModel.h b/engine/core/animation/KeyframeEffectModel.h index 88ddfa2f5b7..dd37faf1d0d 100644 --- a/engine/core/animation/KeyframeEffectModel.h +++ b/engine/core/animation/KeyframeEffectModel.h @@ -37,12 +37,9 @@ #include "sky/engine/core/animation/StringKeyframe.h" #include "sky/engine/core/animation/animatable/AnimatableValueKeyframe.h" #include "sky/engine/platform/animation/TimingFunction.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/HashMap.h" -#include "sky/engine/wtf/HashSet.h" #include "sky/engine/wtf/PassOwnPtr.h" #include "sky/engine/wtf/PassRefPtr.h" -#include "sky/engine/wtf/RefCounted.h" #include "sky/engine/wtf/Vector.h" namespace blink { diff --git a/engine/core/animation/animatable/AnimatableValue.h b/engine/core/animation/animatable/AnimatableValue.h index 442e123e3d7..e2ee6a318dc 100644 --- a/engine/core/animation/animatable/AnimatableValue.h +++ b/engine/core/animation/animatable/AnimatableValue.h @@ -32,7 +32,6 @@ #define SKY_ENGINE_CORE_ANIMATION_ANIMATABLE_ANIMATABLEVALUE_H_ #include "sky/engine/core/css/CSSValue.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/RefCounted.h" namespace blink { diff --git a/engine/core/css/BasicShapeFunctions.h b/engine/core/css/BasicShapeFunctions.h index 010319a7e72..a72d2bd92b6 100644 --- a/engine/core/css/BasicShapeFunctions.h +++ b/engine/core/css/BasicShapeFunctions.h @@ -31,7 +31,6 @@ #define SKY_ENGINE_CORE_CSS_BASICSHAPEFUNCTIONS_H_ #include "sky/engine/core/rendering/style/BasicShapes.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/PassRefPtr.h" namespace blink { diff --git a/engine/core/css/CSSFilterRule.h b/engine/core/css/CSSFilterRule.h index 22ee24c0691..a42e99f4d06 100644 --- a/engine/core/css/CSSFilterRule.h +++ b/engine/core/css/CSSFilterRule.h @@ -31,7 +31,6 @@ #define SKY_ENGINE_CORE_CSS_CSSFILTERRULE_H_ #include "sky/engine/core/css/CSSRule.h" -#include "sky/engine/platform/heap/Handle.h" namespace blink { diff --git a/engine/core/css/CSSFontFaceRule.h b/engine/core/css/CSSFontFaceRule.h index 9cde2896a3b..3861425e9d1 100644 --- a/engine/core/css/CSSFontFaceRule.h +++ b/engine/core/css/CSSFontFaceRule.h @@ -23,7 +23,6 @@ #define SKY_ENGINE_CORE_CSS_CSSFONTFACERULE_H_ #include "sky/engine/core/css/CSSRule.h" -#include "sky/engine/platform/heap/Handle.h" namespace blink { diff --git a/engine/core/css/CSSFontSelector.h b/engine/core/css/CSSFontSelector.h index 702e7500384..ead0c41fcdf 100644 --- a/engine/core/css/CSSFontSelector.h +++ b/engine/core/css/CSSFontSelector.h @@ -30,7 +30,6 @@ #include "sky/engine/core/css/FontLoader.h" #include "sky/engine/platform/fonts/FontSelector.h" #include "sky/engine/platform/fonts/GenericFontFamilySettings.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/Forward.h" #include "sky/engine/wtf/HashMap.h" #include "sky/engine/wtf/HashSet.h" @@ -59,9 +58,7 @@ public: virtual void willUseFontData(const FontDescription&, const AtomicString& family, UChar32) override; bool isPlatformFontAvailable(const FontDescription&, const AtomicString& family); -#if !ENABLE(OILPAN) void clearDocument(); -#endif void fontFaceInvalidated(); @@ -69,9 +66,7 @@ public: virtual void fontCacheInvalidated() override; void registerForInvalidationCallbacks(CSSFontSelectorClient*); -#if !ENABLE(OILPAN) void unregisterForInvalidationCallbacks(CSSFontSelectorClient*); -#endif Document* document() const { return m_document; } FontFaceCache* fontFaceCache() { return &m_fontFaceCache; } diff --git a/engine/core/css/CSSSegmentedFontFace.h b/engine/core/css/CSSSegmentedFontFace.h index c0dbedd5e8d..0be6abb2190 100644 --- a/engine/core/css/CSSSegmentedFontFace.h +++ b/engine/core/css/CSSSegmentedFontFace.h @@ -27,7 +27,6 @@ #define SKY_ENGINE_CORE_CSS_CSSSEGMENTEDFONTFACE_H_ #include "sky/engine/platform/fonts/FontTraits.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/HashMap.h" #include "sky/engine/wtf/ListHashSet.h" #include "sky/engine/wtf/PassRefPtr.h" diff --git a/engine/core/css/DocumentFontFaceSet.h b/engine/core/css/DocumentFontFaceSet.h index 69d2c5a303f..c5ffb79e964 100644 --- a/engine/core/css/DocumentFontFaceSet.h +++ b/engine/core/css/DocumentFontFaceSet.h @@ -26,7 +26,6 @@ #ifndef SKY_ENGINE_CORE_CSS_DOCUMENTFONTFACESET_H_ #define SKY_ENGINE_CORE_CSS_DOCUMENTFONTFACESET_H_ -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/PassRefPtr.h" namespace blink { diff --git a/engine/core/css/MediaQueryListListener.h b/engine/core/css/MediaQueryListListener.h index 2dc37e5765c..155af5ffa97 100644 --- a/engine/core/css/MediaQueryListListener.h +++ b/engine/core/css/MediaQueryListListener.h @@ -21,13 +21,10 @@ #define SKY_ENGINE_CORE_CSS_MEDIAQUERYLISTLISTENER_H_ #include "sky/engine/core/css/MediaQueryList.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/RefCounted.h" namespace blink { -class MediaQueryList; - // See http://dev.w3.org/csswg/cssom-view/#the-mediaquerylist-interface class MediaQueryListListener : public RefCounted { public: diff --git a/engine/core/css/StyleRule.h b/engine/core/css/StyleRule.h index e8d86993d7d..053ff31e5b2 100644 --- a/engine/core/css/StyleRule.h +++ b/engine/core/css/StyleRule.h @@ -24,7 +24,6 @@ #include "sky/engine/core/css/CSSSelectorList.h" #include "sky/engine/core/css/MediaList.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/RefPtr.h" namespace blink { @@ -60,13 +59,11 @@ public: PassRefPtr copy() const; -#if !ENABLE(OILPAN) void deref() { if (derefBase()) destroy(); } -#endif // !ENABLE(OILPAN) // FIXME: There shouldn't be any need for the null parent version. PassRefPtr createCSSOMWrapper(CSSStyleSheet* parentSheet = 0) const; diff --git a/engine/core/inspector/ScriptArguments.h b/engine/core/inspector/ScriptArguments.h index e11a2019173..274879cbbdf 100644 --- a/engine/core/inspector/ScriptArguments.h +++ b/engine/core/inspector/ScriptArguments.h @@ -32,6 +32,7 @@ #define SKY_ENGINE_CORE_INSPECTOR_SCRIPTARGUMENTS_H_ #include "sky/engine/bindings/core/v8/ScriptState.h" +#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/Forward.h" #include "sky/engine/wtf/RefCounted.h" #include "sky/engine/wtf/Vector.h" diff --git a/engine/v8_inspector/InspectorBaseAgent.h b/engine/v8_inspector/InspectorBaseAgent.h index 02f23bb6e37..774d4c5787f 100644 --- a/engine/v8_inspector/InspectorBaseAgent.h +++ b/engine/v8_inspector/InspectorBaseAgent.h @@ -32,7 +32,6 @@ #define SKY_ENGINE_V8_INSPECTOR_INSPECTORBASEAGENT_H_ #include "gen/v8_inspector/InspectorBackendDispatcher.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/Forward.h" #include "sky/engine/wtf/Vector.h" #include "sky/engine/wtf/text/WTFString.h" diff --git a/engine/v8_inspector/InspectorState.h b/engine/v8_inspector/InspectorState.h index 99f7ca15993..6a102b788a7 100644 --- a/engine/v8_inspector/InspectorState.h +++ b/engine/v8_inspector/InspectorState.h @@ -33,7 +33,6 @@ #include "sky/engine/platform/JSONValues.h" -#include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/HashMap.h" #include "sky/engine/wtf/text/WTFString.h"