Move setWindowRect and windowRect calls from WebViewClient to WebWidgetClient.

third_party/WebKit/Source/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 167 matching lines @@
 void* ChromeClientImpl::webView() const
 {
     return static_cast<void*>(m_webView);
 }
 
 void ChromeClientImpl::chromeDestroyed()
 {
     // Our lifetime is bound to the WebViewImpl.
 }
 
-void ChromeClientImpl::setWindowRect(const IntRect& r)
+void ChromeClientImpl::setWindowRect(const IntRect& r, LocalFrame& frame)
 {
-    if (m_webView->client())
-        m_webView->client()->setWindowRect(r);
+    DCHECK_EQ(&frame, m_webView->mainFrameImpl()->frame());
+    WebWidgetClient* client = WebLocalFrameImpl::fromFrame(&frame)->frameWidget()->client();
+    client->setWindowRect(r);
 }
 
-IntRect ChromeClientImpl::windowRect()
+IntRect ChromeClientImpl::rootWindowRect()
 {
     WebRect rect;
     if (m_webView->client()) {
         rect = m_webView->client()->rootWindowRect();
     } else {
         // These numbers will be fairly wrong. The window's x/y coordinates will
         // be the top left corner of the screen and the size will be the content
         // size instead of the window size.
         rect.width = m_webView->size().width;
         rect.height = m_webView->size().height;
     }
     return IntRect(rect);
 }
 
 IntRect ChromeClientImpl::pageRect()
 {
     // We hide the details of the window's border thickness from the web page by
     // simple re-using the window position here.  So, from the point-of-view of
     // the web page, the window has no border.
-    return windowRect();
+    return rootWindowRect();
 }
 
 void ChromeClientImpl::focus()
 {
     if (m_webView->client())
         m_webView->client()->didFocus();
 }
 
 bool ChromeClientImpl::canTakeFocus(WebFocusType)
 {
@@ skipping 868 matching lines @@
 {
     return wrapUnique(m_webView->scheduler()->createFrameScheduler(blameContext).release());
 }
 
 double ChromeClientImpl::lastFrameTimeMonotonic() const
 {
     return m_webView->lastFrameTimeMonotonic();
 }
 
 } // namespace blink