Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4334)

Unified Diff: chrome/renderer/webplugin_delegate_proxy.cc

Issue 2896: This CB fixes the following issues:-... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/webplugin_delegate_proxy.h ('k') | webkit/build/glue/glue.vcproj » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/webplugin_delegate_proxy.cc
===================================================================
--- chrome/renderer/webplugin_delegate_proxy.cc (revision 2387)
+++ chrome/renderer/webplugin_delegate_proxy.cc (working copy)
@@ -44,7 +44,7 @@
}
void Initialize(int resource_id, const std::string &url, bool notify_needed,
- void *notify_data) {
+ void *notify_data, void* existing_stream) {
resource_id_ = resource_id;
url_ = url;
notify_needed_ = notify_needed;
@@ -55,6 +55,7 @@
params.url = url_;
params.notify_needed = notify_needed_;
params.notify_data = notify_data_;
+ params.stream = existing_stream;
channel_->Send(new PluginMsg_HandleURLRequestReply(instance_id_, params));
}
@@ -85,7 +86,7 @@
cancel));
}
- void DidReceiveData(const char* buffer, int length) {
+ void DidReceiveData(const char* buffer, int length, int data_offset) {
DCHECK(channel_ != NULL);
DCHECK(length > 0);
std::vector<char> data;
@@ -95,7 +96,7 @@
// deleted from under us.
scoped_refptr<PluginChannelHost> channel_ref(channel_);
channel_->Send(new PluginMsg_DidReceiveData(instance_id_, resource_id_,
- data));
+ data, data_offset));
}
void DidFinishLoading() {
@@ -112,7 +113,7 @@
MessageLoop::current()->DeleteSoon(FROM_HERE, this);
}
- private:
+private:
int resource_id_;
int instance_id_;
scoped_refptr<PluginChannelHost> channel_;
@@ -316,6 +317,9 @@
IPC_MESSAGE_HANDLER(PluginHostMsg_URLRequest, OnHandleURLRequest)
IPC_MESSAGE_HANDLER(PluginHostMsg_GetCPBrowsingContext,
OnGetCPBrowsingContext)
+ IPC_MESSAGE_HANDLER(PluginHostMsg_CancelDocumentLoad, OnCancelDocumentLoad)
+ IPC_MESSAGE_HANDLER(PluginHostMsg_InitiateHTTPRangeRequest,
+ OnInitiateHTTPRangeRequest)
IPC_MESSAGE_UNHANDLED_ERROR()
IPC_END_MESSAGE_MAP()
}
@@ -655,10 +659,10 @@
WebPluginResourceClient* WebPluginDelegateProxy::CreateResourceClient(
int resource_id, const std::string &url, bool notify_needed,
- void *notify_data) {
+ void* notify_data, void* npstream) {
ResourceClientProxy* proxy = new ResourceClientProxy(channel_host_,
instance_id_);
- proxy->Initialize(resource_id, url, notify_needed, notify_data);
+ proxy->Initialize(resource_id, url, notify_needed, notify_data, npstream);
return proxy;
}
@@ -669,3 +673,14 @@
notify_data));
}
+void WebPluginDelegateProxy::OnCancelDocumentLoad() {
+ plugin_->CancelDocumentLoad();
+}
+
+void WebPluginDelegateProxy::OnInitiateHTTPRangeRequest(
+ const std::string& url, const std::string& range_info,
+ HANDLE existing_stream, bool notify_needed, HANDLE notify_data) {
+ plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(),
+ existing_stream, notify_needed,
+ notify_data);
+}
« no previous file with comments | « chrome/renderer/webplugin_delegate_proxy.h ('k') | webkit/build/glue/glue.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698