| 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 |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #ifndef DOMWindow_h | 27 #ifndef DOMWindow_h |
| 28 #define DOMWindow_h | 28 #define DOMWindow_h |
| 29 | 29 |
| 30 #include "bindings/v8/Dictionary.h" |
| 30 #include "bindings/v8/ScriptWrappable.h" | 31 #include "bindings/v8/ScriptWrappable.h" |
| 31 #include "core/events/EventTarget.h" | 32 #include "core/events/EventTarget.h" |
| 32 #include "core/frame/FrameDestructionObserver.h" | 33 #include "core/frame/FrameDestructionObserver.h" |
| 33 #include "platform/LifecycleContext.h" | 34 #include "platform/LifecycleContext.h" |
| 34 #include "platform/Supplementable.h" | 35 #include "platform/Supplementable.h" |
| 35 | 36 |
| 36 #include "wtf/Forward.h" | 37 #include "wtf/Forward.h" |
| 37 | 38 |
| 38 namespace WebCore { | 39 namespace WebCore { |
| 39 class ApplicationCache; | 40 class ApplicationCache; |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 PageConsole* pageConsole() const; | 221 PageConsole* pageConsole() const; |
| 221 | 222 |
| 222 void printErrorMessage(const String&); | 223 void printErrorMessage(const String&); |
| 223 String crossDomainAccessErrorMessage(DOMWindow* activeWindow); | 224 String crossDomainAccessErrorMessage(DOMWindow* activeWindow); |
| 224 String sanitizedCrossDomainAccessErrorMessage(DOMWindow* activeWindow); | 225 String sanitizedCrossDomainAccessErrorMessage(DOMWindow* activeWindow); |
| 225 | 226 |
| 226 void postMessage(PassRefPtr<SerializedScriptValue> message, const Messag
ePortArray*, const String& targetOrigin, DOMWindow* source, ExceptionState&); | 227 void postMessage(PassRefPtr<SerializedScriptValue> message, const Messag
ePortArray*, const String& targetOrigin, DOMWindow* source, ExceptionState&); |
| 227 void postMessageTimerFired(PassOwnPtr<PostMessageTimer>); | 228 void postMessageTimerFired(PassOwnPtr<PostMessageTimer>); |
| 228 void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetO
rigin, PassRefPtr<Event>, PassRefPtr<ScriptCallStack>); | 229 void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetO
rigin, PassRefPtr<Event>, PassRefPtr<ScriptCallStack>); |
| 229 | 230 |
| 230 void scrollBy(int x, int y) const; | 231 void scrollBy(int x, int y, const Dictionary& scrollOptions, ExceptionSt
ate&) const; |
| 231 void scrollTo(int x, int y) const; | 232 void scrollTo(int x, int y, const Dictionary& scrollOptions, ExceptionSt
ate&) const; |
| 232 void scroll(int x, int y) const { scrollTo(x, y); } | 233 void scroll(int x, int y, const Dictionary& scrollOptions, ExceptionStat
e& exceptionState) const { scrollTo(x, y, scrollOptions, exceptionState); } |
| 233 | 234 |
| 234 void moveBy(float x, float y) const; | 235 void moveBy(float x, float y) const; |
| 235 void moveTo(float x, float y) const; | 236 void moveTo(float x, float y) const; |
| 236 | 237 |
| 237 void resizeBy(float x, float y) const; | 238 void resizeBy(float x, float y) const; |
| 238 void resizeTo(float width, float height) const; | 239 void resizeTo(float width, float height) const; |
| 239 | 240 |
| 240 // WebKit animation extensions | 241 // WebKit animation extensions |
| 241 int requestAnimationFrame(PassOwnPtr<RequestAnimationFrameCallback>); | 242 int requestAnimationFrame(PassOwnPtr<RequestAnimationFrameCallback>); |
| 242 int webkitRequestAnimationFrame(PassOwnPtr<RequestAnimationFrameCallback
>); | 243 int webkitRequestAnimationFrame(PassOwnPtr<RequestAnimationFrameCallback
>); |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 } | 379 } |
| 379 | 380 |
| 380 inline String DOMWindow::defaultStatus() const | 381 inline String DOMWindow::defaultStatus() const |
| 381 { | 382 { |
| 382 return m_defaultStatus; | 383 return m_defaultStatus; |
| 383 } | 384 } |
| 384 | 385 |
| 385 } // namespace WebCore | 386 } // namespace WebCore |
| 386 | 387 |
| 387 #endif // DOMWindow_h | 388 #endif // DOMWindow_h |
| OLD | NEW |