Send resource load notifications from plugins to devtools agent

webkit/glue/webplugin_impl.cc

 // Copyright (c) 2006-2009 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 "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebHTTPBody.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebHTTPHeaderVisitor.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
@@ skipping 10 matching lines @@
 #include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webplugin_page_delegate.h"
 #include "googleurl/src/gurl.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebConsoleMessage;
 using WebKit::WebCString;
 using WebKit::WebCursorInfo;
 using WebKit::WebData;
 using WebKit::WebDataSource;
+using WebKit::WebDevToolsAgent;
 using WebKit::WebFrame;
 using WebKit::WebHTTPBody;
 using WebKit::WebHTTPHeaderVisitor;
 using WebKit::WebInputEvent;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebPluginContainer;
 using WebKit::WebPluginParams;
 using WebKit::WebRect;
 using WebKit::WebString;
@@ skipping 362 matching lines @@
 
 GURL WebPluginImpl::CompleteURL(const char* url) {
   if (!webframe_) {
     NOTREACHED();
     return GURL();
   }
   // TODO(darin): Is conversion from UTF8 correct here?
   return webframe_->completeURL(WebString::fromUTF8(url));
 }
 
-void WebPluginImpl::CancelResource(int id) {
+void WebPluginImpl::CancelResource(unsigned long id) {
   for (size_t i = 0; i < clients_.size(); ++i) {
     if (clients_[i].id == id) {
       if (clients_[i].loader.get()) {
         clients_[i].loader->setDefersLoading(false);
         clients_[i].loader->cancel();
         RemoveClient(i);
       }
       return;
     }
   }
@@ skipping 252 matching lines @@
   // accept data
   loader->setDefersLoading(true);
 
   client->DidReceiveResponse(
       response_info.mime_type,
       GetAllHeaders(response),
       response_info.expected_length,
       response_info.last_modified,
       request_is_seekable);
 
+  if (WebDevToolsAgent* devtools_agent = webframe_->view()->devToolsAgent()) {
+    ClientInfo* client_info = GetClientInfoFromLoader(loader);
+    if (client_info)
+      devtools_agent->didReceiveResponse(client_info->id, response);
+  }
+
   // Bug http://b/issue?id=925559. The flash plugin would not handle the HTTP
   // error codes in the stream header and as a result, was unaware of the
   // fate of the HTTP requests issued via NPN_GetURLNotify. Webkit and FF
   // destroy the stream and invoke the NPP_DestroyStream function on the
   // plugin if the HTTP request fails.
   const GURL& url = response.url();
   if (url.SchemeIs("http") || url.SchemeIs("https")) {
     if (response.httpStatusCode() < 100 || response.httpStatusCode() >= 400) {
       // The plugin instance could be in the process of deletion here.
       // Verify if the WebPluginResourceClient instance still exists before
@@ skipping 15 matching lines @@
   MultiPartResponseHandlerMap::iterator index =
       multi_part_response_map_.find(client);
   if (index != multi_part_response_map_.end()) {
     MultipartResponseDelegate* multi_part_handler = (*index).second;
     DCHECK(multi_part_handler != NULL);
     multi_part_handler->OnReceivedData(buffer, length);
   } else {
     loader->setDefersLoading(true);
     client->DidReceiveData(buffer, length, 0);
   }
+
+  if (WebDevToolsAgent* devtools_agent = webframe_->view()->devToolsAgent()) {
+    ClientInfo* client_info = GetClientInfoFromLoader(loader);
+    if (client_info)
+      devtools_agent->didReceiveData(client_info->id, length);
+  }
 }
 
 void WebPluginImpl::didFinishLoading(WebURLLoader* loader) {
   ClientInfo* client_info = GetClientInfoFromLoader(loader);
   if (client_info && client_info->client) {
     MultiPartResponseHandlerMap::iterator index =
       multi_part_response_map_.find(client_info->client);
     if (index != multi_part_response_map_.end()) {
       delete (*index).second;
       multi_part_response_map_.erase(index);
       if (page_delegate_)
         page_delegate_->DidStopLoadingForPlugin();
     }
     loader->setDefersLoading(true);
     WebPluginResourceClient* resource_client = client_info->client;
     // The ClientInfo can get deleted in the call to DidFinishLoading below.
     // It is not safe to access this structure after that.
     client_info->client = NULL;
     resource_client->DidFinishLoading();
+
+    if (WebDevToolsAgent* devtools_agent = webframe_->view()->devToolsAgent())
+      devtools_agent->didFinishLoading(client_info->id);
   }
 }
 
 void WebPluginImpl::didFail(WebURLLoader* loader,
-                            const WebURLError&) {
+                            const WebURLError& error) {
   ClientInfo* client_info = GetClientInfoFromLoader(loader);
   if (client_info && client_info->client) {
     loader->setDefersLoading(true);
     WebPluginResourceClient* resource_client = client_info->client;
     // The ClientInfo can get deleted in the call to DidFail below.
     // It is not safe to access this structure after that.
     client_info->client = NULL;
     resource_client->DidFail();
+
+    if (WebDevToolsAgent* devtools_agent = webframe_->view()->devToolsAgent())
+      devtools_agent->didFailLoading(client_info->id, error);
   }
 }
 
 void WebPluginImpl::RemoveClient(size_t i) {
   clients_.erase(clients_.begin() + i);
 }
 
 void WebPluginImpl::RemoveClient(WebURLLoader* loader) {
   for (size_t i = 0; i < clients_.size(); ++i) {
     if (clients_[i].loader.get() == loader) {
@@ skipping 44 matching lines @@
 
     // delegate_ could be NULL because executeScript caused the container to
     // be deleted.
     if (delegate_) {
       delegate_->SendJavaScriptStream(
           gurl, result.utf8(), !result.isNull(), notify, notify_data);
     }
   } else {
     GURL complete_url = CompleteURL(url);
 
-    int resource_id = GetNextResourceId();
+    unsigned long resource_id = GetNextResourceId();
+    if (!resource_id)
+      return;
+
     WebPluginResourceClient* resource_client = delegate_->CreateResourceClient(
         resource_id, complete_url, notify, notify_data, NULL);
     if (!resource_client)
       return;
 
     // If the RouteToFrame call returned a failure then inform the result
     // back to the plugin asynchronously.
     if ((routing_status == INVALID_URL) ||
         (routing_status == GENERAL_FAILURE)) {
       resource_client->DidFail();
       return;
     }
 
     // CreateResourceClient() sends a synchronous IPC message so it's possible
     // that TearDownPluginInstance() may have been called in the nested
     // message loop.  If so, don't start the request.
     if (!delegate_)
       return;
 
     InitiateHTTPRequest(resource_id, resource_client, method, buf, len,
                         complete_url, NULL, use_plugin_src_as_referrer);
   }
 }
 
-int WebPluginImpl::GetNextResourceId() {
-  static int next_id = 0;
-  return ++next_id;
+unsigned long WebPluginImpl::GetNextResourceId() {
+  if (!webframe_)
+    return 0;
+  WebView* view = webframe_->view();
+  if (!view)
+    return 0;
+  return view->createUniqueIdentifierForRequest();
 }
 
-bool WebPluginImpl::InitiateHTTPRequest(int resource_id,
+bool WebPluginImpl::InitiateHTTPRequest(unsigned long resource_id,
                                         WebPluginResourceClient* client,
                                         const char* method, const char* buf,
                                         int buf_len,
                                         const GURL& url,
                                         const char* range_info,
                                         bool use_plugin_src_as_referrer) {
   if (!client) {
     NOTREACHED();
     return false;
   }
@@ skipping 21 matching lines @@
 
   // GetURL/PostURL requests initiated explicitly by plugins should specify the
   // plugin SRC url as the referrer if it is available.
   GURL referrer_url;
   if (use_plugin_src_as_referrer && !plugin_url_.spec().empty())
     referrer_url = plugin_url_;
   webframe_->setReferrerForRequest(info.request, referrer_url);
 
   // Sets the routing id to associate the ResourceRequest with the RenderView.
   webframe_->dispatchWillSendRequest(info.request);
+  if (WebDevToolsAgent* devtools_agent = webframe_->view()->devToolsAgent()) {
+    devtools_agent->identifierForInitialRequest(resource_id, webframe_,
+                                                info.request);
+    devtools_agent->willSendRequest(resource_id, info.request);
+  }
 
   info.loader.reset(WebKit::webKitClient()->createURLLoader());
   if (!info.loader.get())
     return false;
   info.loader->loadAsynchronously(info.request, this);
 
   clients_.push_back(info);
   return true;
 }
 
 void WebPluginImpl::CancelDocumentLoad() {
   if (webframe_) {
     ignore_response_error_ = true;
     webframe_->stopLoading();
   }
 }
 
 void WebPluginImpl::InitiateHTTPRangeRequest(const char* url,
                                              const char* range_info,
                                              intptr_t existing_stream,
                                              bool notify_needed,
                                              intptr_t notify_data) {
-  int resource_id = GetNextResourceId();
+  unsigned long resource_id = GetNextResourceId();
+  if (!resource_id)
+    return;
+
   GURL complete_url = CompleteURL(url);
 
   WebPluginResourceClient* resource_client = delegate_->CreateResourceClient(
       resource_id, complete_url, notify_needed, notify_data, existing_stream);
   InitiateHTTPRequest(
       resource_id, resource_client, "GET", NULL, 0, complete_url, range_info,
       true);
 }
 
-void WebPluginImpl::SetDeferResourceLoading(int resource_id, bool defer) {
+void WebPluginImpl::SetDeferResourceLoading(unsigned long resource_id,
+                                            bool defer) {
   std::vector<ClientInfo>::iterator client_index = clients_.begin();
   while (client_index != clients_.end()) {
     ClientInfo& client_info = *client_index;
 
     if (client_info.id == resource_id) {
       client_info.loader->setDefersLoading(defer);
 
       // If we determined that the request had failed via the HTTP headers
       // in the response then we send out a failure notification to the
       // plugin process, as certain plugins don't handle HTTP failure codes
       // correctly.
       if (!defer && client_info.client &&
           client_info.pending_failure_notification) {
         // The ClientInfo and the iterator can become invalid due to the call
         // to DidFail below.
         WebPluginResourceClient* resource_client = client_info.client;
         client_info.loader->cancel();
         clients_.erase(client_index++);
         resource_client->DidFail();
+
+        // Report that resource loading finished.
+        WebDevToolsAgent* devtools_agent = webframe_->view()->devToolsAgent();
+        if (devtools_agent)
+          devtools_agent->didFinishLoading(resource_id);
       }
       break;
     }
     client_index++;
   }
 }
 
 void WebPluginImpl::HandleHttpMultipartResponse(
     const WebURLResponse& response, WebPluginResourceClient* client) {
   std::string multipart_boundary;
@@ skipping 93 matching lines @@
     client_index = clients_.erase(client_index);
   }
 
   // This needs to be called now and not in the destructor since the
   // webframe_ might not be valid anymore.
   webframe_ = NULL;
   method_factory_.RevokeAll();
 }
 
 }  // namespace webkit_glue