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

Unified Diff: Source/web/tests/WebPluginContainerTest.cpp

Issue 967213004: Removed FrameView's windowToContents and contentsToWindow methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase 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
« no previous file with comments | « Source/web/tests/TouchActionTest.cpp ('k') | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/WebPluginContainerTest.cpp
diff --git a/Source/web/tests/WebPluginContainerTest.cpp b/Source/web/tests/WebPluginContainerTest.cpp
index f711a044f11be3d0a4269daae825366ebfccb979..a2c7cdadf0afb8be6d5e2b1064f980bfaa0d7d7d 100644
--- a/Source/web/tests/WebPluginContainerTest.cpp
+++ b/Source/web/tests/WebPluginContainerTest.cpp
@@ -117,19 +117,19 @@ TEST_F(WebPluginContainerTest, WindowToLocalPointTest)
WebPluginContainer* pluginContainerOne = getWebPluginContainer(webView, WebString::fromUTF8("translated-plugin"));
ASSERT(pluginContainerOne);
- WebPoint point1 = pluginContainerOne->windowToLocalPoint(WebPoint(10, 10));
+ WebPoint point1 = pluginContainerOne->rootFrameToLocalPoint(WebPoint(10, 10));
ASSERT_EQ(0, point1.x);
ASSERT_EQ(0, point1.y);
- WebPoint point2 = pluginContainerOne->windowToLocalPoint(WebPoint(100, 100));
+ WebPoint point2 = pluginContainerOne->rootFrameToLocalPoint(WebPoint(100, 100));
ASSERT_EQ(90, point2.x);
ASSERT_EQ(90, point2.y);
WebPluginContainer* pluginContainerTwo = getWebPluginContainer(webView, WebString::fromUTF8("rotated-plugin"));
ASSERT(pluginContainerTwo);
- WebPoint point3 = pluginContainerTwo->windowToLocalPoint(WebPoint(0, 10));
+ WebPoint point3 = pluginContainerTwo->rootFrameToLocalPoint(WebPoint(0, 10));
ASSERT_EQ(10, point3.x);
ASSERT_EQ(0, point3.y);
- WebPoint point4 = pluginContainerTwo->windowToLocalPoint(WebPoint(-10, 10));
+ WebPoint point4 = pluginContainerTwo->rootFrameToLocalPoint(WebPoint(-10, 10));
ASSERT_EQ(10, point4.x);
ASSERT_EQ(10, point4.y);
}
@@ -147,19 +147,19 @@ TEST_F(WebPluginContainerTest, LocalToWindowPointTest)
WebPluginContainer* pluginContainerOne = getWebPluginContainer(webView, WebString::fromUTF8("translated-plugin"));
ASSERT(pluginContainerOne);
- WebPoint point1 = pluginContainerOne->localToWindowPoint(WebPoint(0, 0));
+ WebPoint point1 = pluginContainerOne->localToRootFramePoint(WebPoint(0, 0));
ASSERT_EQ(10, point1.x);
ASSERT_EQ(10, point1.y);
- WebPoint point2 = pluginContainerOne->localToWindowPoint(WebPoint(90, 90));
+ WebPoint point2 = pluginContainerOne->localToRootFramePoint(WebPoint(90, 90));
ASSERT_EQ(100, point2.x);
ASSERT_EQ(100, point2.y);
WebPluginContainer* pluginContainerTwo = getWebPluginContainer(webView, WebString::fromUTF8("rotated-plugin"));
ASSERT(pluginContainerTwo);
- WebPoint point3 = pluginContainerTwo->localToWindowPoint(WebPoint(10, 0));
+ WebPoint point3 = pluginContainerTwo->localToRootFramePoint(WebPoint(10, 0));
ASSERT_EQ(0, point3.x);
ASSERT_EQ(10, point3.y);
- WebPoint point4 = pluginContainerTwo->localToWindowPoint(WebPoint(10, 10));
+ WebPoint point4 = pluginContainerTwo->localToRootFramePoint(WebPoint(10, 10));
ASSERT_EQ(-10, point4.x);
ASSERT_EQ(10, point4.y);
}
« no previous file with comments | « Source/web/tests/TouchActionTest.cpp ('k') | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698