Revert 151420 - Add documentation for filtered events.

chrome/renderer/resources/extensions/event.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
   var DCHECK = requireNative('logging').DCHECK;
   var eventBindingsNatives = requireNative('event_bindings');
   var AttachEvent = eventBindingsNatives.AttachEvent;
   var DetachEvent = eventBindingsNatives.DetachEvent;
   var AttachFilteredEvent = eventBindingsNatives.AttachFilteredEvent;
   var DetachFilteredEvent = eventBindingsNatives.DetachFilteredEvent;
@@ skipping 140 matching lines @@
       this.detachListener(this.listenerMap_[i], manual);
   };
 
   FilteredAttachmentStrategy.prototype.getListenersByIDs = function(ids) {
     var result = [];
     for (var i = 0; i < ids.length; i++)
       result.push(this.listenerMap_[ids[i]]);
     return result;
   };
 
-  // Adds keys in |src| that aren't present in |dest| to |dest|.
-  function merge(dest, src) {
-    for (var k in src) {
-      if (!dest.hasOwnProperty(k)) {
-        dest[k] = src[k];
-      }
-    }
-  }
-
   // Event object.  If opt_eventName is provided, this object represents
   // the unique instance of that named event, and dispatching an event
   // with that name will route through this object's listeners. Note that
   // opt_eventName is required for events that support rules.
   //
   // Example:
   //   chrome.tabs.onChanged = new chrome.Event("tab-changed");
   //   chrome.tabs.onChanged.addListener(function(data) { alert(data); });
   //   chromeHidden.Event.dispatch("tab-changed", "hi");
   // will result in an alert dialog that says 'hi'.
   //
   // If opt_eventOptions exists, it is a dictionary that contains the boolean
   // entries "supportsListeners" and "supportsRules".
   chrome.Event = function(opt_eventName, opt_argSchemas, opt_eventOptions) {
     this.eventName_ = opt_eventName;
     this.listeners_ = [];
-    this.eventOptions_ = opt_eventOptions || {};
-    merge(this.eventOptions_,
+    this.eventOptions_ = opt_eventOptions ||
         {supportsFilters: false,
          supportsListeners: true,
          supportsRules: false,
-        });
+        };
 
     if (this.eventOptions_.supportsRules && !opt_eventName)
       throw new Error("Events that support rules require an event name.");
 
     if (this.eventOptions_.supportsFilters) {
       this.attachmentStrategy_ = new FilteredAttachmentStrategy(this);
     } else {
       this.attachmentStrategy_ = new UnfilteredAttachmentStrategy(this);
     }
 
@@ skipping 277 matching lines @@
       if (event)
         event.detach_();
     }
   };
 
   chromeHidden.dispatchError = function(msg) {
     console.error(msg);
   };
 
   exports.Event = chrome.Event;