| Index: third_party/WebKit/Source/core/testing/Internals.cpp
|
| diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp
|
| index b64438310952189c839cc91f4cd6784215ab5d59..b207aed6063d6a606629b2ef5124b75363dd765b 100644
|
| --- a/third_party/WebKit/Source/core/testing/Internals.cpp
|
| +++ b/third_party/WebKit/Source/core/testing/Internals.cpp
|
| @@ -28,6 +28,7 @@
|
|
|
| #include "bindings/core/v8/ExceptionMessages.h"
|
| #include "bindings/core/v8/ExceptionState.h"
|
| +#include "bindings/core/v8/GeometryInterfaces.h"
|
| #include "bindings/core/v8/ScriptFunction.h"
|
| #include "bindings/core/v8/ScriptPromise.h"
|
| #include "bindings/core/v8/ScriptPromiseResolver.h"
|
| @@ -46,7 +47,6 @@
|
| #include "core/dom/ClientRectList.h"
|
| #include "core/dom/DOMArrayBuffer.h"
|
| #include "core/dom/DOMNodeIds.h"
|
| -#include "core/dom/DOMPoint.h"
|
| #include "core/dom/DOMStringList.h"
|
| #include "core/dom/Document.h"
|
| #include "core/dom/Element.h"
|
| @@ -1074,12 +1074,12 @@ String Internals::rangeAsText(const Range* range)
|
| // FIXME: The next four functions are very similar - combine them once
|
| // bestClickableNode/bestContextMenuNode have been combined..
|
|
|
| -DOMPoint* Internals::touchPositionAdjustedToBestClickableNode(long x, long y, long width, long height, Document* document, ExceptionState& exceptionState)
|
| +ScriptValue Internals::touchPositionAdjustedToBestClickableNode(long x, long y, long width, long height, Document* document, ExceptionState& exceptionState)
|
| {
|
| ASSERT(document);
|
| if (!document->frame()) {
|
| exceptionState.throwDOMException(InvalidAccessError, "The document provided is invalid.");
|
| - return 0;
|
| + return GeometryInterfaces::createDOMPoint();
|
| }
|
|
|
| document->updateLayout();
|
| @@ -1096,9 +1096,9 @@ DOMPoint* Internals::touchPositionAdjustedToBestClickableNode(long x, long y, lo
|
|
|
| bool foundNode = eventHandler.bestClickableNodeForHitTestResult(result, adjustedPoint, targetNode);
|
| if (foundNode)
|
| - return DOMPoint::create(adjustedPoint.x(), adjustedPoint.y());
|
| + return GeometryInterfaces::createDOMPoint(adjustedPoint.x(), adjustedPoint.y());
|
|
|
| - return 0;
|
| + return GeometryInterfaces::createDOMPoint();
|
| }
|
|
|
| Node* Internals::touchNodeAdjustedToBestClickableNode(long x, long y, long width, long height, Document* document, ExceptionState& exceptionState)
|
| @@ -1124,12 +1124,12 @@ Node* Internals::touchNodeAdjustedToBestClickableNode(long x, long y, long width
|
| return targetNode;
|
| }
|
|
|
| -DOMPoint* Internals::touchPositionAdjustedToBestContextMenuNode(long x, long y, long width, long height, Document* document, ExceptionState& exceptionState)
|
| +ScriptValue Internals::touchPositionAdjustedToBestContextMenuNode(long x, long y, long width, long height, Document* document, ExceptionState& exceptionState)
|
| {
|
| ASSERT(document);
|
| if (!document->frame()) {
|
| exceptionState.throwDOMException(InvalidAccessError, "The document provided is invalid.");
|
| - return 0;
|
| + return GeometryInterfaces::createDOMPoint();
|
| }
|
|
|
| document->updateLayout();
|
| @@ -1146,9 +1146,9 @@ DOMPoint* Internals::touchPositionAdjustedToBestContextMenuNode(long x, long y,
|
|
|
| bool foundNode = eventHandler.bestContextMenuNodeForHitTestResult(result, adjustedPoint, targetNode);
|
| if (foundNode)
|
| - return DOMPoint::create(adjustedPoint.x(), adjustedPoint.y());
|
| + return GeometryInterfaces::createDOMPoint(adjustedPoint.x(), adjustedPoint.y());
|
|
|
| - return DOMPoint::create(x, y);
|
| + return GeometryInterfaces::createDOMPoint(x, y);
|
| }
|
|
|
| Node* Internals::touchNodeAdjustedToBestContextMenuNode(long x, long y, long width, long height, Document* document, ExceptionState& exceptionState)
|
|
|