Removed FrameView's windowToContents and contentsToWindow methods.

Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 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 1177 matching lines @@
 };
 
 static bool tapElementById(WebView* webView, WebInputEvent::Type type, const WebString& id)
 {
     ASSERT(webView);
     RefPtrWillBeRawPtr<Element> element = static_cast<PassRefPtrWillBeRawPtr<Element>>(webView->mainFrame()->document().getElementById(id));
     if (!element)
         return false;
 
     element->scrollIntoViewIfNeeded();
+
+    // TODO(bokan): Technically incorrect, event positions should be in viewport space. crbug.com/371902.
     IntPoint center = element->screenRect().center();
 
-    // FIXME: This will be unnecessary since screenRect() will be fixed once crbug.com/371902 lands.
-    PinchViewport& pinchViewport = element->document().frameHost()->pinchViewport();
-    IntPoint centerInViewport = center;
-    centerInViewport.moveBy(-flooredIntPoint(pinchViewport.location()));
-    centerInViewport.scale(pinchViewport.scale(), pinchViewport.scale());
-
     WebGestureEvent event;
     event.type = type;
-    event.x = centerInViewport.x();
-    event.y = centerInViewport.y();
+    event.x = center.x();
+    event.y = center.y();
 
     webView->handleInputEvent(event);
     runPendingTasks();
     return true;
 }
 
 TEST_F(WebViewTest, DetectContentAroundPosition)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("content_listeners.html"));
 
@@ skipping 1272 matching lines @@
     // Test without any preventDefault.
     client.reset();
     frame->executeScript(WebScriptSource("setTest('none');"));
     EXPECT_TRUE(tapElementById(webView, WebInputEvent::GestureTap, WebString::fromUTF8("target")));
     EXPECT_TRUE(client.getWasCalled());
 
     m_webViewHelper.reset(); // Remove dependency on locally scoped client.
 }
 
 } // namespace