| 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 void scrollBy(int x, int y) const; | 236 void scrollBy(int x, int y) const; |
| 237 void scrollTo(int x, int y) const; | 237 void scrollTo(int x, int y) const; |
| 238 void scroll(int x, int y) const { scrollTo(x, y); } | 238 void scroll(int x, int y) const { scrollTo(x, y); } |
| 239 | 239 |
| 240 void moveBy(float x, float y) const; | 240 void moveBy(float x, float y) const; |
| 241 void moveTo(float x, float y) const; | 241 void moveTo(float x, float y) const; |
| 242 | 242 |
| 243 void resizeBy(float x, float y) const; | 243 void resizeBy(float x, float y) const; |
| 244 void resizeTo(float width, float height) const; | 244 void resizeTo(float width, float height) const; |
| 245 | 245 |
| 246 // Timers | |
| 247 void clearTimeout(int timeoutId); | |
| 248 void clearInterval(int timeoutId); | |
| 249 | |
| 250 // Images | 246 // Images |
| 251 void createImageBitmap(HTMLImageElement*, PassRefPtr<ImageBitmapCallback
>, ExceptionCode&); | 247 void createImageBitmap(HTMLImageElement*, PassRefPtr<ImageBitmapCallback
>, ExceptionCode&); |
| 252 void createImageBitmap(HTMLImageElement*, PassRefPtr<ImageBitmapCallback
>, int sx, int sy, int sw, int sh, ExceptionCode&); | 248 void createImageBitmap(HTMLImageElement*, PassRefPtr<ImageBitmapCallback
>, int sx, int sy, int sw, int sh, ExceptionCode&); |
| 253 void createImageBitmap(HTMLVideoElement*, PassRefPtr<ImageBitmapCallback
>, ExceptionCode&); | 249 void createImageBitmap(HTMLVideoElement*, PassRefPtr<ImageBitmapCallback
>, ExceptionCode&); |
| 254 void createImageBitmap(HTMLVideoElement*, PassRefPtr<ImageBitmapCallback
>, int sx, int sy, int sw, int sh, ExceptionCode&); | 250 void createImageBitmap(HTMLVideoElement*, PassRefPtr<ImageBitmapCallback
>, int sx, int sy, int sw, int sh, ExceptionCode&); |
| 255 void createImageBitmap(CanvasRenderingContext2D*, PassRefPtr<ImageBitmap
Callback>, ExceptionCode&); | 251 void createImageBitmap(CanvasRenderingContext2D*, PassRefPtr<ImageBitmap
Callback>, ExceptionCode&); |
| 256 void createImageBitmap(CanvasRenderingContext2D*, PassRefPtr<ImageBitmap
Callback>, int sx, int sy, int sw, int sh, ExceptionCode&); | 252 void createImageBitmap(CanvasRenderingContext2D*, PassRefPtr<ImageBitmap
Callback>, int sx, int sy, int sw, int sh, ExceptionCode&); |
| 257 void createImageBitmap(HTMLCanvasElement*, PassRefPtr<ImageBitmapCallbac
k>, ExceptionCode&); | 253 void createImageBitmap(HTMLCanvasElement*, PassRefPtr<ImageBitmapCallbac
k>, ExceptionCode&); |
| 258 void createImageBitmap(HTMLCanvasElement*, PassRefPtr<ImageBitmapCallbac
k>, int sx, int sy, int sw, int sh, ExceptionCode&); | 254 void createImageBitmap(HTMLCanvasElement*, PassRefPtr<ImageBitmapCallbac
k>, int sx, int sy, int sw, int sh, ExceptionCode&); |
| 259 void createImageBitmap(ImageData*, PassRefPtr<ImageBitmapCallback>, Exce
ptionCode&); | 255 void createImageBitmap(ImageData*, PassRefPtr<ImageBitmapCallback>, Exce
ptionCode&); |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 } | 446 } |
| 451 | 447 |
| 452 inline String DOMWindow::defaultStatus() const | 448 inline String DOMWindow::defaultStatus() const |
| 453 { | 449 { |
| 454 return m_defaultStatus; | 450 return m_defaultStatus; |
| 455 } | 451 } |
| 456 | 452 |
| 457 } // namespace WebCore | 453 } // namespace WebCore |
| 458 | 454 |
| 459 #endif // DOMWindow_h | 455 #endif // DOMWindow_h |
| OLD | NEW |