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

Side by Side Diff: chrome/renderer/webplugin_delegate_proxy.h

Issue 119200: Fixes a flash plugin hang caused by opening google finance ticker symbols in ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 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/renderer/render_widget.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')
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 30 matching lines...) Expand all
41 const std::string& mime_type, 41 const std::string& mime_type,
42 const std::string& clsid, 42 const std::string& clsid,
43 RenderView* render_view); 43 RenderView* render_view);
44 44
45 // Called to drop our back-pointer to the containing RenderView. 45 // Called to drop our back-pointer to the containing RenderView.
46 void DropRenderView() { render_view_ = NULL; } 46 void DropRenderView() { render_view_ = NULL; }
47 47
48 // Called to drop our pointer to the window script object. 48 // Called to drop our pointer to the window script object.
49 void DropWindowScriptObject() { window_script_object_ = NULL; } 49 void DropWindowScriptObject() { window_script_object_ = NULL; }
50 50
51 // Called to flush any deferred geometry changes to the plugin process.
52 virtual void FlushGeometryUpdates();
53
54 // WebPluginDelegate implementation: 51 // WebPluginDelegate implementation:
55 virtual void PluginDestroyed(); 52 virtual void PluginDestroyed();
56 virtual bool Initialize(const GURL& url, char** argn, char** argv, int argc, 53 virtual bool Initialize(const GURL& url, char** argn, char** argv, int argc,
57 WebPlugin* plugin, bool load_manually); 54 WebPlugin* plugin, bool load_manually);
58 virtual void UpdateGeometry(const gfx::Rect& window_rect, 55 virtual void UpdateGeometry(const gfx::Rect& window_rect,
59 const gfx::Rect& clip_rect); 56 const gfx::Rect& clip_rect);
60 virtual void Paint(gfx::NativeDrawingContext context, const gfx::Rect& rect); 57 virtual void Paint(gfx::NativeDrawingContext context, const gfx::Rect& rect);
61 virtual void Print(gfx::NativeDrawingContext context); 58 virtual void Print(gfx::NativeDrawingContext context);
62 virtual NPObject* GetPluginScriptableObject(); 59 virtual NPObject* GetPluginScriptableObject();
63 virtual void DidFinishLoadWithReason(NPReason reason); 60 virtual void DidFinishLoadWithReason(NPReason reason);
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 RenderView* render_view_; 164 RenderView* render_view_;
168 WebPlugin* plugin_; 165 WebPlugin* plugin_;
169 bool windowless_; 166 bool windowless_;
170 scoped_refptr<PluginChannelHost> channel_host_; 167 scoped_refptr<PluginChannelHost> channel_host_;
171 std::string mime_type_; 168 std::string mime_type_;
172 std::string clsid_; 169 std::string clsid_;
173 int instance_id_; 170 int instance_id_;
174 FilePath plugin_path_; 171 FilePath plugin_path_;
175 172
176 gfx::Rect plugin_rect_; 173 gfx::Rect plugin_rect_;
177 gfx::Rect deferred_clip_rect_;
178 bool send_deferred_update_geometry_;
179 174
180 NPObject* npobject_; 175 NPObject* npobject_;
181 NPObjectStub* window_script_object_; 176 NPObjectStub* window_script_object_;
182 177
183 // Event passed in by the plugin process and is used to decide if 178 // Event passed in by the plugin process and is used to decide if
184 // messages need to be pumped in the NPP_HandleEvent sync call. 179 // messages need to be pumped in the NPP_HandleEvent sync call.
185 scoped_ptr<base::WaitableEvent> modal_loop_pump_messages_event_; 180 scoped_ptr<base::WaitableEvent> modal_loop_pump_messages_event_;
186 181
187 // Bitmap for crashed plugin 182 // Bitmap for crashed plugin
188 SkBitmap* sad_plugin_; 183 SkBitmap* sad_plugin_;
(...skipping 13 matching lines...) Expand all
202 scoped_ptr<skia::PlatformCanvas> transport_store_canvas_; 197 scoped_ptr<skia::PlatformCanvas> transport_store_canvas_;
203 scoped_ptr<base::SharedMemory> background_store_; 198 scoped_ptr<base::SharedMemory> background_store_;
204 scoped_ptr<skia::PlatformCanvas> background_store_canvas_; 199 scoped_ptr<skia::PlatformCanvas> background_store_canvas_;
205 // This lets us know which portion of the backing store has been painted into. 200 // This lets us know which portion of the backing store has been painted into.
206 gfx::Rect backing_store_painted_; 201 gfx::Rect backing_store_painted_;
207 202
208 DISALLOW_EVIL_CONSTRUCTORS(WebPluginDelegateProxy); 203 DISALLOW_EVIL_CONSTRUCTORS(WebPluginDelegateProxy);
209 }; 204 };
210 205
211 #endif // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_ 206 #endif // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
OLDNEW
« no previous file with comments | « chrome/renderer/render_widget.cc ('k') | chrome/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698