| 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 1468 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1479 | 1479 | 
| 1480     if (m_frame != page->mainFrame()) | 1480     if (m_frame != page->mainFrame()) | 
| 1481         return; | 1481         return; | 
| 1482 | 1482 | 
| 1483     FloatRect fr = page->chrome().windowRect(); | 1483     FloatRect fr = page->chrome().windowRect(); | 
| 1484     FloatSize dest = FloatSize(width, height); | 1484     FloatSize dest = FloatSize(width, height); | 
| 1485     FloatRect update(fr.location(), dest); | 1485     FloatRect update(fr.location(), dest); | 
| 1486     page->chrome().setWindowRect(adjustWindowRect(page, update)); | 1486     page->chrome().setWindowRect(adjustWindowRect(page, update)); | 
| 1487 } | 1487 } | 
| 1488 | 1488 | 
| 1489 int DOMWindow::requestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> c
      allback) | 1489 int DOMWindow::requestAnimationFrame(PassOwnPtr<RequestAnimationFrameCallback> c
      allback) | 
| 1490 { | 1490 { | 
| 1491     callback->m_useLegacyTimeBase = false; | 1491     callback->m_useLegacyTimeBase = false; | 
| 1492     if (Document* d = document()) | 1492     if (Document* d = document()) | 
| 1493         return d->requestAnimationFrame(callback); | 1493         return d->requestAnimationFrame(callback); | 
| 1494     return 0; | 1494     return 0; | 
| 1495 } | 1495 } | 
| 1496 | 1496 | 
| 1497 int DOMWindow::webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallb
      ack> callback) | 1497 int DOMWindow::webkitRequestAnimationFrame(PassOwnPtr<RequestAnimationFrameCallb
      ack> callback) | 
| 1498 { | 1498 { | 
| 1499     callback->m_useLegacyTimeBase = true; | 1499     callback->m_useLegacyTimeBase = true; | 
| 1500     if (Document* d = document()) | 1500     if (Document* d = document()) | 
| 1501         return d->requestAnimationFrame(callback); | 1501         return d->requestAnimationFrame(callback); | 
| 1502     return 0; | 1502     return 0; | 
| 1503 } | 1503 } | 
| 1504 | 1504 | 
| 1505 void DOMWindow::cancelAnimationFrame(int id) | 1505 void DOMWindow::cancelAnimationFrame(int id) | 
| 1506 { | 1506 { | 
| 1507     if (Document* d = document()) | 1507     if (Document* d = document()) | 
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1876     return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<DOMWindow>:
      :lifecycleNotifier()); | 1876     return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<DOMWindow>:
      :lifecycleNotifier()); | 
| 1877 } | 1877 } | 
| 1878 | 1878 | 
| 1879 PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier() | 1879 PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier() | 
| 1880 { | 1880 { | 
| 1881     return DOMWindowLifecycleNotifier::create(this); | 1881     return DOMWindowLifecycleNotifier::create(this); | 
| 1882 } | 1882 } | 
| 1883 | 1883 | 
| 1884 | 1884 | 
| 1885 } // namespace WebCore | 1885 } // namespace WebCore | 
| OLD | NEW | 
|---|