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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/plugins/plugin_stream_url.h

Issue 165381: Merge 22369 - Fix plugin IPC issues.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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 | « webkit/glue/plugins/plugin_instance.cc ('k') | webkit/glue/plugins/plugin_stream_url.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/plugin_stream_url.h
===================================================================
--- webkit/glue/plugins/plugin_stream_url.h (revision 23177)
+++ webkit/glue/plugins/plugin_stream_url.h (working copy)
@@ -48,8 +48,7 @@
const std::string& headers,
uint32 expected_length,
uint32 last_modified,
- bool request_is_seekable,
- bool* cancel);
+ bool request_is_seekable);
void DidReceiveData(const char* buffer, int length, int data_offset);
void DidFinishLoading();
void DidFail();
Property changes on: webkit\glue\plugins\plugin_stream_url.h
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/plugins/plugin_stream_url.h:r3734-4217,4606-5108,5177-5263
Merged /trunk/src/webkit/glue/plugins/plugin_stream_url.h:r22369
« no previous file with comments | « webkit/glue/plugins/plugin_instance.cc ('k') | webkit/glue/plugins/plugin_stream_url.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698