| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 void documentWasClosed(); | 196 void documentWasClosed(); |
| 197 void statePopped(PassRefPtr<SerializedScriptValue>); | 197 void statePopped(PassRefPtr<SerializedScriptValue>); |
| 198 | 198 |
| 199 // FIXME: This shouldn't be public once LocalDOMWindow becomes ExecutionCont
ext. | 199 // FIXME: This shouldn't be public once LocalDOMWindow becomes ExecutionCont
ext. |
| 200 void clearEventQueue(); | 200 void clearEventQueue(); |
| 201 | 201 |
| 202 void acceptLanguagesChanged(); | 202 void acceptLanguagesChanged(); |
| 203 | 203 |
| 204 protected: | 204 protected: |
| 205 // EventTarget overrides. | 205 // EventTarget overrides. |
| 206 bool addEventListenerInternal(const AtomicString& eventType, EventListener*,
const EventListenerOptions&) override; | 206 bool addEventListenerInternal(const AtomicString& eventType, EventListener*,
const AddEventListenerOptions&) override; |
| 207 bool removeEventListenerInternal(const AtomicString& eventType, EventListene
r*, const EventListenerOptions&) override; | 207 void removedEventListener(const AtomicString& eventType, const RegisteredEve
ntListener&) override; |
| 208 | 208 |
| 209 private: | 209 private: |
| 210 // Rather than simply inheriting LocalFrameLifecycleObserver like most other | 210 // Rather than simply inheriting LocalFrameLifecycleObserver like most other |
| 211 // classes, LocalDOMWindow hides its LocalFrameLifecycleObserver with | 211 // classes, LocalDOMWindow hides its LocalFrameLifecycleObserver with |
| 212 // composition. This prevents conflicting overloads between DOMWindow, which | 212 // composition. This prevents conflicting overloads between DOMWindow, which |
| 213 // has a frame() accessor that returns Frame* for bindings code, and | 213 // has a frame() accessor that returns Frame* for bindings code, and |
| 214 // LocalFrameLifecycleObserver, which has a frame() accessor that returns a | 214 // LocalFrameLifecycleObserver, which has a frame() accessor that returns a |
| 215 // LocalFrame*. | 215 // LocalFrame*. |
| 216 class WindowFrameObserver final : public GarbageCollected<WindowFrameObserve
r>, public LocalFrameLifecycleObserver { | 216 class WindowFrameObserver final : public GarbageCollected<WindowFrameObserve
r>, public LocalFrameLifecycleObserver { |
| 217 USING_GARBAGE_COLLECTED_MIXIN(WindowFrameObserver); | 217 USING_GARBAGE_COLLECTED_MIXIN(WindowFrameObserver); |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 } | 282 } |
| 283 | 283 |
| 284 inline String LocalDOMWindow::defaultStatus() const | 284 inline String LocalDOMWindow::defaultStatus() const |
| 285 { | 285 { |
| 286 return m_defaultStatus; | 286 return m_defaultStatus; |
| 287 } | 287 } |
| 288 | 288 |
| 289 } // namespace blink | 289 } // namespace blink |
| 290 | 290 |
| 291 #endif // LocalDOMWindow_h | 291 #endif // LocalDOMWindow_h |
| OLD | NEW |