Change Page::m_mainFrame to be a Frame.

Source/web/tests/WebInputEventConversionTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 90 matching lines @@
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true);
     webViewImpl->settings()->setViewportEnabled(true);
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     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();
 
     {
         WebMouseEvent webMouseEvent;
         webMouseEvent.type = WebInputEvent::MouseMove;
         webMouseEvent.x = 10;
         webMouseEvent.y = 10;
         webMouseEvent.windowX = 10;
         webMouseEvent.windowY = 10;
@@ skipping 153 matching lines @@
 
         EXPECT_EQ(10, webGestureBuilder.x);
         EXPECT_EQ(10, webGestureBuilder.y);
         EXPECT_EQ(10, webGestureBuilder.globalX);
         EXPECT_EQ(10, webGestureBuilder.globalY);
         EXPECT_EQ(10, webGestureBuilder.data.scrollUpdate.deltaX);
         EXPECT_EQ(10, webGestureBuilder.data.scrollUpdate.deltaY);
     }
 
     {
-        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);
 
         WebTouchEventBuilder webTouchBuilder(view, documentRenderView, *touchEvent);
         ASSERT_EQ(1u, webTouchBuilder.touchesLength);
         EXPECT_EQ(10, webTouchBuilder.touches[0].screenPosition.x);
         EXPECT_FLOAT_EQ(9.5, webTouchBuilder.touches[0].screenPosition.y);
         EXPECT_FLOAT_EQ(3.5, webTouchBuilder.touches[0].position.x);
         EXPECT_FLOAT_EQ(2, webTouchBuilder.touches[0].position.y);
@@ skipping 13 matching lines @@
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true);
     webViewImpl->settings()->setViewportEnabled(true);
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     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;
         webMouseEvent.type = WebInputEvent::MouseMove;
         webMouseEvent.x = 100;
         webMouseEvent.y = 110;
         webMouseEvent.windowX = 100;
         webMouseEvent.windowY = 110;
         webMouseEvent.globalX = 100;
         webMouseEvent.globalY = 110;
@@ skipping 122 matching lines @@
     const std::string fileName("fixed_layout.html");
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true);
     int pageWidth = 640;
     int pageHeight = 480;
     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();
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTap;
         webGestureEvent.x = 10;
         webGestureEvent.y = 10;
         webGestureEvent.globalX = 10;
         webGestureEvent.globalY = 10;
@@ skipping 36 matching lines @@
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     webViewImpl->setPageScaleFactor(2);
 
     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;
         webMouseEvent.type = WebInputEvent::MouseMove;
         webMouseEvent.x = 10;
         webMouseEvent.y = 10;
         webMouseEvent.windowX = 10;
         webMouseEvent.windowY = 10;
         webMouseEvent.globalX = 10;
         webMouseEvent.globalY = 10;
@@ skipping 54 matching lines @@
 
         PlatformTouchEventBuilder platformTouchBuilder(view, webTouchEvent);
         EXPECT_FLOAT_EQ(10.6f, platformTouchBuilder.touchPoints()[0].screenPos().x());
         EXPECT_FLOAT_EQ(10.4f, platformTouchBuilder.touchPoints()[0].screenPos().y());
         EXPECT_FLOAT_EQ(5.3f + pinchOffset.x(), platformTouchBuilder.touchPoints()[0].pos().x());
         EXPECT_FLOAT_EQ(5.2f + pinchOffset.y(), platformTouchBuilder.touchPoints()[0].pos().y());
     }
 }
 
 } // anonymous namespace