Minor cleanup in glue to remove some remaining base dependencies....

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 53 matching lines @@
 // WebFrame::Closing and then derefs the WebFrame and will cause it to be
 // deleted (unless an external someone is also holding a reference).
 
 #include "config.h"
 
 #include <algorithm>
 #include <string>
 
 #include "HTMLFormElement.h"  // need this before Document.h
 #include "Chrome.h"
-#include "ChromeClientChromium.h"
 #include "ChromiumBridge.h"
 #include "ClipboardUtilitiesChromium.h"
 #include "Console.h"
 #include "Document.h"
 #include "DocumentFragment.h"  // Only needed for ReplaceSelectionCommand.h :(
 #include "DocumentLoader.h"
 #include "DocumentMarker.h"
 #include "DOMWindow.h"
 #include "Editor.h"
 #include "EventHandler.h"
@@ skipping 51 matching lines @@
 #include "webkit/api/public/WebRange.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/api/public/WebSecurityOrigin.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/api/public/WebURLError.h"
 #include "webkit/api/public/WebVector.h"
 #include "webkit/api/src/DOMUtilitiesPrivate.h"
 #include "webkit/api/src/PasswordAutocompleteListener.h"
 #include "webkit/api/src/WebDataSourceImpl.h"
-#include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webview_impl.h"
 
 #if PLATFORM(LINUX)
 #include <gdk/gdk.h>
 #endif
 
 using WebCore::AtomicString;
-using WebCore::ChromeClientChromium;
 using WebCore::ChromiumBridge;
 using WebCore::Color;
 using WebCore::Document;
 using WebCore::DocumentFragment;
 using WebCore::DocumentLoader;
 using WebCore::ExceptionCode;
 using WebCore::GraphicsContext;
 using WebCore::HTMLFrameOwnerElement;
 using WebCore::HTMLInputElement;
 using WebCore::Frame;
@@ skipping 184 matching lines @@
 
 // WebFrame -------------------------------------------------------------------
 
 class WebFrameImpl::DeferredScopeStringMatches {
  public:
   DeferredScopeStringMatches(WebFrameImpl* webframe,
                              int identifier,
                              const WebString& search_text,
                              const WebFindOptions& options,
                              bool reset)
-      : timer_(this, &DeferredScopeStringMatches::DoTimeout),
+      : ALLOW_THIS_IN_INITIALIZER_LIST(
+            timer_(this, &DeferredScopeStringMatches::DoTimeout)),
         webframe_(webframe),
         identifier_(identifier),
         search_text_(search_text),
         options_(options),
         reset_(reset) {
     timer_.startOneShot(0.0);
   }
 
  private:
   void DoTimeout(Timer<DeferredScopeStringMatches>*) {
@@ skipping 1274 matching lines @@
 
 // static
 WebFrameImpl* WebFrameImpl::FromFrame(WebCore::Frame* frame) {
   if (!frame)
     return NULL;
   return static_cast<WebFrameLoaderClient*>(
       frame->loader()->client())->webframe();
 }
 
 WebViewImpl* WebFrameImpl::GetWebViewImpl() const {
-  if (!frame_ || !frame_->page())
+  if (!frame_)
     return NULL;
 
-  // There are cases where a Frame may outlive its associated Page.  Get the
-  // WebViewImpl by accessing it indirectly through the Frame's Page so that we
-  // don't have to worry about cleaning up the WebFrameImpl -> WebViewImpl
-  // pointer. WebCore already clears the Frame's Page pointer when the Page is
-  // destroyed by the WebViewImpl.
-  return static_cast<ChromeClientImpl*>(
-      frame_->page()->chrome()->client())->webview();
+  return WebViewImpl::FromPage(frame_->page());
 }
 
 WebDataSourceImpl* WebFrameImpl::GetDataSourceImpl() const {
   return static_cast<WebDataSourceImpl*>(dataSource());
 }
 
 WebDataSourceImpl* WebFrameImpl::GetProvisionalDataSourceImpl() const {
   return static_cast<WebDataSourceImpl*>(provisionalDataSource());
 }
 
@@ skipping 240 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();
   }
 }