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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__ 5 #ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__
6 #define WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__ 6 #define WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__
7 7
8 8
9 #include "webkit/glue/webplugin.h" 9 #include "webkit/glue/webplugin.h"
10 #include "webkit/glue/plugins/plugin_stream.h" 10 #include "webkit/glue/plugins/plugin_stream.h"
(...skipping 30 matching lines...) Expand all
41 virtual void CancelRequest(); 41 virtual void CancelRequest();
42 42
43 // 43 //
44 // WebPluginResourceClient methods 44 // WebPluginResourceClient methods
45 // 45 //
46 void WillSendRequest(const GURL& url); 46 void WillSendRequest(const GURL& url);
47 void DidReceiveResponse(const std::string& mime_type, 47 void DidReceiveResponse(const std::string& mime_type,
48 const std::string& headers, 48 const std::string& headers,
49 uint32 expected_length, 49 uint32 expected_length,
50 uint32 last_modified, 50 uint32 last_modified,
51 bool request_is_seekable, 51 bool request_is_seekable);
52 bool* cancel);
53 void DidReceiveData(const char* buffer, int length, int data_offset); 52 void DidReceiveData(const char* buffer, int length, int data_offset);
54 void DidFinishLoading(); 53 void DidFinishLoading();
55 void DidFail(); 54 void DidFail();
56 bool IsMultiByteResponseExpected() { 55 bool IsMultiByteResponseExpected() {
57 return seekable(); 56 return seekable();
58 } 57 }
59 58
60 59
61 private: 60 private:
62 GURL url_; 61 GURL url_;
63 int id_; 62 int id_;
64 63
65 DISALLOW_EVIL_CONSTRUCTORS(PluginStreamUrl); 64 DISALLOW_EVIL_CONSTRUCTORS(PluginStreamUrl);
66 }; 65 };
67 66
68 } // namespace NPAPI 67 } // namespace NPAPI
69 68
70 #endif // WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__ 69 #endif // WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__
OLDNEW
« 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