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

Unified Diff: content/renderer/java/java_bridge_dispatcher.h

Issue 8834013: Fix a race condition in the Java Bridge when adding objects (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits Created 9 years 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/java/java_bridge_dispatcher.h
diff --git a/content/renderer/java/java_bridge_dispatcher.h b/content/renderer/java/java_bridge_dispatcher.h
index 73599517e459703b0b67ed377267ef3ea5a36ca9..a7d877efa288931988479e1f70e259b962421ab8 100644
--- a/content/renderer/java/java_bridge_dispatcher.h
+++ b/content/renderer/java/java_bridge_dispatcher.h
@@ -19,8 +19,7 @@ class JavaBridgeChannel;
// again.
class JavaBridgeDispatcher : public content::RenderViewObserver {
public:
- JavaBridgeDispatcher(content::RenderView* render_view,
- const IPC::ChannelHandle& channel_handle);
+ JavaBridgeDispatcher(content::RenderView* render_view);
virtual ~JavaBridgeDispatcher();
private:
@@ -33,6 +32,8 @@ class JavaBridgeDispatcher : public content::RenderViewObserver {
const NPVariant_Param& variant_param);
void OnRemoveNamedObject(const string16& name);
+ void EnsureChannelIsSetUp();
+
// Objects that will be bound to the window when the window object is next
// cleared. We hold a ref to these.
typedef std::map<string16, NPVariant> ObjectMap;

Powered by Google App Engine
This is Rietveld 408576698