Source/core/testing/Internals.cpp - Issue 967213004: Removed FrameView's windowToContents and contentsToWindow methods.

Unified Diff: Source/core/testing/Internals.cpp

Issue 967213004: Removed FrameView's windowToContents and contentsToWindow methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Addressed rbyers@ feedback (minus tests) Created 5 years, 9 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 side-by-side diff with in-line comments

Download patch

Index: Source/core/testing/Internals.cpp

diff --git a/Source/core/testing/Internals.cpp b/Source/core/testing/Internals.cpp

index 927ba10db88f3aadf2c8fda29ea0350f310a108f..a1c0e375dd7f7890d08e2c400980f321261a84fd 100644

--- a/Source/core/testing/Internals.cpp

+++ b/Source/core/testing/Internals.cpp

@@ -979,7 +979,7 @@ DOMPoint* Internals::touchPositionAdjustedToBestClickableNode(long x, long y, lo

IntPoint point(x + radius.width(), y + radius.height());

EventHandler& eventHandler = document->frame()->eventHandler();

- IntPoint hitTestPoint = document->frame()->view()->windowToContents(point);

+ IntPoint hitTestPoint = document->frame()->view()->rootFrameToContents(point);

HitTestResult result = eventHandler.hitTestResultAtPoint(hitTestPoint, HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::ListBased, LayoutSize(radius));

Node* targetNode = 0;

@@ -1006,7 +1006,7 @@ Node* Internals::touchNodeAdjustedToBestClickableNode(long x, long y, long width

IntPoint point(x + radius.width(), y + radius.height());

EventHandler& eventHandler = document->frame()->eventHandler();

- IntPoint hitTestPoint = document->frame()->view()->windowToContents(point);

+ IntPoint hitTestPoint = document->frame()->view()->rootFrameToContents(point);

HitTestResult result = eventHandler.hitTestResultAtPoint(hitTestPoint, HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::ListBased, LayoutSize(radius));

Node* targetNode = 0;

@@ -1029,7 +1029,7 @@ DOMPoint* Internals::touchPositionAdjustedToBestContextMenuNode(long x, long y,

IntPoint point(x + radius.width(), y + radius.height());

EventHandler& eventHandler = document->frame()->eventHandler();

- IntPoint hitTestPoint = document->frame()->view()->windowToContents(point);

+ IntPoint hitTestPoint = document->frame()->view()->rootFrameToContents(point);

HitTestResult result = eventHandler.hitTestResultAtPoint(hitTestPoint, HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::ListBased, LayoutSize(radius));

Node* targetNode = 0;

@@ -1056,7 +1056,7 @@ Node* Internals::touchNodeAdjustedToBestContextMenuNode(long x, long y, long wid

IntPoint point(x + radius.width(), y + radius.height());

EventHandler& eventHandler = document->frame()->eventHandler();

- IntPoint hitTestPoint = document->frame()->view()->windowToContents(point);

+ IntPoint hitTestPoint = document->frame()->view()->rootFrameToContents(point);

HitTestResult result = eventHandler.hitTestResultAtPoint(hitTestPoint, HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::ListBased, LayoutSize(radius));

Node* targetNode = 0;

« Source/core/frame/FrameView.h ('K') | « Source/core/page/TouchDisambiguation.cpp ('k') | Source/web/ChromeClientImpl.cpp » ('j') | no next file with comments »