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 1535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1546 { | 1546 { |
1547 ScriptExecutionContext* context = scriptExecutionContext(); | 1547 ScriptExecutionContext* context = scriptExecutionContext(); |
1548 if (!context) | 1548 if (!context) |
1549 return; | 1549 return; |
1550 DOMTimer::removeById(context, timeoutId); | 1550 DOMTimer::removeById(context, timeoutId); |
1551 } | 1551 } |
1552 | 1552 |
1553 #if ENABLE(REQUEST_ANIMATION_FRAME) | 1553 #if ENABLE(REQUEST_ANIMATION_FRAME) |
1554 int DOMWindow::requestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> c
allback) | 1554 int DOMWindow::requestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> c
allback) |
1555 { | 1555 { |
| 1556 callback->m_useLegacyTimeBase = false; |
| 1557 if (Document* d = document()) |
| 1558 return d->requestAnimationFrame(callback); |
| 1559 return 0; |
| 1560 } |
| 1561 |
| 1562 int DOMWindow::webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallb
ack> callback) |
| 1563 { |
| 1564 callback->m_useLegacyTimeBase = true; |
1556 if (Document* d = document()) | 1565 if (Document* d = document()) |
1557 return d->requestAnimationFrame(callback); | 1566 return d->requestAnimationFrame(callback); |
1558 return 0; | 1567 return 0; |
1559 } | 1568 } |
1560 | 1569 |
1561 void DOMWindow::cancelAnimationFrame(int id) | 1570 void DOMWindow::cancelAnimationFrame(int id) |
1562 { | 1571 { |
1563 if (Document* d = document()) | 1572 if (Document* d = document()) |
1564 d->cancelAnimationFrame(id); | 1573 d->cancelAnimationFrame(id); |
1565 } | 1574 } |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1960 | 1969 |
1961 Frame* dialogFrame = createWindow(urlString, emptyAtom, WindowFeatures(dialo
gFeaturesString, screenAvailableRect(m_frame->view())), | 1970 Frame* dialogFrame = createWindow(urlString, emptyAtom, WindowFeatures(dialo
gFeaturesString, screenAvailableRect(m_frame->view())), |
1962 activeWindow, firstFrame, m_frame, function, functionContext); | 1971 activeWindow, firstFrame, m_frame, function, functionContext); |
1963 if (!dialogFrame) | 1972 if (!dialogFrame) |
1964 return; | 1973 return; |
1965 | 1974 |
1966 dialogFrame->page()->chrome()->runModal(); | 1975 dialogFrame->page()->chrome()->runModal(); |
1967 } | 1976 } |
1968 | 1977 |
1969 } // namespace WebCore | 1978 } // namespace WebCore |
OLD | NEW |