Sanitize inheritance in callers of utils.expose

chrome/renderer/resources/extensions/web_view/chrome_web_view.js

 // Copyright 2014 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.
 
 // This module implements chrome-specific <webview> API.
 // See web_view_api_methods.js for details.
 
 var ChromeWebView = require('chromeWebViewInternal').ChromeWebView;
 var ChromeWebViewSchema =
     requireNative('schema_registry').GetSchema('chromeWebViewInternal');
@@ skipping 19 matching lines @@
 
 // -----------------------------------------------------------------------------
 // ContextMenusOnClickedEvent object.
 
 // This event is exposed as <webview>.contextMenus.onClicked.
 function ContextMenusOnClickedEvent(webViewInstanceId,
                                     opt_eventName,
                                     opt_argSchemas,
                                     opt_eventOptions) {
   var subEventName = GetUniqueSubEventName(opt_eventName);
-  EventBindings.Event.call(this,
-                           subEventName,
-                           opt_argSchemas,
-                           opt_eventOptions,
-                           webViewInstanceId);
+  $Function.call(EventBindings.Event, this,
+      subEventName, opt_argSchemas, opt_eventOptions, webViewInstanceId);

[Devlin, 2016/04/26 22:41:25]

nit: prefer to line these params up (multiple lines is fine, but same
indentation for arguments)

[robwu, 2016/04/26 23:14:33]

Done.

 
   var view = GuestViewInternalNatives.GetViewFromID(webViewInstanceId);
   if (!view) {
     return;
   }
   view.events.addScopedListener(ContextMenusEvent, function() {
     // Re-dispatch to subEvent's listeners.
     $Function.apply(this.dispatch, this, $Array.slice(arguments));
   }.bind(this), {instanceId: webViewInstanceId});
 }
+$Object.setPrototypeOf(
+    ContextMenusOnClickedEvent.prototype, EventBindings.Event.prototype);
 
-ContextMenusOnClickedEvent.prototype.__proto__ = EventBindings.Event.prototype;
-
+// This event is exposed as <webview>.contextMenus.onShow.
 function ContextMenusOnContextMenuEvent(webViewInstanceId,
                                         opt_eventName,
                                         opt_argSchemas,
                                         opt_eventOptions) {
   var subEventName = GetUniqueSubEventName(opt_eventName);
-  EventBindings.Event.call(this,
-                           subEventName,
-                           opt_argSchemas,
-                           opt_eventOptions,
-                           webViewInstanceId);
+  $Function.call(EventBindings.Event, this,
+      subEventName, opt_argSchemas, opt_eventOptions, webViewInstanceId);
 
   var view = GuestViewInternalNatives.GetViewFromID(webViewInstanceId);
   if (!view) {
     return;
   }
   view.events.addScopedListener(ContextMenusHandlerEvent, function(e) {
     var defaultPrevented = false;
     var event = {
       'preventDefault': function() { defaultPrevented = true; }
     };
 
     // Re-dispatch to subEvent's listeners.
     $Function.apply(this.dispatch, this, [event]);
 
     if (!defaultPrevented) {
       // TODO(lazyboy): Remove |items| parameter completely from
       // ChromeWebView.showContextMenu as we don't do anything useful with it
       // currently.
       var items = [];
       var guestInstanceId = GuestViewInternalNatives.
           GetViewFromID(webViewInstanceId).guest.getId();
       ChromeWebView.showContextMenu(guestInstanceId, e.requestId, items);
     }
   }.bind(this), {instanceId: webViewInstanceId});
 }
 
-ContextMenusOnContextMenuEvent.prototype.__proto__ =
-    EventBindings.Event.prototype;
+$Object.setPrototypeOf(
+    ContextMenusOnContextMenuEvent.prototype, EventBindings.Event.prototype);
 
 // -----------------------------------------------------------------------------
 // WebViewContextMenusImpl object.
 
 // An instance of this class is exposed as <webview>.contextMenus.
 function WebViewContextMenusImpl(viewInstanceId) {
   this.viewInstanceId_ = viewInstanceId;
 }
+$Object.setPrototypeOf(WebViewContextMenusImpl, null);
+$Object.setPrototypeOf(WebViewContextMenusImpl.prototype, null);
 
 WebViewContextMenusImpl.prototype.create = function() {
   var args = $Array.concat([this.viewInstanceId_], $Array.slice(arguments));
   return $Function.apply(ChromeWebView.contextMenusCreate, null, args);
 };
 
 WebViewContextMenusImpl.prototype.remove = function() {
   var args = $Array.concat([this.viewInstanceId_], $Array.slice(arguments));
   return $Function.apply(ChromeWebView.contextMenusRemove, null, args);
 };
@@ skipping 67 matching lines @@
             get: this.weakWrapper(function() {
               return this.contextMenusOnContextMenuEvent_;
             }),
             enumerable: true
           });
       return this.contextMenus_;
     });
   }.bind(this);
 
   // Expose <webview>.contextMenus object.
-  // TODO(lazyboy): Add documentation for contextMenus:
-  // http://crbug.com/470979.
   $Object.defineProperty(
       this.element,
       'contextMenus',
       {
         get: createContextMenus(),
         enumerable: true
       });
 };
 
 function GetUniqueSubEventName(eventName) {
   return eventName + '/' + idGeneratorNatives.GetNextId();
 }