Create base class for common functionality of Web{Local,Remote}Frame

third_party/WebKit/Source/web/RemoteFrameClientImpl.cpp

Index: third_party/WebKit/Source/web/RemoteFrameClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/RemoteFrameClientImpl.cpp b/third_party/WebKit/Source/web/RemoteFrameClientImpl.cpp
index e67b4f4aa35ae9c0fa31cca6defc7b385a87523b..276d3be78fd451febdb05e29dd3e8418ffb4385a 100644
--- a/third_party/WebKit/Source/web/RemoteFrameClientImpl.cpp
+++ b/third_party/WebKit/Source/web/RemoteFrameClientImpl.cpp
@@ -21,6 +21,15 @@
 
 namespace blink {
 
+namespace {
+
+Frame* toCoreFrame(WebFrame* frame)

[haraken, 2015/11/24 02:30:53]

toCoreFrameOrNull ?

[dcheng, 2015/11/24 06:55:06]

My concern about that name is it sounds like it might not convert to core frame
for another reason (aka toLocalFrameIfNotNull), rather than the input might be
null. Would you be OK with a comment that explains why this is necessary?
Something like:

Convenience function to convert a WebFrame to Frame. This avoids a lot of
boilerplate for FrameClient members that traverse the frame tree, since things
like WebFrame::parent() may be null if a frame has no parent.

[haraken, 2015/11/24 07:00:33]

Yes, let's add the comment.

[dcheng, 2015/11/24 07:50:24]

Done (I also added a comment to try to dedupe the code at some point: onion soup
will probably help as well)

+{
+    return frame ? frame->toImplBase()->frame() : nullptr;
+}
+
+} // namespace
+
 RemoteFrameClientImpl::RemoteFrameClientImpl(WebRemoteFrameImpl* webFrame)
     : m_webFrame(webFrame)
 {
@@ -147,7 +156,7 @@ void RemoteFrameClientImpl::forwardInputEvent(Event* event)
     // implemented, since this code path will need to be removed or refactored
     // anyway.
     // See https://crbug.com/520705.
-    if (!toCoreFrame(m_webFrame)->ownerLayoutObject())
+    if (!m_webFrame->toImplBase()->frame()->ownerLayoutObject())
         return;
 
     // This is only called when we have out-of-process iframes, which
@@ -157,9 +166,9 @@ void RemoteFrameClientImpl::forwardInputEvent(Event* event)
     if (event->isKeyboardEvent())
         webEvent = adoptPtr(new WebKeyboardEventBuilder(*static_cast<KeyboardEvent*>(event)));
     else if (event->isMouseEvent())
-        webEvent = adoptPtr(new WebMouseEventBuilder(m_webFrame->frame()->view(), toCoreFrame(m_webFrame)->ownerLayoutObject(), *static_cast<MouseEvent*>(event)));
+        webEvent = adoptPtr(new WebMouseEventBuilder(m_webFrame->frame()->view(), m_webFrame->toImplBase()->frame()->ownerLayoutObject(), *static_cast<MouseEvent*>(event)));
     else if (event->isWheelEvent())
-        webEvent = adoptPtr(new WebMouseWheelEventBuilder(m_webFrame->frame()->view(), toCoreFrame(m_webFrame)->ownerLayoutObject(), *static_cast<WheelEvent*>(event)));
+        webEvent = adoptPtr(new WebMouseWheelEventBuilder(m_webFrame->frame()->view(), m_webFrame->toImplBase()->frame()->ownerLayoutObject(), *static_cast<WheelEvent*>(event)));
 
     // Other or internal Blink events should not be forwarded.
     if (!webEvent || webEvent->type == WebInputEvent::Undefined)