Chromium Code Reviews| Index: Source/core/dom/Document.cpp |
| diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp |
| index 922487e26cebd25b1626c6c36508d8b54749d645..8def508be6a60e1c75b669da1358bb390bb4d821 100644 |
| --- a/Source/core/dom/Document.cpp |
| +++ b/Source/core/dom/Document.cpp |
| @@ -5127,7 +5127,7 @@ void Document::serviceScriptedAnimations(double monotonicAnimationStartTime) |
| m_scriptedAnimationController->serviceScriptedAnimations(monotonicAnimationStartTime); |
| } |
| -PassRefPtrWillBeRawPtr<Touch> Document::createTouch(DOMWindow* window, EventTarget* target, int identifier, double pageX, double pageY, double screenX, double screenY, double radiusX, double radiusY, float rotationAngle, float force) const |
| +PassRefPtrWillBeRawPtr<Touch> Document::createTouch(DOMWindow* window, EventTarget* target, int identifier, double pageX, double pageY, double screenX, double screenY, double radiusX, double radiusY, float rotationAngle, float force, float tilt, float tiltDirection) const |
| { |
| // Match behavior from when these types were integers, and avoid surprises from someone explicitly |
| // passing Infinity/NaN. |
| @@ -5147,13 +5147,17 @@ PassRefPtrWillBeRawPtr<Touch> Document::createTouch(DOMWindow* window, EventTarg |
| rotationAngle = 0; |
| if (!std::isfinite(force)) |
| force = 0; |
| + if (!std::isfinite(tilt)) |
| + tilt = 0; |
|
Rick Byers
2015/02/13 08:48:05
you wanted to preserve NaN, right? This adjusting
d.pikalov
2015/02/13 13:31:17
Right. I have new patchset, with NaN support (I'll
|
| + if (!std::isfinite(tiltDirection)) |
| + tiltDirection = 0; |
| // FIXME: It's not clear from the documentation at |
| // http://developer.apple.com/library/safari/#documentation/UserExperience/Reference/DocumentAdditionsReference/DocumentAdditions/DocumentAdditions.html |
| // 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 |
| // and implement them here. See https://bugs.webkit.org/show_bug.cgi?id=47819 |
| LocalFrame* frame = window && window->isLocalDOMWindow() ? toLocalDOMWindow(window)->frame() : this->frame(); |
| - return Touch::create(frame, target, identifier, FloatPoint(screenX, screenY), FloatPoint(pageX, pageY), FloatSize(radiusX, radiusY), rotationAngle, force); |
| + return Touch::create(frame, target, identifier, FloatPoint(screenX, screenY), FloatPoint(pageX, pageY), FloatSize(radiusX, radiusY), rotationAngle, force, tilt, tiltDirection); |
| } |
| PassRefPtrWillBeRawPtr<TouchList> Document::createTouchList(WillBeHeapVector<RefPtrWillBeMember<Touch>>& touches) const |