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

Side by Side Diff: content/renderer/browser_plugin/browser_plugin.h

Issue 529203002: BrowserPlugin: Remove dependency upon ViewHostMsg_UpdateRect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unnecessary browsertest (there's a webview resize test) and IPC Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ 5 #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
6 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ 6 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
7 7
8 #include "third_party/WebKit/public/web/WebPlugin.h" 8 #include "third_party/WebKit/public/web/WebPlugin.h"
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 void OnCopyFromCompositingSurface(int instance_id, 194 void OnCopyFromCompositingSurface(int instance_id,
195 int request_id, 195 int request_id,
196 gfx::Rect source_rect, 196 gfx::Rect source_rect,
197 gfx::Size dest_size); 197 gfx::Size dest_size);
198 void OnGuestContentWindowReady(int instance_id, 198 void OnGuestContentWindowReady(int instance_id,
199 int content_window_routing_id); 199 int content_window_routing_id);
200 void OnGuestGone(int instance_id); 200 void OnGuestGone(int instance_id);
201 void OnSetCursor(int instance_id, const WebCursor& cursor); 201 void OnSetCursor(int instance_id, const WebCursor& cursor);
202 void OnSetMouseLock(int instance_id, bool enable); 202 void OnSetMouseLock(int instance_id, bool enable);
203 void OnShouldAcceptTouchEvents(int instance_id, bool accept); 203 void OnShouldAcceptTouchEvents(int instance_id, bool accept);
204 void OnUpdateRect(int instance_id,
205 const BrowserPluginMsg_UpdateRect_Params& params);
206 204
207 // This indicates whether this BrowserPlugin has been attached to a 205 // This indicates whether this BrowserPlugin has been attached to a
208 // WebContents. 206 // WebContents.
209 bool attached_; 207 bool attached_;
210 bool attach_pending_; 208 bool attach_pending_;
211 const base::WeakPtr<RenderViewImpl> render_view_; 209 const base::WeakPtr<RenderViewImpl> render_view_;
212 // We cache the |render_view_|'s routing ID because we need it on destruction. 210 // We cache the |render_view_|'s routing ID because we need it on destruction.
213 // If the |render_view_| is destroyed before the BrowserPlugin is destroyed 211 // If the |render_view_| is destroyed before the BrowserPlugin is destroyed
214 // then we will attempt to access a NULL pointer. 212 // then we will attempt to access a NULL pointer.
215 const int render_view_routing_id_; 213 const int render_view_routing_id_;
216 blink::WebPluginContainer* container_; 214 blink::WebPluginContainer* container_;
217 scoped_ptr<BrowserPluginBindings> bindings_; 215 scoped_ptr<BrowserPluginBindings> bindings_;
218 bool paint_ack_received_;
219 gfx::Rect plugin_rect_; 216 gfx::Rect plugin_rect_;
220 float last_device_scale_factor_; 217 float last_device_scale_factor_;
221 // Bitmap for crashed plugin. Lazily initialized, non-owning pointer. 218 // Bitmap for crashed plugin. Lazily initialized, non-owning pointer.
222 SkBitmap* sad_guest_; 219 SkBitmap* sad_guest_;
223 bool guest_crashed_; 220 bool guest_crashed_;
224 int content_window_routing_id_; 221 int content_window_routing_id_;
225 bool plugin_focused_; 222 bool plugin_focused_;
226 // Tracks the visibility of the browser plugin regardless of the whole 223 // Tracks the visibility of the browser plugin regardless of the whole
227 // embedder RenderView's visibility. 224 // embedder RenderView's visibility.
228 bool visible_; 225 bool visible_;
(...skipping 25 matching lines...) Expand all
254 // Weak factory used in v8 |MakeWeak| callback, since the v8 callback might 251 // Weak factory used in v8 |MakeWeak| callback, since the v8 callback might
255 // get called after BrowserPlugin has been destroyed. 252 // get called after BrowserPlugin has been destroyed.
256 base::WeakPtrFactory<BrowserPlugin> weak_ptr_factory_; 253 base::WeakPtrFactory<BrowserPlugin> weak_ptr_factory_;
257 254
258 DISALLOW_COPY_AND_ASSIGN(BrowserPlugin); 255 DISALLOW_COPY_AND_ASSIGN(BrowserPlugin);
259 }; 256 };
260 257
261 } // namespace content 258 } // namespace content
262 259
263 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ 260 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
OLDNEW
« no previous file with comments | « content/common/browser_plugin/browser_plugin_messages.h ('k') | content/renderer/browser_plugin/browser_plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698