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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 369793003: Make the web-animations engine use the passed in blink::WebFrameTime values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixing remaining usages of -1 in the code. Created 6 years, 5 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
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/dom/ScriptedAnimationController.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 5184 matching lines...) Expand 10 before | Expand all | Expand 10 after
5195 return ensureScriptedAnimationController().registerCallback(callback); 5195 return ensureScriptedAnimationController().registerCallback(callback);
5196 } 5196 }
5197 5197
5198 void Document::cancelAnimationFrame(int id) 5198 void Document::cancelAnimationFrame(int id)
5199 { 5199 {
5200 if (!m_scriptedAnimationController) 5200 if (!m_scriptedAnimationController)
5201 return; 5201 return;
5202 m_scriptedAnimationController->cancelCallback(id); 5202 m_scriptedAnimationController->cancelCallback(id);
5203 } 5203 }
5204 5204
5205 void Document::serviceScriptedAnimations(double monotonicAnimationStartTime) 5205 void Document::serviceScriptedAnimations(blink::WebFrameTime frameTime)
5206 { 5206 {
5207 if (!m_scriptedAnimationController) 5207 if (!m_scriptedAnimationController)
5208 return; 5208 return;
5209 m_scriptedAnimationController->serviceScriptedAnimations(monotonicAnimationS tartTime); 5209 m_scriptedAnimationController->serviceScriptedAnimations(frameTime);
5210 } 5210 }
5211 5211
5212 PassRefPtrWillBeRawPtr<Touch> Document::createTouch(LocalDOMWindow* window, Even tTarget* target, int identifier, double pageX, double pageY, double screenX, dou ble screenY, double radiusX, double radiusY, float rotationAngle, float force) c onst 5212 PassRefPtrWillBeRawPtr<Touch> Document::createTouch(LocalDOMWindow* window, Even tTarget* target, int identifier, double pageX, double pageY, double screenX, dou ble screenY, double radiusX, double radiusY, float rotationAngle, float force) c onst
5213 { 5213 {
5214 // Match behavior from when these types were integers, and avoid surprises f rom someone explicitly 5214 // Match behavior from when these types were integers, and avoid surprises f rom someone explicitly
5215 // passing Infinity/NaN. 5215 // passing Infinity/NaN.
5216 if (!std::isfinite(pageX)) 5216 if (!std::isfinite(pageX))
5217 pageX = 0; 5217 pageX = 0;
5218 if (!std::isfinite(pageY)) 5218 if (!std::isfinite(pageY))
5219 pageY = 0; 5219 pageY = 0;
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
5818 visitor->trace(m_compositorPendingAnimations); 5818 visitor->trace(m_compositorPendingAnimations);
5819 visitor->trace(m_contextDocument); 5819 visitor->trace(m_contextDocument);
5820 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this); 5820 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this);
5821 DocumentSupplementable::trace(visitor); 5821 DocumentSupplementable::trace(visitor);
5822 TreeScope::trace(visitor); 5822 TreeScope::trace(visitor);
5823 ContainerNode::trace(visitor); 5823 ContainerNode::trace(visitor);
5824 ExecutionContext::trace(visitor); 5824 ExecutionContext::trace(visitor);
5825 } 5825 }
5826 5826
5827 } // namespace WebCore 5827 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/dom/ScriptedAnimationController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698