Hook up WebFrameClient, replacing many WebViewDelegate methods....

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, 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
@@ skipping 129 matching lines @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebConsoleMessage.h"
 #include "webkit/api/public/WebFindOptions.h"
 #include "webkit/api/public/WebForm.h"
+#include "webkit/api/public/WebFrameClient.h"
 #include "webkit/api/public/WebHistoryItem.h"
 #include "webkit/api/public/WebRange.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/api/public/WebURLError.h"
 #include "webkit/api/public/WebVector.h"
 #include "webkit/api/src/WebDataSourceImpl.h"
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/dom_operations.h"
@@ skipping 50 matching lines @@
 using WebCore::VisiblePosition;
 using WebCore::XPathResult;
 
 using WebKit::WebCanvas;
 using WebKit::WebConsoleMessage;
 using WebKit::WebData;
 using WebKit::WebDataSource;
 using WebKit::WebDataSourceImpl;
 using WebKit::WebFindOptions;
 using WebKit::WebFrame;
+using WebKit::WebFrameClient;
 using WebKit::WebHistoryItem;
 using WebKit::WebForm;
 using WebKit::WebRange;
 using WebKit::WebRect;
 using WebKit::WebScriptSource;
 using WebKit::WebSize;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebURLError;
 using WebKit::WebURLRequest;
@@ skipping 661 matching lines @@
   frame_->loader()->setEncoding(encoding, user_chosen);
 
   // NOTE: mac only does this if there is a document
   frame_->loader()->addData(data, data_len);
 }
 
 unsigned WebFrameImpl::unloadListenerCount() const {
   return frame()->domWindow()->pendingUnloadEventListeners();
 }
 
+bool WebFrameImpl::isProcessingUserGesture() const {
+  return frame()->loader()->isProcessingUserGesture();
+}
+
 void WebFrameImpl::replaceSelection(const WebString& wtext) {
   String text = webkit_glue::WebStringToString(wtext);
   RefPtr<DocumentFragment> fragment = createFragmentFromText(
       frame()->selection()->toNormalizedRange().get(), text);
   WebCore::applyCommand(WebCore::ReplaceSelectionCommand::create(
       frame()->document(), fragment.get(), false, true, true));
 }
 
 void WebFrameImpl::insertText(const WebString& text) {
   frame()->editor()->insertText(webkit_glue::WebStringToString(text), NULL);
@@ skipping 482 matching lines @@
   active_match_index_ = -1;
 }
 
 void WebFrameImpl::increaseMatchCount(int count, int request_id) {
   // This function should only be called on the mainframe.
   DCHECK(!parent());
 
   total_matchcount_ += count;
 
   // Update the UI with the latest findings.
-  WebViewDelegate* webview_delegate = GetWebViewImpl()->GetDelegate();
+  WebViewDelegate* webview_delegate = GetWebViewImpl()->delegate();
   DCHECK(webview_delegate);
   if (webview_delegate)
     webview_delegate->ReportFindInPageMatchCount(total_matchcount_, request_id,
                                                  frames_scoping_count_ == 0);
 }
 
 void WebFrameImpl::reportFindInPageSelection(const WebRect& selection_rect,
                                              int active_match_ordinal,
                                              int request_id) {
   // Update the UI with the latest selection rect.
-  WebViewDelegate* webview_delegate = GetWebViewImpl()->GetDelegate();
+  WebViewDelegate* webview_delegate = GetWebViewImpl()->delegate();
   DCHECK(webview_delegate);
   if (webview_delegate) {
     webview_delegate->ReportFindInPageSelection(
         request_id,
         OrdinalOfFirstMatchForFrame(this) + active_match_ordinal,
         selection_rect);
   }
 }
 
 void WebFrameImpl::resetMatchCount() {
@@ skipping 20 matching lines @@
 }
 
 WebString WebFrameImpl::contentAsMarkup() const {
   return webkit_glue::StringToWebString(createFullMarkup(frame_->document()));
 }
 
 // WebFrameImpl public ---------------------------------------------------------
 
 int WebFrameImpl::live_object_count_ = 0;
 
-WebFrameImpl::WebFrameImpl()
+WebFrameImpl::WebFrameImpl(WebFrameClient* client)
   : ALLOW_THIS_IN_INITIALIZER_LIST(frame_loader_client_(this)),
     ALLOW_THIS_IN_INITIALIZER_LIST(scope_matches_factory_(this)),
+    client_(client),
     active_match_frame_(NULL),
     active_match_index_(-1),
     locating_active_rect_(false),
     resume_scoping_from_range_(NULL),
     last_match_count_(-1),
     total_matchcount_(-1),
     frames_scoping_count_(-1),
     scoping_complete_(false),
     next_invalidate_after_(0) {
   StatsCounter(kWebFrameActiveCount).Increment();
@@ skipping 19 matching lines @@
 
   // We must call init() after frame_ is assigned because it is referenced
   // during init().
   frame_->init();
 }
 
 PassRefPtr<Frame> WebFrameImpl::CreateChildFrame(
     const FrameLoadRequest& request, HTMLFrameOwnerElement* owner_element) {
   // TODO(darin): share code with initWithName()
 
-  scoped_refptr<WebFrameImpl> webframe = new WebFrameImpl();
+  scoped_refptr<WebFrameImpl> webframe = new WebFrameImpl(client());
 
   // Add an extra ref on behalf of the Frame/FrameLoader, which references the
   // WebFrame via the FrameLoaderClient interface. See the comment at the top
   // of this file for more info.
   webframe->AddRef();
 
   RefPtr<Frame> child_frame = Frame::create(
       frame_->page(), owner_element, &webframe->frame_loader_client_);
   webframe->frame_ = child_frame.get();
 
@@ skipping 169 matching lines @@
           frame()->document()->setFocusedNode(node);
           break;
         }
         node = node->traverseNextNode();
       }
     }
   }
 }
 
 void WebFrameImpl::DidFail(const ResourceError& error, bool was_provisional) {
-  WebViewImpl* web_view = GetWebViewImpl();
-  WebViewDelegate* delegate = web_view->delegate();
-  if (delegate) {
-    const WebURLError& web_error =
-        webkit_glue::ResourceErrorToWebURLError(error);
-    if (was_provisional) {
-      delegate->DidFailProvisionalLoadWithError(web_view, web_error, this);
-    } else {
-      delegate->DidFailLoadWithError(web_view, web_error, this);
-    }
+  if (!client_)
+    return;
+  const WebURLError& web_error =
+      webkit_glue::ResourceErrorToWebURLError(error);
+  if (was_provisional) {
+    client_->didFailProvisionalLoad(this, web_error);
+  } else {
+    client_->didFailLoad(this, web_error);
   }
 }
 
 void WebFrameImpl::SetAllowsScrolling(bool flag) {
   frame_->view()->setCanHaveScrollbars(flag);
 }
 
 void WebFrameImpl::RegisterPasswordListener(
     PassRefPtr<WebCore::HTMLInputElement> input_element,
     webkit_glue::PasswordAutocompleteListener* listener) {
@@ skipping 169 matching lines @@
 
   SecurityOrigin* security_origin = frame_->document()->securityOrigin();
 
   if (!frame_->loader()->isScheduledLocationChangePending()) {
     frame_->loader()->stopAllLoaders();
     frame_->loader()->begin(frame_->loader()->url(), true, security_origin);
     frame_->loader()->write(script_result);
     frame_->loader()->end();
   }
 }