Delete glue/webview{_delegate}.h

webkit/glue/webview_impl.cc

 // Copyright (c) 2007-2009 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 "build/build_config.h"
 
 #include "base/compiler_specific.h"
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "AXObjectCache.h"
@@ skipping 52 matching lines @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "webkit/api/public/WebAccessibilityObject.h"
 #include "webkit/api/public/WebDragData.h"
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/api/public/WebMediaPlayerAction.h"
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebVector.h"
+#include "webkit/api/public/WebViewClient.h"
 #include "webkit/api/src/WebInputEventConversion.h"
 #include "webkit/api/src/WebSettingsImpl.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/image_resource_fetcher.h"
 #include "webkit/glue/searchable_form_data.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpopupmenu_impl.h"
 #include "webkit/glue/webdevtoolsclient.h"
-#include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webview_impl.h"
 
 // Get rid of WTF's pow define so we can use std::pow.
 #undef pow
 #include <cmath> // for std::pow
 
 using namespace WebCore;
 
 using WebKit::PlatformKeyboardEventBuilder;
 using WebKit::PlatformMouseEventBuilder;
@@ skipping 24 matching lines @@
 using WebKit::WebSettings;
 using WebKit::WebSettingsImpl;
 using WebKit::WebSize;
 using WebKit::WebString;
 using WebKit::WebTextDirection;
 using WebKit::WebTextDirectionDefault;
 using WebKit::WebTextDirectionLeftToRight;
 using WebKit::WebTextDirectionRightToLeft;
 using WebKit::WebURL;
 using WebKit::WebVector;
+using WebKit::WebViewClient;
 
 using webkit_glue::AccessibilityObjectToWebAccessibilityObject;
 
 // Change the text zoom level by kTextSizeMultiplierRatio each time the user
 // zooms text in or out (ie., change by 20%).  The min and max values limit
 // text zoom to half and 3x the original text size.  These three values match
 // those in Apple's port in WebKit/WebKit/WebView/WebView.mm
 static const double kTextSizeMultiplierRatio = 1.2;
 static const double kMinTextSizeMultiplier = 0.5;
 static const double kMaxTextSizeMultiplier = 3.0;
@@ skipping 195 matching lines @@
   true,   // loopSelectionNavigation
   true,   // restrictWidthOfListBox. Same as other browser (Fx, IE, and safari)
   // For autocomplete, we use the direction of the input field as the direction
   // of the popup items. The main reason is to keep the display of items in
   // drop-down the same as the items in the input field.
   WebCore::PopupContainerSettings::DOMElementDirection,
 };
 
 // WebView ----------------------------------------------------------------
 
