Refresh LocalDOMWindow post-Oilpan.

third_party/WebKit/Source/core/frame/LocalDOMWindow.h

 /*
  * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 189 matching lines @@
     void clearEventQueue();
 
     void acceptLanguagesChanged();
 
 protected:
     // EventTarget overrides.
     bool addEventListenerInternal(const AtomicString& eventType, EventListener*, const EventListenerOptions&) override;
     bool removeEventListenerInternal(const AtomicString& eventType, EventListener*, const EventListenerOptions&) override;
 
 private:
-    // Rather than simply inheriting LocalFrameLifecycleObserver like most other
-    // classes, LocalDOMWindow hides its LocalFrameLifecycleObserver with
-    // composition. This prevents conflicting overloads between DOMWindow, which
-    // has a frame() accessor that returns Frame* for bindings code, and
-    // LocalFrameLifecycleObserver, which has a frame() accessor that returns a
-    // LocalFrame*.
-    class WindowFrameObserver final : public GarbageCollected<WindowFrameObserver>, public LocalFrameLifecycleObserver {
-        USING_GARBAGE_COLLECTED_MIXIN(WindowFrameObserver);
-    public:
-        static WindowFrameObserver* create(LocalDOMWindow*, LocalFrame&);
-
-        DECLARE_VIRTUAL_TRACE();
-
-        // LocalFrameLifecycleObserver overrides:
-        void willDetachFrameHost() override;
-        void contextDestroyed() override;
-
-    private:
-        WindowFrameObserver(LocalDOMWindow*, LocalFrame&);
-
-        Member<LocalDOMWindow> m_window;
-    };
-    friend WTF::OwnedPtrDeleter<WindowFrameObserver>;
+    class WindowFrameObserver;
 
     explicit LocalDOMWindow(LocalFrame&);
     void dispose();
 
     void dispatchLoadEvent();
     void clearDocument();
     void willDestroyDocumentInFrame();
 
     void willDetachFrameHost();
     void frameDestroyed();
 
     Member<WindowFrameObserver> m_frameObserver;
     Member<Document> m_document;
 
     bool m_shouldPrintWhenFinishedLoading;
-#if ENABLE(ASSERT)
-    bool m_hasBeenReset;
-#endif
 
     HeapHashSet<WeakMember<DOMWindowProperty>> m_properties;
 
     mutable Member<Screen> m_screen;
     mutable Member<History> m_history;
     mutable Member<BarProp> m_locationbar;
     mutable Member<BarProp> m_menubar;
     mutable Member<BarProp> m_personalbar;
     mutable Member<BarProp> m_scrollbars;
     mutable Member<BarProp> m_statusbar;
@@ skipping 21 matching lines @@
 }
 
 inline String LocalDOMWindow::defaultStatus() const
 {
     return m_defaultStatus;
 }
 
 } // namespace blink
 
 #endif // LocalDOMWindow_h