Move allowsBrokenNullLayerTreeView calls from WebViewClient to WebWidgetClient.

content/renderer/render_view_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 275 matching lines @@
   // Most methods are handled by RenderWidget.
   void didFocus() override;
   void show(blink::WebNavigationPolicy policy) override;
   void didHandleGestureEvent(const blink::WebGestureEvent& event,
                              bool event_cancelled) override;
   void onMouseDown(const blink::WebNode& mouse_down_node) override;
   void initializeLayerTreeView() override;
 
   // TODO(lfg): Remove once WebViewClient no longer inherits from
   // WebWidgetClient.
-  bool allowsBrokenNullLayerTreeView() const override;
   void closeWidgetSoon() override;
   void convertViewportToWindow(blink::WebRect* rect) override;
   void convertWindowToViewport(blink::WebFloatRect* rect) override;
   void didAutoResize(const blink::WebSize& newSize) override;
   void didChangeCursor(const blink::WebCursorInfo& info) override;
   void didInvalidateRect(const blink::WebRect& rect) override;
   void didMeaningfulLayout(blink::WebMeaningfulLayout layout_type) override;
   void didOverscroll(const blink::WebFloatSize& overscrollDelta,
                      const blink::WebFloatSize& accumulatedOverscroll,
                      const blink::WebFloatPoint& positionInViewport,
                      const blink::WebFloatSize& velocityInViewport) override;
   void didUpdateTextOfFocusedElementByNonUserInput() override;
   void hasTouchEventHandlers(bool has_handlers) override;
   blink::WebLayerTreeView* layerTreeView() override;
   void resetInputMethod() override;
   blink::WebRect rootWindowRect() override;
   void scheduleAnimation() override;
   blink::WebScreenInfo screenInfo() override;
   void setToolTipText(const blink::WebString&,
                       blink::WebTextDirection hint) override;
   void setTouchAction(blink::WebTouchAction touchAction) override;
   void setWindowRect(const blink::WebRect& rect) override;
   void showImeIfNeeded() override;
   void showUnhandledTapUIIfNeeded(const blink::WebPoint& tappedPosition,
                                   const blink::WebNode& tappedNode,
                                   bool pageChanged) override;
   blink::WebRect windowRect() override;
   blink::WebRect windowResizerRect() override;
+  blink::WebWidgetClient* widgetClient() override;

[kenrb, 2016/07/07 14:57:38]

Is this override necessary because of the diamond-shaped inheritance pattern?

[lfg, 2016/07/07 15:16:43]

Yes, you are right. Once all these methods are split, we should be able to get
rid of this (and get rid of the diamond inheritance), even before splitting
RenderView/RenderWidget.

 
   // blink::WebViewClient implementation --------------------------------------
 
   blink::WebView* createView(blink::WebLocalFrame* creator,
                              const blink::WebURLRequest& request,
                              const blink::WebWindowFeatures& features,
                              const blink::WebString& frame_name,
                              blink::WebNavigationPolicy policy,
                              bool suppress_opener) override;
   blink::WebWidget* createPopupMenu(blink::WebPopupType popup_type) override;
@@ skipping 606 matching lines @@
   // use the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_