| Index: Source/core/frame/LocalDOMWindow.h
|
| diff --git a/Source/core/frame/LocalDOMWindow.h b/Source/core/frame/LocalDOMWindow.h
|
| index dfa0e46097cd7ba26c53a49225ea62794f3c14d3..b8142bb6447e78eefa906a1888053ad316687d6c 100644
|
| --- a/Source/core/frame/LocalDOMWindow.h
|
| +++ b/Source/core/frame/LocalDOMWindow.h
|
| @@ -28,6 +28,7 @@
|
| #define LocalDOMWindow_h
|
|
|
| #include "core/events/EventTarget.h"
|
| +#include "core/frame/DOMWindow.h"
|
| #include "core/frame/DOMWindowBase64.h"
|
| #include "core/frame/FrameDestructionObserver.h"
|
| #include "platform/LifecycleContext.h"
|
| @@ -83,7 +84,7 @@ enum PageshowEventPersistence {
|
|
|
| enum SetLocationLocking { LockHistoryBasedOnGestureState, LockHistoryAndBackForwardList };
|
|
|
| -class LocalDOMWindow final : public RefCountedWillBeGarbageCollectedFinalized<LocalDOMWindow>, public EventTargetWithInlineData, public DOMWindowBase64, public FrameDestructionObserver, public WillBeHeapSupplementable<LocalDOMWindow>, public LifecycleContext<LocalDOMWindow> {
|
| +class LocalDOMWindow final : public RefCountedWillBeGarbageCollectedFinalized<LocalDOMWindow>, public EventTargetWithInlineData, public DOMWindow, public DOMWindowBase64, public FrameDestructionObserver, public WillBeHeapSupplementable<LocalDOMWindow>, public LifecycleContext<LocalDOMWindow> {
|
| DEFINE_WRAPPERTYPEINFO();
|
| REFCOUNTED_EVENT_TARGET(LocalDOMWindow);
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalDOMWindow);
|
| @@ -97,11 +98,14 @@ public:
|
|
|
| PassRefPtrWillBeRawPtr<Document> installNewDocument(const String& mimeType, const DocumentInit&, bool forceXHTML = false);
|
|
|
| + // EventTarget overrides:
|
| virtual const AtomicString& interfaceName() const override;
|
| virtual ExecutionContext* executionContext() const override;
|
| -
|
| virtual LocalDOMWindow* toDOMWindow() override;
|
|
|
| + // DOMWindow overrides:
|
| + ScriptWrappable* toScriptWrappable() override { return this; }
|
| +
|
| void registerProperty(DOMWindowProperty*);
|
| void unregisterProperty(DOMWindowProperty*);
|
|
|
|
|