-/*static*/
-WebView* WebView::Create(WebViewDelegate* delegate) {
-  WebViewImpl* instance = new WebViewImpl(delegate);
+namespace WebKit {
+
+// static
+WebView* WebView::create(WebViewClient* client) {
+  WebViewImpl* instance = new WebViewImpl(client);
   instance->AddRef();
   return instance;
 }
 
+// static
+void WebView::updateVisitedLinkState(unsigned long long link_hash) {
+  WebCore::Page::visitedStateChanged(
+      WebCore::PageGroup::pageGroup(pageGroupName), link_hash);
+}
+
+// static
+void WebView::resetVisitedLinkState() {
+  WebCore::Page::allVisitedStateChanged(
+      WebCore::PageGroup::pageGroup(pageGroupName));
+}
+
+}  // namespace WebKit
+
 void WebViewImpl::initializeMainFrame(WebFrameClient* frame_client) {
   // NOTE: The WebFrameImpl takes a reference to itself within InitMainFrame
   // and releases that reference once the corresponding Frame is destroyed.
   RefPtr<WebFrameImpl> main_frame = WebFrameImpl::create(frame_client);
 
   main_frame->InitMainFrame(this);
 
-  if (client()) {
-    WebDevToolsAgentClient* tools_client = client()->devToolsAgentClient();
+  if (client_) {
+    WebDevToolsAgentClient* tools_client = client_->devToolsAgentClient();
     if (tools_client)
       devtools_agent_.reset(new WebDevToolsAgentImpl(this, tools_client));
   }
 
   // Restrict the access to the local file system
   // (see WebView.mm WebView::_commonInitializationWithFrameName).
   SecurityOrigin::setLocalLoadPolicy(
       SecurityOrigin::AllowLocalLoadsForLocalOnly);
 }
 
-// static
-void WebView::UpdateVisitedLinkState(uint64 link_hash) {
-  WebCore::Page::visitedStateChanged(
-      WebCore::PageGroup::pageGroup(pageGroupName), link_hash);
-}
-
-// static
-void WebView::ResetVisitedLinkState() {
-  WebCore::Page::allVisitedStateChanged(
-      WebCore::PageGroup::pageGroup(pageGroupName));
-}
-
-WebViewImpl::WebViewImpl(WebViewDelegate* delegate)
-    : delegate_(delegate),
+WebViewImpl::WebViewImpl(WebViewClient* client)
+    : client_(client),
       ALLOW_THIS_IN_INITIALIZER_LIST(back_forward_list_client_impl_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(chrome_client_impl_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(context_menu_client_impl_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(drag_client_impl_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(editor_client_impl_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(inspector_client_impl_(this)),
       observed_new_navigation_(false),
 #ifndef NDEBUG
       new_navigation_loader_(NULL),
 #endif
@@ skipping 63 matching lines @@
   main_frame()->frame()->eventHandler()->mouseMoved(
       PlatformMouseEventBuilder(main_frame()->frameview(), event));
 }
 
 void WebViewImpl::MouseLeave(const WebMouseEvent& event) {
   // This event gets sent as the main frame is closing.  In that case, just
   // ignore it.
   if (!main_frame() || !main_frame()->frameview())
     return;
 
-  client()->setMouseOverURL(WebURL());
+  client_->setMouseOverURL(WebURL());
 
   main_frame()->frame()->eventHandler()->handleMouseMoveEvent(
       PlatformMouseEventBuilder(main_frame()->frameview(), event));
 }
 
 void WebViewImpl::MouseDown(const WebMouseEvent& event) {
   if (!main_frame() || !main_frame()->frameview())
     return;
 
   last_mouse_down_point_ = gfx::Point(event.x, event.y);
@@ skipping 199 matching lines @@
       return false;
     }
 
     int selected_index = autocomplete_popup_->selectedIndex();
     WebCore::HTMLInputElement* input_element =
         static_cast<WebCore::HTMLInputElement*>(element);
     const WebString& name = webkit_glue::StringToWebString(
         input_element->name());
     const WebString& value = webkit_glue::StringToWebString(
         autocomplete_popup_client_->itemText(selected_index));
-    client()->removeAutofillSuggestions(name, value);
+    client_->removeAutofillSuggestions(name, value);
     // Update the entries in the currently showing popup to reflect the
     // deletion.
     autocomplete_popup_client_->RemoveItemAtIndex(selected_index);
     RefreshAutofillPopup();
     return false;
   }
 
   if (!autocomplete_popup_->isInterestedInEventForKey(event.windowsKeyCode))
     return false;
 
@@ skipping 269 matching lines @@
   if (devtools_agent_.get())
     devtools_agent_.reset(NULL);
 
   // We drop the client after the page has been destroyed to support the
   // WebFrameClient::didDestroyScriptContext method.
   if (main_frame)
     main_frame->drop_client();
 
   // Reset the delegate to prevent notifications being sent as we're being
   // deleted.
-  delegate_ = NULL;
+  client_ = NULL;
 
-  Release();  // Balances AddRef from WebView::Create
+  Release();  // Balances AddRef from WebView::create
 }
 
 void WebViewImpl::resize(const WebSize& new_size) {
   if (size_ == new_size)
     return;
   size_ = new_size;
 
   if (main_frame()->frameview()) {
     main_frame()->frameview()->resize(size_.width, size_.height);
     main_frame()->frame()->eventHandler()->sendResizeEvent();
   }
 
-  if (delegate_) {
+  if (client_) {
     WebRect damaged_rect(0, 0, size_.width, size_.height);
-    delegate_->didInvalidateRect(damaged_rect);
+    client_->didInvalidateRect(damaged_rect);
   }
 }
 
 void WebViewImpl::layout() {
   WebFrameImpl* webframe = main_frame();
   if (webframe) {
     // In order for our child HWNDs (NativeWindowWidgets) to update properly,
     // they need to be told that we are updating the screen.  The problem is
     // that the native widgets need to recalculate their clip region and not
     // overlap any of our non-native widgets.  To force the resizing, call
@@ skipping 819 matching lines @@
     } else {
       *policy = WebKit::WebNavigationPolicyDownload;
     }
   }
   return true;
 }
 
 void WebViewImpl::StartDragging(const WebPoint& event_pos,
                                 const WebDragData& drag_data,
                                 WebDragOperationsMask mask) {
-  if (!client())
+  if (!client_)
     return;
   DCHECK(!doing_drag_and_drop_);
   doing_drag_and_drop_ = true;
-  client()->startDragging(event_pos, drag_data, mask);
+  client_->startDragging(event_pos, drag_data, mask);
 }
 
 void WebViewImpl::SetCurrentHistoryItem(WebCore::HistoryItem* item) {
   back_forward_list_client_impl_.SetCurrentHistoryItem(item);
 }
 
 WebCore::HistoryItem* WebViewImpl::GetPreviousHistoryItem() {
   return back_forward_list_client_impl_.GetPreviousHistoryItem();
 }
 
@@ skipping 15 matching lines @@
   autocomplete_popup_showing_ = false;
 }
 
 void WebViewImpl::SetIgnoreInputEvents(bool new_value) {
   DCHECK(ignore_input_events_ != new_value);
   ignore_input_events_ = new_value;
 }
 
 #if ENABLE(NOTIFICATIONS)
 WebKit::NotificationPresenterImpl* WebViewImpl::GetNotificationPresenter() {
-  if (!notification_presenter_.isInitialized() && client())
-    notification_presenter_.initialize(client()->notificationPresenter());
+  if (!notification_presenter_.isInitialized() && client_)
+    notification_presenter_.initialize(client_->notificationPresenter());
   return &notification_presenter_;
 }
 #endif
 
 void WebViewImpl::RefreshAutofillPopup() {
   DCHECK(autocomplete_popup_showing_);
 
   // Hide the popup if it has become empty.
   if (autocomplete_popup_client_->listSize() == 0) {
     HideAutoCompletePopup();
@@ skipping 31 matching lines @@
       hitTestResultAtPoint(doc_point, false);
 }
 
 void WebViewImpl::setTabsToLinks(bool enable) {
   tabs_to_links_ = enable;
 }
 
 bool WebViewImpl::tabsToLinks() const {
   return tabs_to_links_;
 }