More WebView / WebViewDelegate cleanup.

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 1416 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()->delegate();
-  DCHECK(webview_delegate);
-  if (webview_delegate)
-    webview_delegate->ReportFindInPageMatchCount(total_matchcount_, request_id,
-                                                 frames_scoping_count_ == 0);
+  if (client_) {
+    client_->reportFindInPageMatchCount(
+        request_id, total_matchcount_, 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()->delegate();
-  DCHECK(webview_delegate);
-  if (webview_delegate) {
-    webview_delegate->ReportFindInPageSelection(
-        request_id,
-        OrdinalOfFirstMatchForFrame(this) + active_match_ordinal,
+  if (client_) {
+    client_->reportFindInPageSelection(
+        request_id, OrdinalOfFirstMatchForFrame(this) + active_match_ordinal,
         selection_rect);
   }
 }
 
 void WebFrameImpl::resetMatchCount() {
   total_matchcount_ = 0;
   frames_scoping_count_ = 0;
 }
 
 WebURL WebFrameImpl::completeURL(const WebString& url) const {
@@ skipping 440 matching lines @@
 
   SecurityOrigin* security_origin = frame_->document()->securityOrigin();
 
   if (!frame_->redirectScheduler()->locationChangePending()) {
     frame_->loader()->stopAllLoaders();
     frame_->loader()->begin(frame_->loader()->url(), true, security_origin);
     frame_->loader()->write(script_result);
     frame_->loader()->end();
   }
 }