Update src/content/renderer to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE

content/renderer/render_thread.cc

 // Copyright (c) 2011 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 "content/renderer/render_thread.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 65 matching lines @@
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <objbase.h>
 #endif
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
+using WebKit::WebDocument;
 using WebKit::WebFrame;
 using WebKit::WebRuntimeFeatures;
 using WebKit::WebScriptController;
 using WebKit::WebString;
 using WebKit::WebStorageEventDispatcher;
 using WebKit::WebView;
 
 namespace {
 static const double kInitialIdleHandlerDelayS = 1.0 /* seconds */;
 
 // Keep the global RenderThread in a TLS slot so it is impossible to access
 // incorrectly from the wrong thread.
 static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls(
     base::LINKER_INITIALIZED);
 
 class RenderViewZoomer : public RenderViewVisitor {
  public:
   RenderViewZoomer(const GURL& url, double zoom_level)
       : zoom_level_(zoom_level) {
     host_ = net::GetHostOrSpecFromURL(url);
   }
 
   virtual bool Visit(RenderView* render_view) {
-    WebView* webview = render_view->webview();  // Guaranteed non-NULL.
+    WebView* webview = render_view->webview();
+    WebDocument document = webview->mainFrame()->document();
 
     // Don't set zoom level for full-page plugin since they don't use the same
     // zoom settings.
-    if (webview->mainFrame()->document().isPluginDocument())
+    if (document.isPluginDocument())
       return true;
 
-    if (net::GetHostOrSpecFromURL(GURL(webview->mainFrame()->url())) == host_)
+    if (net::GetHostOrSpecFromURL(GURL(document.url())) == host_)
       webview->setZoomLevel(false, zoom_level_);
     return true;
   }
 
  private:
   std::string host_;
   double zoom_level_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewZoomer);
 };
@@ skipping 554 matching lines @@
 
 void RenderThread::RegisterExtension(v8::Extension* extension) {
   WebScriptController::registerExtension(extension);
   v8_extensions_.insert(extension->name());
 }
 
 bool RenderThread::IsRegisteredExtension(
     const std::string& v8_extension_name) const {
   return v8_extensions_.find(v8_extension_name) != v8_extensions_.end();
 }