| 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 FrameConsole* frameConsole() const; | 226 FrameConsole* frameConsole() const; |
| 227 | 227 |
| 228 void printErrorMessage(const String&); | 228 void printErrorMessage(const String&); |
| 229 String crossDomainAccessErrorMessage(DOMWindow* callingWindow); | 229 String crossDomainAccessErrorMessage(DOMWindow* callingWindow); |
| 230 String sanitizedCrossDomainAccessErrorMessage(DOMWindow* callingWindow); | 230 String sanitizedCrossDomainAccessErrorMessage(DOMWindow* callingWindow); |
| 231 | 231 |
| 232 void postMessage(PassRefPtr<SerializedScriptValue> message, const Messag
ePortArray*, const String& targetOrigin, DOMWindow* source, ExceptionState&); | 232 void postMessage(PassRefPtr<SerializedScriptValue> message, const Messag
ePortArray*, const String& targetOrigin, DOMWindow* source, ExceptionState&); |
| 233 void postMessageTimerFired(PassOwnPtr<PostMessageTimer>); | 233 void postMessageTimerFired(PassOwnPtr<PostMessageTimer>); |
| 234 void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetO
rigin, PassRefPtrWillBeRawPtr<Event>, PassRefPtrWillBeRawPtr<ScriptCallStack>); | 234 void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetO
rigin, PassRefPtrWillBeRawPtr<Event>, PassRefPtrWillBeRawPtr<ScriptCallStack>); |
| 235 | 235 |
| 236 void scrollBy(int x, int y) const; |
| 236 void scrollBy(int x, int y, const Dictionary& scrollOptions, ExceptionSt
ate&) const; | 237 void scrollBy(int x, int y, const Dictionary& scrollOptions, ExceptionSt
ate&) const; |
| 238 void scrollTo(int x, int y) const; |
| 237 void scrollTo(int x, int y, const Dictionary& scrollOptions, ExceptionSt
ate&) const; | 239 void scrollTo(int x, int y, const Dictionary& scrollOptions, ExceptionSt
ate&) const; |
| 240 void scroll(int x, int y) const { scroll(x, y); } |
| 238 void scroll(int x, int y, const Dictionary& scrollOptions, ExceptionStat
e& exceptionState) const { scrollTo(x, y, scrollOptions, exceptionState); } | 241 void scroll(int x, int y, const Dictionary& scrollOptions, ExceptionStat
e& exceptionState) const { scrollTo(x, y, scrollOptions, exceptionState); } |
| 239 | 242 |
| 240 void moveBy(float x, float y) const; | 243 void moveBy(float x, float y) const; |
| 241 void moveTo(float x, float y) const; | 244 void moveTo(float x, float y) const; |
| 242 | 245 |
| 243 void resizeBy(float x, float y) const; | 246 void resizeBy(float x, float y) const; |
| 244 void resizeTo(float width, float height) const; | 247 void resizeTo(float width, float height) const; |
| 245 | 248 |
| 246 // WebKit animation extensions | 249 // WebKit animation extensions |
| 247 int requestAnimationFrame(PassOwnPtr<RequestAnimationFrameCallback>); | 250 int requestAnimationFrame(PassOwnPtr<RequestAnimationFrameCallback>); |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 } | 403 } |
| 401 | 404 |
| 402 inline String DOMWindow::defaultStatus() const | 405 inline String DOMWindow::defaultStatus() const |
| 403 { | 406 { |
| 404 return m_defaultStatus; | 407 return m_defaultStatus; |
| 405 } | 408 } |
| 406 | 409 |
| 407 } // namespace WebCore | 410 } // namespace WebCore |
| 408 | 411 |
| 409 #endif // DOMWindow_h | 412 #endif // DOMWindow_h |
| OLD | NEW |