Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

Issue 1367023002: Replace timeout argument with IdleRequestOptions in requestIdleCallback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rIC_histograms
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after
1285 return document->requestAnimationFrame(callback); 1285 return document->requestAnimationFrame(callback);
1286 return 0; 1286 return 0;
1287 } 1287 }
1288 1288
1289 void LocalDOMWindow::cancelAnimationFrame(int id) 1289 void LocalDOMWindow::cancelAnimationFrame(int id)
1290 { 1290 {
1291 if (Document* document = this->document()) 1291 if (Document* document = this->document())
1292 document->cancelAnimationFrame(id); 1292 document->cancelAnimationFrame(id);
1293 } 1293 }
1294 1294
1295 int LocalDOMWindow::requestIdleCallback(IdleRequestCallback* callback, double ti meoutMillis) 1295 int LocalDOMWindow::requestIdleCallback(IdleRequestCallback* callback, const Idl eRequestOptions& options)
1296 { 1296 {
1297 if (Document* document = this->document()) 1297 if (Document* document = this->document())
1298 return document->requestIdleCallback(callback, timeoutMillis); 1298 return document->requestIdleCallback(callback, options);
1299 return 0; 1299 return 0;
1300 } 1300 }
1301 1301
1302 void LocalDOMWindow::cancelIdleCallback(int id) 1302 void LocalDOMWindow::cancelIdleCallback(int id)
1303 { 1303 {
1304 if (Document* document = this->document()) 1304 if (Document* document = this->document())
1305 document->cancelIdleCallback(id); 1305 document->cancelIdleCallback(id);
1306 } 1306 }
1307 1307
1308 bool LocalDOMWindow::addEventListener(const AtomicString& eventType, PassRefPtrW illBeRawPtr<EventListener> prpListener, bool useCapture) 1308 bool LocalDOMWindow::addEventListener(const AtomicString& eventType, PassRefPtrW illBeRawPtr<EventListener> prpListener, bool useCapture)
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 DOMWindow::trace(visitor); 1509 DOMWindow::trace(visitor);
1510 DOMWindowLifecycleNotifier::trace(visitor); 1510 DOMWindowLifecycleNotifier::trace(visitor);
1511 } 1511 }
1512 1512
1513 LocalFrame* LocalDOMWindow::frame() const 1513 LocalFrame* LocalDOMWindow::frame() const
1514 { 1514 {
1515 return m_frameObserver->frame(); 1515 return m_frameObserver->frame();
1516 } 1516 }
1517 1517
1518 } // namespace blink 1518 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalDOMWindow.h ('k') | third_party/WebKit/Source/core/frame/RemoteDOMWindow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698