Index: Source/core/testing/InternalSettings.h |
diff --git a/Source/core/testing/InternalSettings.h b/Source/core/testing/InternalSettings.h |
index 7886c1c26de170fd0b8b70bf8641db872e6513a1..ec7e10174f0fdad7ad4babb7183e22d706061ebb 100644 |
--- a/Source/core/testing/InternalSettings.h |
+++ b/Source/core/testing/InternalSettings.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: |
@@ -74,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(); |
@@ -116,7 +124,7 @@ public: |
void setStyleScopedEnabled(bool); |
void setExperimentalContentSecurityPolicyFeaturesEnabled(bool); |
- virtual void trace(Visitor* visitor) OVERRIDE { InternalSettingsGenerated::trace(visitor); } |
+ virtual void trace(Visitor*) OVERRIDE; |
private: |
explicit InternalSettings(Page&); |
@@ -125,7 +133,7 @@ private: |
Page* page() const { return m_page; } |
static const char* supplementName(); |
- Page* m_page; |
+ RawPtrWillBeWeakMember<Page> m_page; |
haraken
2014/04/30 11:18:08
hmm, I'm not quite sure about this pointer.
- In
zerny-chromium
2014/04/30 11:46:53
That is because InternalSettingsGenerated is RefCo
haraken
2014/04/30 12:02:08
Makes sense.
|
Backup m_backup; |
}; |