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

Unified Diff: content/renderer/browser_plugin/browser_plugin.h

Issue 11368071: browser-plugin: Remove event handling code, and use CustomEvents in webkit instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 8 years, 1 month 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/browser_plugin/browser_plugin.h
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index fc544af0b9aff1a82b0a6f1d0b9e8d195bdc8e36..1ac030a67af07862e3e9345a04923b7940a40d6d 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -114,15 +114,6 @@ class CONTENT_EXPORT BrowserPlugin :
// touch events.
void SetAcceptTouchEvents(bool accept);
- // Indicates whether there are any Javascript listeners attached to a
- // provided event_name.
- bool HasListeners(const std::string& event_name);
- // Add a custom event listener to this BrowserPlugin instance.
- bool AddEventListener(const std::string& event_name,
- v8::Local<v8::Function> function);
- // Remove a custom event listener from this BrowserPlugin instance.
- bool RemoveEventListener(const std::string& event_name,
- v8::Local<v8::Function> function);
// Tells the BrowserPlugin to tell the guest to navigate to the previous
// navigation entry in the navigation history.
void Back();
@@ -225,9 +216,10 @@ class CONTENT_EXPORT BrowserPlugin :
// Returns whether |event_name| is a valid event.
bool IsValidEvent(const std::string& event_name);
- // Triggers the event-listeners for |event_name|.
+ // Triggers the event-listeners for |event_name|. Note that the function
+ // frees all the values in |props|.
void TriggerEvent(const std::string& event_name,
- v8::Local<v8::Object>* event);
+ std::map<std::string, base::Value*>* props);
// Creates and maps transport dib. Overridden in tests.
virtual TransportDIB* CreateTransportDIB(const size_t size);
@@ -273,10 +265,6 @@ class CONTENT_EXPORT BrowserPlugin :
// Tracks the visibility of the browser plugin regardless of the whole
// embedder RenderView's visibility.
bool visible_;
- typedef std::vector<v8::Local<v8::Function> > EventListenersLocal;
- typedef std::vector<v8::Persistent<v8::Function> > EventListeners;
- typedef std::map<std::string, EventListeners> EventListenerMap;
- EventListenerMap event_listener_map_;
// Important: Do not add more history state here.
// We strongly discourage storing additional history state (such as page IDs)
// in the embedder process, at the risk of having incorrect information that

Powered by Google App Engine
This is Rietveld 408576698