Nuked WebFrameImplBase.

third_party/WebKit/public/web/WebFrame.h

Index: third_party/WebKit/public/web/WebFrame.h
diff --git a/third_party/WebKit/public/web/WebFrame.h b/third_party/WebKit/public/web/WebFrame.h
index 9dfb4fb51943f0750822efedb65ecf46311b0163..dc1ac931a34b87cde7246fdeddb542261f56fc01 100644
--- a/third_party/WebKit/public/web/WebFrame.h
+++ b/third_party/WebKit/public/web/WebFrame.h
@@ -52,6 +52,7 @@ namespace blink {
 
 class Frame;
 class OpenedFrameTracker;
+class Page;
 class Visitor;
 class WebAssociatedURLLoader;
 struct WebAssociatedURLLoaderOptions;
@@ -60,7 +61,6 @@ class WebData;
 class WebDataSource;
 class WebDocument;
 class WebElement;
-class WebFrameImplBase;
 class WebLocalFrame;
 class WebPerformance;
 class WebRemoteFrame;
@@ -417,12 +417,6 @@ class WebFrame {
   // text form. This is used only by layout tests.
   virtual WebString LayerTreeAsText(bool show_debug_info = false) const = 0;
 
-  virtual WebFrameImplBase* ToImplBase() = 0;
-  // TODO(dcheng): Fix const-correctness issues and remove this overload.
-  virtual const WebFrameImplBase* ToImplBase() const {
-    return const_cast<WebFrame*>(this)->ToImplBase();
-  }
-
   // Returns the frame inside a given frame or iframe element. Returns 0 if
   // the given element is not a frame, iframe or if the frame is empty.
   BLINK_EXPORT static WebFrame* FromFrameOwnerElement(const WebElement&);
@@ -430,6 +424,9 @@ class WebFrame {
 #if BLINK_IMPLEMENTATION
   static WebFrame* FromFrame(Frame*);
 
+  static void InitializeCoreFrame(WebFrame*, Page&);

[dcheng, 2017/04/26 11:45:36]

Nit: WebFrame&, as the frame parameter should never be omitted.

Nit 2: group with TraceFrames() below, as it's conceptually somewhat similar.

[mustaq, 2017/04/26 18:12:48]

Done #2.

#1: Ref params must be const ref according to the style guide, but a const is
not allowed here because it calls Web*FrameImpl::InitializeCoreFrame() which is
not a const function.

[dcheng, 2017/04/27 02:22:36]

Mutable references are fine in Blink though: this is one of the style exceptions
that we carved out in Blink (hence Page& instead of Page*)

(And I think we should make ToCoreFrame take a ref as well, since all the
original callers must have passed a non-null WebFrame)

[mustaq, 2017/04/27 14:21:21]

Done.

+  static Frame* CoreFrame(const WebFrame*);

[dcheng, 2017/04/26 11:45:37]

Nit: ToCoreFrame

[mustaq, 2017/04/26 18:12:48]

Done.

But it seems |FromFrame| should now be called |FromCoreFrame| :(
Wdyt?

[dcheng, 2017/04/27 02:22:36]

Sure, we can do that in a separate change though.

[mustaq, 2017/04/27 14:21:21]

Added a TODO.

+
   bool InShadowTree() const { return scope_ == WebTreeScopeType::kShadow; }
 
   static void TraceFrames(Visitor*, WebFrame*);