Move setWindowRect and windowRect calls from WebViewClient to WebWidgetClient.

third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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 864 matching lines @@
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     ChromeClient& chromeClient = host->chromeClient();
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(chromeClient.windowRect().height() * chromeClient.screenInfo().deviceScaleFactor);
-    return chromeClient.windowRect().height();
+        return lroundf(chromeClient.rootWindowRect().height() * chromeClient.screenInfo().deviceScaleFactor);
+    return chromeClient.rootWindowRect().height();
 }
 
 int LocalDOMWindow::outerWidth() const
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     ChromeClient& chromeClient = host->chromeClient();
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(chromeClient.windowRect().width() * chromeClient.screenInfo().deviceScaleFactor);
+        return lroundf(chromeClient.rootWindowRect().width() * chromeClient.screenInfo().deviceScaleFactor);
 
-    return chromeClient.windowRect().width();
+    return chromeClient.rootWindowRect().width();
 }
 
 FloatSize LocalDOMWindow::getViewportSize(IncludeScrollbarsInRect scrollbarInclusion) const
 {
     if (!frame())
         return FloatSize();
 
     FrameView* view = frame()->view();
     if (!view)
         return FloatSize();
@@ skipping 42 matching lines @@
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     ChromeClient& chromeClient = host->chromeClient();
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(chromeClient.windowRect().x() * chromeClient.screenInfo().deviceScaleFactor);
-    return chromeClient.windowRect().x();
+        return lroundf(chromeClient.rootWindowRect().x() * chromeClient.screenInfo().deviceScaleFactor);
+    return chromeClient.rootWindowRect().x();
 }
 
 int LocalDOMWindow::screenY() const
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     ChromeClient& chromeClient = host->chromeClient();
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(chromeClient.windowRect().y() * chromeClient.screenInfo().deviceScaleFactor);
-    return chromeClient.windowRect().y();
+        return lroundf(chromeClient.rootWindowRect().y() * chromeClient.screenInfo().deviceScaleFactor);
+    return chromeClient.rootWindowRect().y();
 }
 
 double LocalDOMWindow::scrollX() const
 {
     if (!frame() || !frame()->host())
         return 0;
 
     if (!frame()->host()->settings().inertVisualViewport())
         return m_visualViewport->pageX();
 
@@ skipping 239 matching lines @@
 
 void LocalDOMWindow::moveBy(int x, int y) const
 {
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
-    IntRect windowRect = host->chromeClient().windowRect();
+    IntRect windowRect = host->chromeClient().rootWindowRect();
     windowRect.move(x, y);
     // Security check (the spec talks about UniversalBrowserWrite to disable this check...)
-    host->chromeClient().setWindowRectWithAdjustment(windowRect);
+    host->chromeClient().setWindowRectWithAdjustment(windowRect, frame());
 }
 
 void LocalDOMWindow::moveTo(int x, int y) const
 {
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
-    IntRect windowRect = host->chromeClient().windowRect();
+    IntRect windowRect = host->chromeClient().rootWindowRect();
     windowRect.setLocation(IntPoint(x, y));
     // Security check (the spec talks about UniversalBrowserWrite to disable this check...)
-    host->chromeClient().setWindowRectWithAdjustment(windowRect);
+    host->chromeClient().setWindowRectWithAdjustment(windowRect, frame());
 }
 
 void LocalDOMWindow::resizeBy(int x, int y) const
 {
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
-    IntRect fr = host->chromeClient().windowRect();
+    IntRect fr = host->chromeClient().rootWindowRect();
     IntSize dest = fr.size() + IntSize(x, y);
     IntRect update(fr.location(), dest);
-    host->chromeClient().setWindowRectWithAdjustment(update);
+    host->chromeClient().setWindowRectWithAdjustment(update, frame());
 }
 
 void LocalDOMWindow::resizeTo(int width, int height) const
 {
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
-    IntRect fr = host->chromeClient().windowRect();
+    IntRect fr = host->chromeClient().rootWindowRect();
     IntSize dest = IntSize(width, height);
     IntRect update(fr.location(), dest);
-    host->chromeClient().setWindowRectWithAdjustment(update);
+    host->chromeClient().setWindowRectWithAdjustment(update, frame());
 }
 
 int LocalDOMWindow::requestAnimationFrame(FrameRequestCallback* callback)
 {
     callback->m_useLegacyTimeBase = false;
     if (Document* doc = document())
         return doc->requestAnimationFrame(callback);
     return 0;
 }
 
@@ skipping 243 matching lines @@
 {
     // If the LocalDOMWindow still has a frame reference, that frame must point
     // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
     // where script execution leaks between different LocalDOMWindows.
     if (m_frameObserver->frame())
         ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() == this);
     return m_frameObserver->frame();
 }
 
 } // namespace blink