| Index: third_party/WebKit/Source/core/testing/InternalSettings.h
|
| diff --git a/third_party/WebKit/Source/core/testing/InternalSettings.h b/third_party/WebKit/Source/core/testing/InternalSettings.h
|
| index 51bc8aaf21344a0c0d5adbcb01711ad5b759e018..1b9e8a8cb8c0d4dc5e87a83be40c648968aaf8fd 100644
|
| --- a/third_party/WebKit/Source/core/testing/InternalSettings.h
|
| +++ b/third_party/WebKit/Source/core/testing/InternalSettings.h
|
| @@ -47,12 +47,8 @@ class LocalFrame;
|
| class Page;
|
| class Settings;
|
|
|
| -#if ENABLE(OILPAN)
|
| -class InternalSettings final : public InternalSettingsGenerated, public HeapSupplement<Page> {
|
| +class InternalSettings final : public InternalSettingsGenerated, public Supplement<Page> {
|
| USING_GARBAGE_COLLECTED_MIXIN(InternalSettings);
|
| -#else
|
| -class InternalSettings final : public InternalSettingsGenerated {
|
| -#endif
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| class Backup {
|
| @@ -88,10 +84,6 @@ public:
|
| }
|
| static InternalSettings* from(Page&);
|
|
|
| -#if !ENABLE(OILPAN)
|
| - void hostDestroyed() { m_page = nullptr; }
|
| -#endif
|
| -
|
| ~InternalSettings() override;
|
| void resetToConsistentState();
|
|
|
|
|