Get rid of stashing a frame pointer with ResourceRequest and just store the r...

chrome/renderer/renderer_glue.cc

 // Copyright (c) 2006-2008 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.
 
 // This file provides the embedder's side of random webkit glue functions.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <wininet.h>
 #endif
 
 #include "base/clipboard.h"
 #include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/net/render_dns_master.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/render_view.h"
 #include "googleurl/src/url_util.h"
 #include "webkit/glue/scoped_clipboard_writer_glue.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
 
 #include "WebKit.h"
 #include "WebKitClient.h"
 #include "WebString.h"
 
 #include <vector>
@@ skipping 188 matching lines @@
 
 webkit_glue::ScreenInfo GetScreenInfo(gfx::NativeViewId window) {
   webkit_glue::ScreenInfo results;
   RenderThread::current()->Send(
       new ViewHostMsg_GetScreenInfo(window, &results));
   return results;
 }
 
 // static factory function
 ResourceLoaderBridge* ResourceLoaderBridge::Create(
-    WebFrame* webframe,
     const std::string& method,
     const GURL& url,
     const GURL& policy_url,
     const GURL& referrer,
     const std::string& headers,
     int load_flags,
     int origin_pid,
     ResourceType::Type resource_type,
-    bool mixed_content) {
-  // TODO(darin): we need to eliminate the webframe parameter because webkit
-  // does not always supply it (see ResourceHandle::loadResourceSynchronously).
-  // Instead we should add context to ResourceRequest, which will be easy to do
-  // once we merge to the latest WebKit (r23806 at least).
-  if (!webframe) {
-    NOTREACHED() << "no webframe";
-    return NULL;
-  }
-
-  if (!webframe->GetView()->GetDelegate())
-    return NULL;
-
-  RenderView* rv = static_cast<RenderView*>(webframe->GetView()->GetDelegate());
-  int route_id = rv->routing_id();
+    bool mixed_content,
+    int routing_id) {
   ResourceDispatcher* dispatch = RenderThread::current()->resource_dispatcher();
   return dispatch->CreateBridge(method, url, policy_url, referrer, headers,
                                 load_flags, origin_pid, resource_type,
-                                mixed_content, 0, route_id);
+                                mixed_content, 0, routing_id);
 }
 
 void NotifyCacheStats() {
   // Update the browser about our cache
   // NOTE: Since this can be called from the plugin process, we might not have
   // a RenderThread.  Do nothing in that case.
   if (!IsPluginProcess())
     RenderThread::current()->InformHostOfCacheStatsLater();
 }
 
 
 }  // namespace webkit_glue