Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/web/InspectorOverlay.cpp

 /*
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 464 matching lines @@
 }
 
 void InspectorOverlay::drawViewSize()
 {
     if (m_resizeTimerActive && m_drawViewSize)
         evaluateInOverlay("drawViewSize", "");
 }
 
 float InspectorOverlay::windowToViewportScale() const
 {
-    return m_webViewImpl->chromeClient().windowToViewportScalar(1.0f);
+    return m_webViewImpl->chromeClient().windowToViewportScalar(1.0f, m_webViewImpl->mainFrameImpl()->frameView());
 }
 
 Page* InspectorOverlay::overlayPage()
 {
     if (m_overlayPage)
         return m_overlayPage.get();
 
     ScriptForbiddenScope::AllowUserAgentScript allowScript;
 
     DEFINE_STATIC_LOCAL(FrameLoaderClient, dummyFrameLoaderClient, (EmptyFrameLoaderClient::create()));
@@ skipping 317 matching lines @@
 
 void InspectorOverlay::initializeLayoutEditorIfNeeded(Node* node)
 {
     if (m_inspectMode != InspectorDOMAgent::ShowLayoutEditor || !node || !node->isElementNode() || !node->ownerDocument()->isActive() || !m_cssAgent || !m_domAgent)
         return;
     m_layoutEditor = LayoutEditor::create(toElement(node), m_cssAgent, m_domAgent, &overlayMainFrame()->script());
     toChromeClientImpl(m_webViewImpl->page()->chromeClient()).setCursorOverridden(true);
 }
 
 } // namespace blink