| Index: Source/core/frame/LocalDOMWindow.h
|
| diff --git a/Source/core/frame/LocalDOMWindow.h b/Source/core/frame/LocalDOMWindow.h
|
| index 90f4755177f968c6a3c43532390faa49ceff38b5..5210157a9305df74302211dc59f0965057767e43 100644
|
| --- a/Source/core/frame/LocalDOMWindow.h
|
| +++ b/Source/core/frame/LocalDOMWindow.h
|
| @@ -83,7 +83,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 DOMWindowBase64, public FrameDestructionObserver, public WillBeHeapSupplementable<LocalDOMWindow>, public LifecycleContext<LocalDOMWindow> {
|
| DEFINE_WRAPPERTYPEINFO();
|
| REFCOUNTED_EVENT_TARGET(LocalDOMWindow);
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalDOMWindow);
|
| @@ -97,10 +97,10 @@ public:
|
|
|
| PassRefPtrWillBeRawPtr<Document> installNewDocument(const String& mimeType, const DocumentInit&, bool forceXHTML = false);
|
|
|
| - virtual const AtomicString& interfaceName() const OVERRIDE;
|
| - virtual ExecutionContext* executionContext() const OVERRIDE;
|
| + virtual const AtomicString& interfaceName() const override;
|
| + virtual ExecutionContext* executionContext() const override;
|
|
|
| - virtual LocalDOMWindow* toDOMWindow() OVERRIDE;
|
| + virtual LocalDOMWindow* toDOMWindow() override;
|
|
|
| void registerProperty(DOMWindowProperty*);
|
| void unregisterProperty(DOMWindowProperty*);
|
| @@ -244,9 +244,9 @@ public:
|
|
|
| // Events
|
| // EventTarget API
|
| - virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture = false) OVERRIDE;
|
| - virtual bool removeEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture = false) OVERRIDE;
|
| - virtual void removeAllEventListeners() OVERRIDE;
|
| + virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture = false) override;
|
| + virtual bool removeEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture = false) override;
|
| + virtual void removeAllEventListeners() override;
|
|
|
| using EventTarget::dispatchEvent;
|
| bool dispatchEvent(PassRefPtrWillBeRawPtr<Event> prpEvent, PassRefPtrWillBeRawPtr<EventTarget> prpTarget);
|
| @@ -320,9 +320,9 @@ public:
|
|
|
| void acceptLanguagesChanged();
|
|
|
| - virtual void trace(Visitor*) OVERRIDE;
|
| + virtual void trace(Visitor*) override;
|
|
|
| - virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) OVERRIDE;
|
| + virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) override;
|
|
|
| protected:
|
| DOMWindowLifecycleNotifier& lifecycleNotifier();
|
| @@ -333,7 +333,7 @@ private:
|
| Page* page();
|
|
|
| // FrameDestructionObserver
|
| - virtual void willDetachFrameHost() OVERRIDE;
|
| + virtual void willDetachFrameHost() override;
|
|
|
| void clearDocument();
|
| void willDestroyDocumentInFrame();
|
|
|