| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 #include "core/loader/FrameLoadRequest.h" | 67 #include "core/loader/FrameLoadRequest.h" |
| 68 #include "core/loader/FrameLoader.h" | 68 #include "core/loader/FrameLoader.h" |
| 69 #include "core/loader/FrameLoaderClient.h" | 69 #include "core/loader/FrameLoaderClient.h" |
| 70 #include "core/loader/appcache/DOMApplicationCache.h" | 70 #include "core/loader/appcache/DOMApplicationCache.h" |
| 71 #include "core/page/BarProp.h" | 71 #include "core/page/BarProp.h" |
| 72 #include "core/page/Chrome.h" | 72 #include "core/page/Chrome.h" |
| 73 #include "core/page/ChromeClient.h" | 73 #include "core/page/ChromeClient.h" |
| 74 #include "core/page/Console.h" | 74 #include "core/page/Console.h" |
| 75 #include "core/page/CreateWindow.h" | 75 #include "core/page/CreateWindow.h" |
| 76 #include "core/page/DOMPoint.h" | 76 #include "core/page/DOMPoint.h" |
| 77 #include "core/page/DOMTimer.h" | |
| 78 #include "core/page/EventHandler.h" | 77 #include "core/page/EventHandler.h" |
| 79 #include "core/page/Frame.h" | 78 #include "core/page/Frame.h" |
| 80 #include "core/page/FrameTree.h" | 79 #include "core/page/FrameTree.h" |
| 81 #include "core/page/FrameView.h" | 80 #include "core/page/FrameView.h" |
| 82 #include "core/page/History.h" | 81 #include "core/page/History.h" |
| 83 #include "core/page/ImageBitmap.h" | 82 #include "core/page/ImageBitmap.h" |
| 84 #include "core/page/ImageBitmapCallback.h" | 83 #include "core/page/ImageBitmapCallback.h" |
| 85 #include "core/page/Location.h" | 84 #include "core/page/Location.h" |
| 86 #include "core/page/Navigator.h" | 85 #include "core/page/Navigator.h" |
| 87 #include "core/page/Page.h" | 86 #include "core/page/Page.h" |
| (...skipping 1266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1354 | 1353 |
| 1355 if (m_frame != page->mainFrame()) | 1354 if (m_frame != page->mainFrame()) |
| 1356 return; | 1355 return; |
| 1357 | 1356 |
| 1358 FloatRect fr = page->chrome().windowRect(); | 1357 FloatRect fr = page->chrome().windowRect(); |
| 1359 FloatSize dest = FloatSize(width, height); | 1358 FloatSize dest = FloatSize(width, height); |
| 1360 FloatRect update(fr.location(), dest); | 1359 FloatRect update(fr.location(), dest); |
| 1361 page->chrome().setWindowRect(adjustWindowRect(page, update)); | 1360 page->chrome().setWindowRect(adjustWindowRect(page, update)); |
| 1362 } | 1361 } |
| 1363 | 1362 |
| 1364 void DOMWindow::clearTimeout(int timeoutID) | |
| 1365 { | |
| 1366 if (ScriptExecutionContext* context = scriptExecutionContext()) | |
| 1367 DOMTimer::removeByID(context, timeoutID); | |
| 1368 } | |
| 1369 | |
| 1370 void DOMWindow::clearInterval(int timeoutID) | |
| 1371 { | |
| 1372 if (ScriptExecutionContext* context = scriptExecutionContext()) | |
| 1373 DOMTimer::removeByID(context, timeoutID); | |
| 1374 } | |
| 1375 | |
| 1376 static LayoutSize size(HTMLImageElement* image) | 1363 static LayoutSize size(HTMLImageElement* image) |
| 1377 { | 1364 { |
| 1378 if (CachedImage* cachedImage = image->cachedImage()) | 1365 if (CachedImage* cachedImage = image->cachedImage()) |
| 1379 return cachedImage->imageSizeForRenderer(image->renderer(), 1.0f); // FI
XME: Not sure about this. | 1366 return cachedImage->imageSizeForRenderer(image->renderer(), 1.0f); // FI
XME: Not sure about this. |
| 1380 return IntSize(); | 1367 return IntSize(); |
| 1381 } | 1368 } |
| 1382 | 1369 |
| 1383 static IntSize size(HTMLVideoElement* video) | 1370 static IntSize size(HTMLVideoElement* video) |
| 1384 { | 1371 { |
| 1385 if (MediaPlayer* player = video->player()) | 1372 if (MediaPlayer* player = video->player()) |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1922 | 1909 |
| 1923 Frame* child = frame->tree()->scopedChild(index); | 1910 Frame* child = frame->tree()->scopedChild(index); |
| 1924 if (child) | 1911 if (child) |
| 1925 return child->domWindow(); | 1912 return child->domWindow(); |
| 1926 | 1913 |
| 1927 return 0; | 1914 return 0; |
| 1928 } | 1915 } |
| 1929 | 1916 |
| 1930 | 1917 |
| 1931 } // namespace WebCore | 1918 } // namespace WebCore |
| OLD | NEW |