summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 07:11:34 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 07:11:34 +0000
commit3d248b2db2eae7c805ada987f997caa0929700c7 (patch)
treee00b151dee03e241775e33f460b0585dd49b20ea /chrome/renderer
parent53a5453c5ade1cadf95989a2102cf56873888e78 (diff)
downloadchromium_src-3d248b2db2eae7c805ada987f997caa0929700c7.zip
chromium_src-3d248b2db2eae7c805ada987f997caa0929700c7.tar.gz
chromium_src-3d248b2db2eae7c805ada987f997caa0929700c7.tar.bz2
Send resource load notifications from plugins to devtools agent. This is a part of a fix which would allow to inspect plugin resources.
BUG=2084 Review URL: http://codereview.chromium.org/435044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/webplugin_delegate_pepper.cc2
-rw-r--r--chrome/renderer/webplugin_delegate_pepper.h2
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.cc11
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.h4
4 files changed, 10 insertions, 9 deletions
diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc
index 1c24bb4..0be5924 100644
--- a/chrome/renderer/webplugin_delegate_pepper.cc
+++ b/chrome/renderer/webplugin_delegate_pepper.cc
@@ -207,7 +207,7 @@ FilePath WebPluginDelegatePepper::GetPluginPath() {
}
WebPluginResourceClient* WebPluginDelegatePepper::CreateResourceClient(
- int resource_id, const GURL& url, bool notify_needed,
+ unsigned long resource_id, const GURL& url, bool notify_needed,
intptr_t notify_data, intptr_t existing_stream) {
// Stream already exists. This typically happens for range requests
// initiated via NPN_RequestRead.
diff --git a/chrome/renderer/webplugin_delegate_pepper.h b/chrome/renderer/webplugin_delegate_pepper.h
index 5a7ebf5..afb6630 100644
--- a/chrome/renderer/webplugin_delegate_pepper.h
+++ b/chrome/renderer/webplugin_delegate_pepper.h
@@ -75,7 +75,7 @@ class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate {
virtual void DidManualLoadFail();
virtual void InstallMissingPlugin();
virtual webkit_glue::WebPluginResourceClient* CreateResourceClient(
- int resource_id,
+ unsigned long resource_id,
const GURL& url,
bool notify_needed,
intptr_t notify_data,
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 823080c..2e24172 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -68,8 +68,9 @@ class ResourceClientProxy : public webkit_glue::WebPluginResourceClient {
~ResourceClientProxy() {
}
- void Initialize(int resource_id, const GURL& url, bool notify_needed,
- intptr_t notify_data, intptr_t existing_stream) {
+ void Initialize(unsigned long resource_id, const GURL& url,
+ bool notify_needed, intptr_t notify_data,
+ intptr_t existing_stream) {
resource_id_ = resource_id;
url_ = url;
notify_needed_ = notify_needed;
@@ -147,7 +148,7 @@ class ResourceClientProxy : public webkit_glue::WebPluginResourceClient {
private:
scoped_refptr<PluginChannelHost> channel_;
int instance_id_;
- int resource_id_;
+ unsigned long resource_id_;
GURL url_;
bool notify_needed_;
intptr_t notify_data_;
@@ -1125,7 +1126,7 @@ void WebPluginDelegateProxy::OnHandleURLRequest(
webkit_glue::WebPluginResourceClient*
WebPluginDelegateProxy::CreateResourceClient(
- int resource_id, const GURL& url, bool notify_needed,
+ unsigned long resource_id, const GURL& url, bool notify_needed,
intptr_t notify_data, intptr_t npstream) {
if (!channel_host_)
return NULL;
@@ -1148,7 +1149,7 @@ void WebPluginDelegateProxy::OnInitiateHTTPRangeRequest(
notify_data);
}
-void WebPluginDelegateProxy::OnDeferResourceLoading(int resource_id,
+void WebPluginDelegateProxy::OnDeferResourceLoading(unsigned long resource_id,
bool defer) {
plugin_->SetDeferResourceLoading(resource_id, defer);
}
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index 02dd644..f01ae092 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -91,7 +91,7 @@ class WebPluginDelegateProxy
virtual void DidManualLoadFail();
virtual void InstallMissingPlugin();
virtual webkit_glue::WebPluginResourceClient* CreateResourceClient(
- int resource_id,
+ unsigned long resource_id,
const GURL& url,
bool notify_needed,
intptr_t notify_data,
@@ -136,7 +136,7 @@ class WebPluginDelegateProxy
intptr_t existing_stream,
bool notify_needed,
intptr_t notify_data);
- void OnDeferResourceLoading(int resource_id, bool defer);
+ void OnDeferResourceLoading(unsigned long resource_id, bool defer);
#if defined(OS_MACOSX)
void OnUpdateGeometry_ACK(int ack_key);