Switch the inheritance of WebViewClient from WebWidgetClient to protected.

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 547 matching lines @@
     }
 }
 
 IntRect ChromeClientImpl::viewportToScreen(const IntRect& rectInViewport, const Widget* widget) const
 {
     WebRect screenRect(rectInViewport);
 
     DCHECK(widget->isFrameView());
     const FrameView* view = toFrameView(widget);
     LocalFrame* frame = view->frame().localFrameRoot();
-    WebWidgetClient* client = nullptr;
 
     // TODO(kenrb): Consolidate this to a single case when WebViewFrameWidget refactor is complete.
-    if (WebLocalFrameImpl::fromFrame(frame) && WebLocalFrameImpl::fromFrame(frame)->frameWidget() && WebLocalFrameImpl::fromFrame(frame)->frameWidget()->forSubframe())
-        client = toWebFrameWidgetImpl(WebLocalFrameImpl::fromFrame(frame)->frameWidget())->client();
-    else
-        client = m_webView->client();
+    if (WebLocalFrameImpl::fromFrame(frame) && WebLocalFrameImpl::fromFrame(frame)->frameWidget() && WebLocalFrameImpl::fromFrame(frame)->frameWidget()->forSubframe()) {

[dcheng, 2016/04/27 23:55:04]

I previously tried to remove this and failed, because we didn't have a test web
widget client.

Maybe we can just remove this branching completely now?

[lfg, 2016/04/28 17:04:33]

I removed the branch but had to add a virtual to WebFrameWidget to get the
client. I think this should be acceptable until we can remove the
WebViewFrameWidget.

+        WebWidgetClient* client = toWebFrameWidgetImpl(WebLocalFrameImpl::fromFrame(frame)->frameWidget())->client();
 
-    if (client) {
-        client->convertViewportToWindow(&screenRect);
-        WebRect windowRect = client->windowRect();
-        screenRect.x += windowRect.x;
-        screenRect.y += windowRect.y;
+        if (client) {
+            client->convertViewportToWindow(&screenRect);
+            WebRect windowRect = client->windowRect();
+            screenRect.x += windowRect.x;
+            screenRect.y += windowRect.y;
+        }
+    } else {
+        WebViewClient* client = m_webView->client();
+
+        if (client) {
+            client->convertViewportToWindow(&screenRect);
+            WebRect windowRect = client->windowRect();
+            screenRect.x += windowRect.x;
+            screenRect.y += windowRect.y;
+        }
     }
+
     return screenRect;
 }
 
 float ChromeClientImpl::windowToViewportScalar(const float scalarValue) const
 {
     if (!m_webView->client())
         return scalarValue;
     WebFloatRect viewportRect(0, 0, scalarValue, 0);
     m_webView->client()->convertWindowToViewport(&viewportRect);
     return viewportRect.width;
@@ skipping 518 matching lines @@
 {
     return adoptPtr(m_webView->scheduler()->createFrameScheduler(blameContext).release());
 }
 
 double ChromeClientImpl::lastFrameTimeMonotonic() const
 {
     return m_webView->lastFrameTimeMonotonic();
 }
 
 } // namespace blink