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

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

Issue 10391049: Merge 116319 - Unreviewed, rolling out r115525. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 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/WebCore/dom/Document.h ('k') | Source/WebCore/dom/RequestAnimationFrameCallback.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 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011 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 5787 matching lines...) Expand 10 before | Expand all | Expand 10 after
5798 return m_scriptedAnimationController->registerCallback(callback); 5798 return m_scriptedAnimationController->registerCallback(callback);
5799 } 5799 }
5800 5800
5801 void Document::webkitCancelAnimationFrame(int id) 5801 void Document::webkitCancelAnimationFrame(int id)
5802 { 5802 {
5803 if (!m_scriptedAnimationController) 5803 if (!m_scriptedAnimationController)
5804 return; 5804 return;
5805 m_scriptedAnimationController->cancelCallback(id); 5805 m_scriptedAnimationController->cancelCallback(id);
5806 } 5806 }
5807 5807
5808 void Document::serviceScriptedAnimations(double monotonicAnimationStartTime) 5808 void Document::serviceScriptedAnimations(DOMTimeStamp time)
5809 { 5809 {
5810 if (!m_scriptedAnimationController) 5810 if (!m_scriptedAnimationController)
5811 return; 5811 return;
5812 m_scriptedAnimationController->serviceScriptedAnimations(monotonicAnimationS tartTime); 5812 m_scriptedAnimationController->serviceScriptedAnimations(time);
5813 } 5813 }
5814 #endif 5814 #endif
5815 5815
5816 #if ENABLE(TOUCH_EVENTS) 5816 #if ENABLE(TOUCH_EVENTS)
5817 PassRefPtr<Touch> Document::createTouch(DOMWindow* window, EventTarget* target, int identifier, int pageX, int pageY, int screenX, int screenY, int radiusX, int radiusY, float rotationAngle, float force, ExceptionCode&) const 5817 PassRefPtr<Touch> Document::createTouch(DOMWindow* window, EventTarget* target, int identifier, int pageX, int pageY, int screenX, int screenY, int radiusX, int radiusY, float rotationAngle, float force, ExceptionCode&) const
5818 { 5818 {
5819 // FIXME: It's not clear from the documentation at 5819 // FIXME: It's not clear from the documentation at
5820 // http://developer.apple.com/library/safari/#documentation/UserExperience/R eference/DocumentAdditionsReference/DocumentAdditions/DocumentAdditions.html 5820 // http://developer.apple.com/library/safari/#documentation/UserExperience/R eference/DocumentAdditionsReference/DocumentAdditions/DocumentAdditions.html
5821 // when this method should throw and nor is it by inspection of iOS behavior . It would be nice to verify any cases where it throws under iOS 5821 // when this method should throw and nor is it by inspection of iOS behavior . It would be nice to verify any cases where it throws under iOS
5822 // and implement them here. See https://bugs.webkit.org/show_bug.cgi?id=4781 9 5822 // and implement them here. See https://bugs.webkit.org/show_bug.cgi?id=4781 9
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
5967 node = pluginDocument->pluginNode(); 5967 node = pluginDocument->pluginNode();
5968 } 5968 }
5969 if (!node && doc->isHTMLDocument()) 5969 if (!node && doc->isHTMLDocument())
5970 node = doc->body(); 5970 node = doc->body();
5971 if (!node) 5971 if (!node)
5972 node = doc->documentElement(); 5972 node = doc->documentElement();
5973 return node; 5973 return node;
5974 } 5974 }
5975 5975
5976 } // namespace WebCore 5976 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/Document.h ('k') | Source/WebCore/dom/RequestAnimationFrameCallback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698