Moves WebFrameWidgetImpl to core/frame

Bug: 712963
Change-Id: Ib2f117d83dcf34c505249335197f797ccd962554
Reviewed-on: https://chromium-review.googlesource.com/572477
Commit-Queue: Nicholas Verne <nverne@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487038}

third_party/WebKit/Source/core/animation/CompositorMutatorImpl.h

@@ -6,6 +6,7 @@
 #define CompositorMutatorImpl_h
 
 #include <memory>
+#include "core/animation/CompositorAnimator.h"
 #include "core/animation/CustomCompositorAnimationManager.h"
 #include "platform/graphics/CompositorMutator.h"
 #include "platform/heap/Handle.h"
@@ -14,7 +15,6 @@
 
 namespace blink {
 
-class CompositorAnimator;
 class CompositorMutatorClient;
 
 // Fans out requests from the compositor to all of the registered

third_party/WebKit/Source/core/frame/BUILD.gn

@@ -130,6 +130,8 @@ blink_core_sources("frame") {
     "WebFrameSerializerImpl.h",
     "WebFrameWidgetBase.cpp",
     "WebFrameWidgetBase.h",
+    "WebFrameWidgetImpl.cpp",
+    "WebFrameWidgetImpl.h",
     "WebLocalFrameBase.cpp",
     "WebLocalFrameBase.h",
     "WebRemoteFrameBase.cpp",

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp → third_party/WebKit/Source/core/frame/WebFrameWidgetImpl.cpp

@@ -28,7 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "web/WebFrameWidgetImpl.h"
+#include "core/frame/WebFrameWidgetImpl.h"
 
 #include <memory>
 
@@ -824,9 +824,10 @@ void WebFrameWidgetImpl::HandleMouseDown(LocalFrame& main_frame,
 
   PageWidgetEventHandler::HandleMouseDown(main_frame, event);
 
-  if (event.button == WebMouseEvent::Button::kLeft && mouse_capture_node_)
+  if (event.button == WebMouseEvent::Button::kLeft && mouse_capture_node_) {
     mouse_capture_gesture_token_ =
         main_frame.GetEventHandler().TakeLastMouseDownGestureToken();
+  }
 
   if (view_impl->GetPagePopup() && page_popup &&
       ToWebPagePopupImpl(view_impl->GetPagePopup())
@@ -1022,9 +1023,10 @@ WebInputEventResult WebFrameWidgetImpl::HandleCharEvent(
   suppress_next_keypress_event_ = false;
 
   LocalFrame* frame = ToLocalFrame(FocusedCoreFrame());
-  if (!frame)
+  if (!frame) {
     return suppress ? WebInputEventResult::kHandledSuppressed
                     : WebInputEventResult::kNotHandled;
+  }
 
   EventHandler& handler = frame->GetEventHandler();
 
@@ -1186,9 +1188,10 @@ HitTestResult WebFrameWidgetImpl::CoreHitTestResultAt(
 
 void WebFrameWidgetImpl::SetVisibilityState(
     WebPageVisibilityState visibility_state) {
-  if (layer_tree_view_)
+  if (layer_tree_view_) {
     layer_tree_view_->SetVisible(visibility_state ==
                                  kWebPageVisibilityStateVisible);
+  }
 }
 
 HitTestResult WebFrameWidgetImpl::HitTestResultForRootFramePos(

third_party/WebKit/Source/web/BUILD.gn

@@ -45,8 +45,6 @@ component("web") {
     "WebExport.h",
     "WebFactoryImpl.cpp",
     "WebFactoryImpl.h",
-    "WebFrameWidgetImpl.cpp",
-    "WebFrameWidgetImpl.h",
     "WebKit.cpp",
     "WebLocalFrameImpl.cpp",
     "WebLocalFrameImpl.h",

third_party/WebKit/Source/web/ChromeClientImpl.cpp

@@ -48,6 +48,7 @@
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/VisualViewport.h"
+#include "core/frame/WebFrameWidgetImpl.h"
 #include "core/fullscreen/Fullscreen.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/forms/ColorChooser.h"
@@ -109,7 +110,6 @@
 #include "public/web/WebUserGestureToken.h"
 #include "public/web/WebViewClient.h"
 #include "public/web/WebWindowFeatures.h"
-#include "web/WebFrameWidgetImpl.h"
 #include "web/WebLocalFrameImpl.h"
 
 namespace blink {

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

@@ -141,6 +141,7 @@
 #include "core/frame/SuspendableScriptExecutor.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/VisualViewport.h"
+#include "core/frame/WebFrameWidgetImpl.h"
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLCollection.h"
 #include "core/html/HTMLFormElement.h"
@@ -233,7 +234,6 @@
 #include "public/web/WebSerializedScriptValue.h"
 #include "public/web/WebTreeScopeType.h"
 #include "skia/ext/platform_canvas.h"
-#include "web/WebFrameWidgetImpl.h"
 
 namespace blink {