Rename DOMWindow to LocalDOMWindow

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 92 matching lines @@
     webViewImpl->settings()->setViewportEnabled(true);
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     webViewImpl->setPageScaleFactor(2);
 
     FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
     RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();
-    DOMWindow* domWindow = document->domWindow();
+    LocalDOMWindow* 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;
         webMouseEvent.globalX = 10;
@@ skipping 329 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();
 
+<<<<<<< HEAD
     FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
     RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();
     DOMWindow* domWindow = document->domWindow();
+=======
+    FrameView* view = webViewImpl->page()->mainFrame()->view();
+    RefPtrWillBeRawPtr<Document> document = webViewImpl->page()->mainFrame()->document();
+    LocalDOMWindow* domWindow = document->domWindow();
+>>>>>>> First cut at the rename
     RenderView* documentRenderView = document->renderView();
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTap;
         webGestureEvent.x = 10;
         webGestureEvent.y = 10;
         webGestureEvent.globalX = 10;
         webGestureEvent.globalY = 10;
         webGestureEvent.data.tap.tapCount = 1;
@@ skipping 110 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