Move EditorClientImpl.cpp out of web/ to core/page/EditorClient.cpp

third_party/WebKit/Source/core/page/EditorClient.cpp

 /*
  * Copyright (C) 2006, 2007 Apple, Inc.  All rights reserved.
  * Copyright (C) 2012 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "web/EditorClientImpl.h"
+#include "core/page/EditorClient.h"
 
 #include "core/editing/SelectionType.h"
 #include "core/exported/WebViewBase.h"
 #include "core/frame/ContentSettingsClient.h"
+#include "core/frame/WebLocalFrameBase.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebViewClient.h"
-#include "web/WebLocalFrameImpl.h"
 
 namespace blink {
 
-EditorClientImpl::EditorClientImpl(WebViewBase* webview) : web_view_(webview) {}
+EditorClient::EditorClient(WebViewBase* webview) : web_view_(webview) {}
 
-EditorClientImpl::~EditorClientImpl() {}
+EditorClient::~EditorClient() {}
 
-void EditorClientImpl::RespondToChangedSelection(LocalFrame* frame,
-                                                 SelectionType selection_type) {
-  WebLocalFrameImpl* web_frame = WebLocalFrameImpl::FromFrame(frame);
+void EditorClient::RespondToChangedSelection(LocalFrame* frame,
+                                             SelectionType selection_type) {
+  WebLocalFrameBase* web_frame = WebLocalFrameBase::FromFrame(frame);
   if (web_frame->Client())
     web_frame->Client()->DidChangeSelection(selection_type != kRangeSelection);
 }
 
-void EditorClientImpl::RespondToChangedContents() {
+void EditorClient::RespondToChangedContents() {
   if (web_view_->Client())
     web_view_->Client()->DidChangeContents();

[haraken, 2017/05/08 23:51:38]

Not directly related to this CL, it might be nicer to pass in LocalFrame* to
this method and get the WebViewBase by WebViewBase::FromPage(frame->GetPage()).
Then you don't need to store web_view_ on EditorClient.

If you need to store WebViewBase* in many places, you can consider that.

[slangley, 2017/05/09 00:23:17]

Got it - I'll submit as is but keep this in mind. We can hopefully clean up many
places when we look at removing ChromeClient etc.

 }
 
-bool EditorClientImpl::CanCopyCut(LocalFrame* frame, bool default_value) const {
+bool EditorClient::CanCopyCut(LocalFrame* frame, bool default_value) const {
   if (!frame->GetContentSettingsClient())
     return default_value;
   return frame->GetContentSettingsClient()->AllowWriteToClipboard(
       default_value);
 }
 
-bool EditorClientImpl::CanPaste(LocalFrame* frame, bool default_value) const {
+bool EditorClient::CanPaste(LocalFrame* frame, bool default_value) const {
   if (!frame->GetContentSettingsClient())
     return default_value;
   return frame->GetContentSettingsClient()->AllowReadFromClipboard(
       default_value);
 }
 
-bool EditorClientImpl::HandleKeyboardEvent(LocalFrame* frame) {
-  WebLocalFrameImpl* web_frame = WebLocalFrameImpl::FromFrame(frame);
+bool EditorClient::HandleKeyboardEvent(LocalFrame* frame) {
+  WebLocalFrameBase* web_frame = WebLocalFrameBase::FromFrame(frame);
   return web_frame->Client()->HandleCurrentKeyboardEvent();
 }
 
 }  // namespace blink