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

Side by Side Diff: chrome/renderer/webplugin_delegate_proxy.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 | « chrome/plugin/webplugin_proxy.cc ('k') | chrome/renderer/webplugin_delegate_proxy.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:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/renderer/webplugin_delegate_proxy.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 CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__ 5 #ifndef CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__
6 #define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__ 6 #define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 void OnSetDropEffect(const NPVariant_Param& event, int effect, 136 void OnSetDropEffect(const NPVariant_Param& event, int effect,
137 bool* success); 137 bool* success);
138 void OnMissingPluginStatus(int status); 138 void OnMissingPluginStatus(int status);
139 void OnGetCPBrowsingContext(uint32* context); 139 void OnGetCPBrowsingContext(uint32* context);
140 void OnCancelDocumentLoad(); 140 void OnCancelDocumentLoad();
141 void OnInitiateHTTPRangeRequest(const std::string& url, 141 void OnInitiateHTTPRangeRequest(const std::string& url,
142 const std::string& range_info, 142 const std::string& range_info,
143 intptr_t existing_stream, 143 intptr_t existing_stream,
144 bool notify_needed, 144 bool notify_needed,
145 intptr_t notify_data); 145 intptr_t notify_data);
146 void OnDeferResourceLoading(int resource_id, bool defer);
146 147
147 // Draw a graphic indicating a crashed plugin. 148 // Draw a graphic indicating a crashed plugin.
148 void PaintSadPlugin(gfx::NativeDrawingContext context, const gfx::Rect& rect); 149 void PaintSadPlugin(gfx::NativeDrawingContext context, const gfx::Rect& rect);
149 150
150 // Returns true if the given rectangle is different in the native drawing 151 // Returns true if the given rectangle is different in the native drawing
151 // context and the current background bitmap. 152 // context and the current background bitmap.
152 bool BackgroundChanged(gfx::NativeDrawingContext context, 153 bool BackgroundChanged(gfx::NativeDrawingContext context,
153 const gfx::Rect& rect); 154 const gfx::Rect& rect);
154 155
155 // Copies the given rectangle from the transport bitmap to the backing store. 156 // Copies the given rectangle from the transport bitmap to the backing store.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 // This lets us know which portion of the backing store has been painted into. 202 // This lets us know which portion of the backing store has been painted into.
202 gfx::Rect backing_store_painted_; 203 gfx::Rect backing_store_painted_;
203 204
204 // The url of the main frame hosting the plugin. 205 // The url of the main frame hosting the plugin.
205 GURL page_url_; 206 GURL page_url_;
206 207
207 DISALLOW_EVIL_CONSTRUCTORS(WebPluginDelegateProxy); 208 DISALLOW_EVIL_CONSTRUCTORS(WebPluginDelegateProxy);
208 }; 209 };
209 210
210 #endif // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_ 211 #endif // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
OLDNEW
« no previous file with comments | « chrome/plugin/webplugin_proxy.cc ('k') | chrome/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698