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

third_party/WebKit/Source/web/RemoteFrameClientImpl.cpp

 // Copyright 2014 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.
 
 #include "config.h"
 #include "web/RemoteFrameClientImpl.h"
 
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/WheelEvent.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/frame/RemoteFrameView.h"
 #include "core/layout/LayoutPart.h"
 #include "platform/exported/WrappedResourceRequest.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/web/WebRemoteFrameClient.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 
 namespace blink {
 
+namespace {
+
+Frame* toCoreFrame(WebFrame* frame)
+{
+    return frame ? frame->toImplBase()->frame() : nullptr;
+}
+
+} // namespace
+
 RemoteFrameClientImpl::RemoteFrameClientImpl(WebRemoteFrameImpl* webFrame)
     : m_webFrame(webFrame)
 {
 }
 
 PassOwnPtrWillBeRawPtr<RemoteFrameClientImpl> RemoteFrameClientImpl::create(WebRemoteFrameImpl* webFrame)
 {
     return adoptPtrWillBeNoop(new RemoteFrameClientImpl(webFrame));
 }
 
@@ skipping 106 matching lines @@
     // It is possible for a platform event to cause the remote iframe element
     // to be hidden, which destroys the layout object (for instance, a mouse
     // event that moves between elements will trigger a mouseout on the old
     // element, which might hide the new element). In that case we do not
     // forward. This is divergent behavior from local frames, where the
     // content of the frame can receive events even after the frame is hidden.
     // We might need to revisit this after browser hit testing is fully
     // 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())

[dcheng, 2015/11/23 09:00:17]

Note that these changed, since this should never be null.

         return;
 
     // This is only called when we have out-of-process iframes, which
     // need to forward input events across processes.
     // FIXME: Add a check for out-of-process iframes enabled.
     OwnPtr<WebInputEvent> webEvent;
     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)
         return;
 
     m_webFrame->client()->forwardInputEvent(webEvent.get());
 }
 
 void RemoteFrameClientImpl::frameRectsChanged(const IntRect& frameRect)
 {
     m_webFrame->client()->frameRectsChanged(frameRect);
 }
 
 } // namespace blink