| Index: Source/core/testing/InternalSettings.h
|
| diff --git a/Source/core/testing/InternalSettings.h b/Source/core/testing/InternalSettings.h
|
| index 7886c1c26de170fd0b8b70bf8641db872e6513a1..ab59adcb43f74566b4aab9f29b00306b00837a22 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&);
|
| +
|
| +#if !ENABLE(OILPAN)
|
| void hostDestroyed() { m_page = 0; }
|
| +#endif
|
|
|
| virtual ~InternalSettings();
|
| void resetToConsistentState();
|
|
|