Switch the inheritance of WebView from WebWidget to protected.

third_party/WebKit/Source/web/WebLocalFrameImpl.h

 /*
  * Copyright (C) 2009 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebLocalFrameImpl_h
 #define WebLocalFrameImpl_h
 
 #include "core/editing/VisiblePosition.h"
 #include "core/frame/LocalFrame.h"
 #include "platform/geometry/FloatRect.h"
 #include "public/platform/WebFileSystemType.h"
+#include "public/web/WebFrameWidget.h"
 #include "public/web/WebLocalFrame.h"
 #include "web/FrameLoaderClientImpl.h"
 #include "web/UserMediaClientImpl.h"
 #include "web/WebExport.h"
 #include "web/WebFrameImplBase.h"
 #include "wtf/Compiler.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class ChromePrintContext;
 class GeolocationClientProxy;
 class IntSize;
 class KURL;
 class Range;
 class SharedWorkerRepositoryClientImpl;
 class TextFinder;
 class WebAutofillClient;
 class WebDataSourceImpl;
 class WebDevToolsAgentImpl;
 class WebDevToolsFrontendImpl;
 class WebFrameClient;
-class WebFrameWidget;
 class WebNode;
 class WebPerformance;
 class WebPlugin;
 class WebPluginContainerImpl;
 class WebScriptExecutionCallback;
 class WebSuspendableTask;
 class WebView;
 class WebViewImpl;
 enum class WebFrameLoadType;
 struct FrameLoadRequest;
@@ skipping 163 matching lines @@
         int identifier, const WebString& searchText, const WebFindOptions&,
         bool reset) override;
     void cancelPendingScopingEffort() override;
     void increaseMatchCount(int count, int identifier) override;
     void resetMatchCount() override;
     int findMatchMarkersVersion() const override;
     WebFloatRect activeFindMatchRect() override;
     void findMatchRects(WebVector<WebFloatRect>&) override;
     int selectNearestFindMatch(const WebFloatPoint&, WebRect* selectionRect) override;
     void setTickmarks(const WebVector<WebRect>&) override;
+    WebFrameWidget* frameWidget() const override;

[dcheng, 2016/05/04 04:55:30]

Nit: let's call this widget (frame should be implied from the context).

[lfg, 2016/05/04 19:37:33]

I'll do this in a separate patch, since there are >20 calls that already exist
and uses frameWidget.

 
     // WebFrameImplBase methods:
     void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name, const AtomicString& uniqueName) override;
     LocalFrame* frame() const override { return m_frame.get(); }
 
     void willBeDetached();
     void willDetachParent();
 
     static WebLocalFrameImpl* create(WebTreeScopeType, WebFrameClient*, WebFrame* opener);
     static WebLocalFrameImpl* createProvisional(WebFrameClient*, WebRemoteFrame*, WebSandboxFlags, const WebFrameOwnerProperties&);
@@ skipping 57 matching lines @@
 
     TextFinder* textFinder() const;
     // Returns the text finder object if it already exists.
     // Otherwise creates it and then returns.
     TextFinder& ensureTextFinder();
 
     // Returns a hit-tested VisiblePosition for the given point
     VisiblePosition visiblePositionForViewportPoint(const WebPoint&);
 
     void setFrameWidget(WebFrameWidget*);
-    WebFrameWidget* frameWidget() const;
 
     // DevTools front-end bindings.
     void setDevToolsFrontend(WebDevToolsFrontendImpl* frontend) { m_webDevToolsFrontend = frontend; }
     WebDevToolsFrontendImpl* devToolsFrontend() { return m_webDevToolsFrontend; }
 
     WebNode contextMenuNode() const { return m_contextMenuNode.get(); }
     void setContextMenuNode(Node* node) { m_contextMenuNode = node; }
     void clearContextMenuNode() { m_contextMenuNode.clear(); }
 
     DECLARE_TRACE();
@@ skipping 59 matching lines @@
     // Accomplish that by keeping a self-referential Persistent<>. It is
     // cleared upon close().
     SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive;
 };
 
 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame());
 
 } // namespace blink
 
 #endif