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

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

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 6 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/WebFrameTest.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/WebInputEventConversionTest.cpp
diff --git a/Source/web/tests/WebInputEventConversionTest.cpp b/Source/web/tests/WebInputEventConversionTest.cpp
index 3341da6e5516ad629e5b4d4e7cb241a175868cd0..faa8b6117ef1bb83745d7a8177af6526020bbb1f 100644
--- a/Source/web/tests/WebInputEventConversionTest.cpp
+++ b/Source/web/tests/WebInputEventConversionTest.cpp
@@ -108,8 +108,8 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
webViewImpl->setPageScaleFactor(2);
- FrameView* view = webViewImpl->page()->mainFrame()->view();
- RefPtrWillBeRawPtr<Document> document = webViewImpl->page()->mainFrame()->document();
+ FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
+ RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();
DOMWindow* domWindow = document->domWindow();
RenderView* documentRenderView = document->renderView();
@@ -283,7 +283,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
}
{
- RefPtrWillBeRawPtr<Touch> touch = Touch::create(webViewImpl->page()->mainFrame(), document.get(), 0, FloatPoint(10, 9.5), FloatPoint(3.5, 2), FloatSize(4, 4.5), 0, 0);
+ RefPtrWillBeRawPtr<Touch> touch = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), 0, FloatPoint(10, 9.5), FloatPoint(3.5, 2), FloatSize(4, 4.5), 0, 0);
RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();
touchList->append(touch);
RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), WebCore::EventTypeNames::touchmove, domWindow, false, false, false, false, false);
@@ -317,7 +317,7 @@ TEST(WebInputEventConversionTest, InputEventsTransform)
webViewImpl->setPageScaleFactor(2);
webViewImpl->setRootLayerTransform(WebSize(10, 20), 1.5);
- FrameView* view = webViewImpl->page()->mainFrame()->view();
+ FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
{
WebMouseEvent webMouseEvent;
@@ -460,8 +460,8 @@ TEST(WebInputEventConversionTest, InputEventsConversions)
webViewImpl->resize(WebSize(pageWidth, pageHeight));
webViewImpl->layout();
- FrameView* view = webViewImpl->page()->mainFrame()->view();
- RefPtrWillBeRawPtr<Document> document = webViewImpl->page()->mainFrame()->document();
+ FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
+ RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();
DOMWindow* domWindow = document->domWindow();
RenderView* documentRenderView = document->renderView();
@@ -518,7 +518,7 @@ TEST(WebInputEventConversionTest, PinchViewportOffset)
IntPoint pinchOffset(35, 60);
webViewImpl->page()->frameHost().pinchViewport().setLocation(pinchOffset);
- FrameView* view = webViewImpl->page()->mainFrame()->view();
+ FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
{
WebMouseEvent webMouseEvent;
« no previous file with comments | « Source/web/tests/WebFrameTest.cpp ('k') | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698