Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / testing / InternalSettings.h

diff --git a/src/third_party/WebKit/Source/core/testing/InternalSettings.h b/src/third_party/WebKit/Source/core/testing/InternalSettings.h
index 005ffb8..ec7e101 100644 (file)
--- a/src/third_party/WebKit/Source/core/testing/InternalSettings.h
+++ b/src/third_party/WebKit/Source/core/testing/InternalSettings.h
@@ -29,8 +29,8 @@
 
 #include "InternalSettingsGenerated.h"
 #include "core/editing/EditingBehaviorTypes.h"
-#include "heap/Handle.h"
 #include "platform/geometry/IntSize.h"
+#include "platform/heap/Handle.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
@@ -43,7 +43,12 @@ class LocalFrame;
 class Page;
 class Settings;
 
+#if ENABLE(OILPAN)
+class InternalSettings FINAL : public InternalSettingsGenerated, public HeapSupplement<Page> {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(InternalSettings);
+#else
 class InternalSettings FINAL : public InternalSettingsGenerated {
+#endif
 public:
     class Backup {
     public:
@@ -52,7 +57,6 @@ public:
 
         bool m_originalCSSExclusionsEnabled;
         bool m_originalAuthorShadowDOMForAnyElementEnabled;
-        bool m_originalExperimentalWebSocketEnabled;
         bool m_originalStyleScoped;
         bool m_originalCSP;
         bool m_originalOverlayScrollbarsEnabled;
@@ -64,9 +68,6 @@ public:
         bool m_originalMockScrollbarsEnabled;
         bool m_langAttributeAwareFormControlUIEnabled;
         bool m_imagesEnabled;
-        bool m_shouldDisplaySubtitles;
-        bool m_shouldDisplayCaptions;
-        bool m_shouldDisplayTextDescriptions;
         String m_defaultVideoPosterURL;
         bool m_originalCompositorDrivenAcceleratedScrollEnabled;
         bool m_originalLayerSquashingEnabled;
@@ -78,7 +79,10 @@ public:
         return adoptRefWillBeNoop(new InternalSettings(page));
     }
     static InternalSettings* from(Page&);
-    void hostDestroyed() { m_page = 0; }
+
+#if !ENABLE(OILPAN)
+    void hostDestroyed() { m_page = nullptr; }
+#endif
 
     virtual ~InternalSettings();
     void resetToConsistentState();
@@ -100,7 +104,6 @@ public:
     void setTextAutosizingEnabled(bool, ExceptionState&);
     void setAccessibilityFontScaleFactor(float fontScaleFactor, ExceptionState&);
     void setTextAutosizingWindowSizeOverride(int width, int height, ExceptionState&);
-    void setTouchEventEmulationEnabled(bool, ExceptionState&);
     void setViewportEnabled(bool, ExceptionState&);
 
     // FIXME: This is a temporary flag and should be removed once accelerated
@@ -116,13 +119,12 @@ public:
     // be removed or moved onto internals.runtimeFlags:
     void setAuthorShadowDOMForAnyElementEnabled(bool);
     void setCSSExclusionsEnabled(bool);
-    void setExperimentalWebSocketEnabled(bool);
     void setLangAttributeAwareFormControlUIEnabled(bool);
     void setOverlayScrollbarsEnabled(bool);
     void setStyleScopedEnabled(bool);
     void setExperimentalContentSecurityPolicyFeaturesEnabled(bool);
 
-    virtual void trace(Visitor* visitor) OVERRIDE { InternalSettingsGenerated::trace(visitor); }
+    virtual void trace(Visitor*) OVERRIDE;
 
 private:
     explicit InternalSettings(Page&);
@@ -131,7 +133,7 @@ private:
     Page* page() const { return m_page; }
     static const char* supplementName();
 
-    Page* m_page;
+    RawPtrWillBeWeakMember<Page> m_page;
     Backup m_backup;
 };