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

Side by Side Diff: content/browser/browser_plugin/browser_plugin_guest.h

Issue 1410753003: Update IPC browser_plugin_instance_id before sending queued messages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move computation outside CHECK(). Created 5 years, 2 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
« no previous file with comments | « no previous file | content/browser/browser_plugin/browser_plugin_guest.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 // A BrowserPluginGuest is the browser side of a browser <--> embedder 5 // A BrowserPluginGuest is the browser side of a browser <--> embedder
6 // renderer channel. A BrowserPlugin (a WebPlugin) is on the embedder 6 // renderer channel. A BrowserPlugin (a WebPlugin) is on the embedder
7 // renderer side of browser <--> embedder renderer communication. 7 // renderer side of browser <--> embedder renderer communication.
8 // 8 //
9 // BrowserPluginGuest lives on the UI thread of the browser process. Any 9 // BrowserPluginGuest lives on the UI thread of the browser process. Any
10 // messages about the guest render process that the embedder might be interested 10 // messages about the guest render process that the embedder might be interested
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 void OnShowWidget(int route_id, const gfx::Rect& initial_rect); 379 void OnShowWidget(int route_id, const gfx::Rect& initial_rect);
380 void OnTakeFocus(bool reverse); 380 void OnTakeFocus(bool reverse);
381 void OnUpdateFrameName(int frame_id, 381 void OnUpdateFrameName(int frame_id,
382 bool is_top_level, 382 bool is_top_level,
383 const std::string& name); 383 const std::string& name);
384 384
385 // Called when WillAttach is complete. 385 // Called when WillAttach is complete.
386 void OnWillAttachComplete(WebContentsImpl* embedder_web_contents, 386 void OnWillAttachComplete(WebContentsImpl* embedder_web_contents,
387 const BrowserPluginHostMsg_Attach_Params& params); 387 const BrowserPluginHostMsg_Attach_Params& params);
388 388
389 // Returns identical message with current browser_plugin_instance_id() if
390 // the input was created with browser_plugin::kInstanceIdNone, else it returns
391 // the input message unmodified. If no current browser_plugin_instance_id()
392 // is set, or anything goes wrong, the input message is returned.
393 IPC::Message* UpdateInstanceIdIfNecessary(IPC::Message* msg) const;
394
389 // Forwards all messages from the |pending_messages_| queue to the embedder. 395 // Forwards all messages from the |pending_messages_| queue to the embedder.
390 void SendQueuedMessages(); 396 void SendQueuedMessages();
391 397
392 void SendTextInputTypeChangedToView(RenderWidgetHostViewBase* guest_rwhv); 398 void SendTextInputTypeChangedToView(RenderWidgetHostViewBase* guest_rwhv);
393 399
394 // The last tooltip that was set with SetTooltipText(). 400 // The last tooltip that was set with SetTooltipText().
395 base::string16 current_tooltip_text_; 401 base::string16 current_tooltip_text_;
396 402
397 scoped_ptr<EmbedderVisibilityObserver> embedder_visibility_observer_; 403 scoped_ptr<EmbedderVisibilityObserver> embedder_visibility_observer_;
398 WebContentsImpl* owner_web_contents_; 404 WebContentsImpl* owner_web_contents_;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 // Weak pointer used to ask GeolocationPermissionContext about geolocation 472 // Weak pointer used to ask GeolocationPermissionContext about geolocation
467 // permission. 473 // permission.
468 base::WeakPtrFactory<BrowserPluginGuest> weak_ptr_factory_; 474 base::WeakPtrFactory<BrowserPluginGuest> weak_ptr_factory_;
469 475
470 DISALLOW_COPY_AND_ASSIGN(BrowserPluginGuest); 476 DISALLOW_COPY_AND_ASSIGN(BrowserPluginGuest);
471 }; 477 };
472 478
473 } // namespace content 479 } // namespace content
474 480
475 #endif // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_ 481 #endif // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_plugin/browser_plugin_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698