<webview> cleanup: Change self = this to bind(this) in web_view.js

chrome/renderer/resources/extensions/web_view_events.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.
 
 // Event management for WebViewInternal.
 
 var DeclarativeWebRequestSchema =
     requireNative('schema_registry').GetSchema('declarativeWebRequest');
 var EventBindings = require('event_bindings');
 var IdGenerator = requireNative('id_generator');
@@ skipping 153 matching lines @@
 };
 
 function DeclarativeWebRequestEvent(opt_eventName,
                                     opt_argSchemas,
                                     opt_eventOptions,
                                     opt_webViewInstanceId) {
   var subEventName = opt_eventName + '/' + IdGenerator.GetNextId();
   EventBindings.Event.call(this, subEventName, opt_argSchemas, opt_eventOptions,
       opt_webViewInstanceId);
 
-  var self = this;
   // TODO(lazyboy): When do we dispose this listener?
   WebRequestMessageEvent.addListener(function() {
     // Re-dispatch to subEvent's listeners.
-    $Function.apply(self.dispatch, self, $Array.slice(arguments));
-  }, {instanceId: opt_webViewInstanceId || 0});
+    $Function.apply(this.dispatch, this, $Array.slice(arguments));
+  }.bind(this), {instanceId: opt_webViewInstanceId || 0});
 }
 
 DeclarativeWebRequestEvent.prototype = {
   __proto__: EventBindings.Event.prototype
 };
 
 // Constructor.
 function WebViewEvents(webViewInternal, viewInstanceId) {
   this.webViewInternal = webViewInternal;
   this.viewInstanceId = viewInstanceId;
@@ skipping 19 matching lines @@
   }.bind(this), {instanceId: this.viewInstanceId});
 };
 
 WebViewEvents.prototype.setupPluginDestroyedEvent = function() {
   PluginDestroyedEvent.addListener(function(e) {
     this.webViewInternal.onPluginDestroyed();
   }.bind(this), {instanceId: this.viewInstanceId});
 };
 
 WebViewEvents.prototype.setupWebRequestEvents = function() {
-  var self = this;
   var request = {};
   var createWebRequestEvent = function(webRequestEvent) {
     return function() {
-      if (!self[webRequestEvent.name]) {
-        self[webRequestEvent.name] =
+      if (!this[webRequestEvent.name]) {
+        this[webRequestEvent.name] =
             new WebRequestEvent(
                 'webViewInternal.' + webRequestEvent.name,
                 webRequestEvent.parameters,
                 webRequestEvent.extraParameters, webRequestEvent.options,
-                self.viewInstanceId);
+                this.viewInstanceId);
       }
-      return self[webRequestEvent.name];
-    };
-  };
+      return this[webRequestEvent.name];
+    }.bind(this);
+  }.bind(this);
 
   var createDeclarativeWebRequestEvent = function(webRequestEvent) {
     return function() {
-      if (!self[webRequestEvent.name]) {
+      if (!this[webRequestEvent.name]) {
         // The onMessage event gets a special event type because we want
         // the listener to fire only for messages targeted for this particular
         // <webview>.
         var EventClass = webRequestEvent.name === 'onMessage' ?
             DeclarativeWebRequestEvent : EventBindings.Event;
-        self[webRequestEvent.name] =
+        this[webRequestEvent.name] =
             new EventClass(
                 'webViewInternal.' + webRequestEvent.name,
                 webRequestEvent.parameters,
                 webRequestEvent.options,
-                self.viewInstanceId);
+                this.viewInstanceId);
       }
-      return self[webRequestEvent.name];
-    };
-  };
+      return this[webRequestEvent.name];
+    }.bind(this);
+  }.bind(this);
 
   for (var i = 0; i < DeclarativeWebRequestSchema.events.length; ++i) {
     var eventSchema = DeclarativeWebRequestSchema.events[i];
     var webRequestEvent = createDeclarativeWebRequestEvent(eventSchema);
     Object.defineProperty(
         request,
         eventSchema.name,
         {
           get: webRequestEvent,
           enumerable: true
@@ skipping 19 matching lines @@
 
 WebViewEvents.prototype.getEvents = function() {
   var experimentalEvents = this.webViewInternal.maybeGetExperimentalEvents();
   for (var eventName in experimentalEvents) {
     WEB_VIEW_EVENTS[eventName] = experimentalEvents[eventName];
   }
   return WEB_VIEW_EVENTS;
 };
 
 WebViewEvents.prototype.setupEvent = function(name, info) {
-  var self = this;
   info.evt.addListener(function(e) {
     var details = {bubbles:true};
-    if (info.cancelable)
+    if (info.cancelable) {
       details.cancelable = true;
+    }
     var webViewEvent = new Event(name, details);
     $Array.forEach(info.fields, function(field) {
       if (e[field] !== undefined) {
         webViewEvent[field] = e[field];
       }
-    });
+    }.bind(this));
     if (info.customHandler) {
-      info.customHandler(self, e, webViewEvent);
+      info.customHandler(this, e, webViewEvent);
       return;
     }
-    self.webViewInternal.dispatchEvent(webViewEvent);
-  }, {instanceId: self.viewInstanceId});
+    this.webViewInternal.dispatchEvent(webViewEvent);
+  }.bind(this), {instanceId: this.viewInstanceId});
 
   this.webViewInternal.setupEventProperty(name);
 };
 
 
 // Event handlers.
 WebViewEvents.prototype.handleContextMenu = function(e, webViewEvent) {
   this.webViewInternal.maybeHandleContextMenu(e, webViewEvent);
 };
 
 WebViewEvents.prototype.handleDialogEvent = function(event, webViewEvent) {
   var showWarningMessage = function(dialogType) {
     var VOWELS = ['a', 'e', 'i', 'o', 'u'];
     var WARNING_MSG_DIALOG_BLOCKED = '<webview>: %1 %2 dialog was blocked.';
     var article = (VOWELS.indexOf(dialogType.charAt(0)) >= 0) ? 'An' : 'A';
     var output = WARNING_MSG_DIALOG_BLOCKED.replace('%1', article);
     output = output.replace('%2', dialogType);
     window.console.warn(output);
   };
 
-  var self = this;
   var requestId = event.requestId;
   var actionTaken = false;
 
   var validateCall = function() {
     var ERROR_MSG_DIALOG_ACTION_ALREADY_TAKEN = '<webview>: ' +
         'An action has already been taken for this "dialog" event.';
 
     if (actionTaken) {
       throw new Error(ERROR_MSG_DIALOG_ACTION_ALREADY_TAKEN);
     }
     actionTaken = true;
   };
 
   var getGuestInstanceId = function() {
-    return self.webViewInternal.getGuestInstanceId();
-  };
+    return this.webViewInternal.getGuestInstanceId();
+  }.bind(this);
 
   var dialog = {
     ok: function(user_input) {
       validateCall();
       user_input = user_input || '';
       WebView.setPermission(getGuestInstanceId(), requestId, 'allow',
                             user_input);
     },
     cancel: function() {
       validateCall();
       WebView.setPermission(getGuestInstanceId(), requestId, 'deny');
     }
   };
   webViewEvent.dialog = dialog;
 
-  var defaultPrevented = !self.webViewInternal.dispatchEvent(webViewEvent);
+  var defaultPrevented = !this.webViewInternal.dispatchEvent(webViewEvent);
   if (actionTaken) {
     return;
   }
 
   if (defaultPrevented) {
     // Tell the JavaScript garbage collector to track lifetime of |dialog| and
     // call back when the dialog object has been collected.
     MessagingNatives.BindToGC(dialog, function() {
       // Avoid showing a warning message if the decision has already been made.
       if (actionTaken) {
@@ skipping 47 matching lines @@
 
   var ERROR_MSG_WEBVIEW_EXPECTED = '<webview> element expected.';
 
   var showWarningMessage = function() {
     var WARNING_MSG_NEWWINDOW_BLOCKED = '<webview>: A new window was blocked.';
     window.console.warn(WARNING_MSG_NEWWINDOW_BLOCKED);
   };
 
   var requestId = event.requestId;
   var actionTaken = false;
-  var self = this;
   var getGuestInstanceId = function() {
-    return self.webViewInternal.getGuestInstanceId();
-  };
+    return this.webViewInternal.getGuestInstanceId();
+  }.bind(this);
 
   var validateCall = function () {
     if (actionTaken) {
       throw new Error(ERROR_MSG_NEWWINDOW_ACTION_ALREADY_TAKEN);
     }
     actionTaken = true;
   };
 
   var windowObj = {
     attach: function(webview) {
@@ skipping 25 matching lines @@
             getGuestInstanceId(), requestId, attached ? 'allow' : 'deny');
       }, 0);
     },
     discard: function() {
       validateCall();
       WebView.setPermission(getGuestInstanceId(), requestId, 'deny');
     }
   };
   webViewEvent.window = windowObj;
 
-  var defaultPrevented = !self.webViewInternal.dispatchEvent(webViewEvent);
+  var defaultPrevented = !this.webViewInternal.dispatchEvent(webViewEvent);
   if (actionTaken) {
     return;
   }
 
   if (defaultPrevented) {
     // Make browser plugin track lifetime of |windowObj|.
     MessagingNatives.BindToGC(windowObj, function() {
       // Avoid showing a warning message if the decision has already been made.
       if (actionTaken) {
         return;
@@ skipping 37 matching lines @@
       'Permission has already been decided for this "permissionrequest" event.';
 
   var showWarningMessage = function(permission) {
     var WARNING_MSG_PERMISSION_DENIED = '<webview>: ' +
         'The permission request for "%1" has been denied.';
     window.console.warn(
         WARNING_MSG_PERMISSION_DENIED.replace('%1', permission));
   };
 
   var requestId = event.requestId;
-  var self = this;
   var getGuestInstanceId = function() {
-    return self.webViewInternal.getGuestInstanceId();
-  };
+    return this.webViewInternal.getGuestInstanceId();
+  }.bind(this);
 
   if (this.getPermissionTypes().indexOf(event.permission) < 0) {
     // The permission type is not allowed. Trigger the default response.
     WebView.setPermission(
         getGuestInstanceId(), requestId, 'default', '', function(allowed) {
       if (allowed) {
         return;
       }
       showWarningMessage(event.permission);
     });
@@ skipping 14 matching lines @@
       validateCall();
       WebView.setPermission(getGuestInstanceId(), requestId, 'allow');
     },
     deny: function() {
       validateCall();
       WebView.setPermission(getGuestInstanceId(), requestId, 'deny');
     }
   };
   webViewEvent.request = request;
 
-  var defaultPrevented = !self.webViewInternal.dispatchEvent(webViewEvent);
+  var defaultPrevented = !this.webViewInternal.dispatchEvent(webViewEvent);
   if (decisionMade) {
     return;
   }
 
   if (defaultPrevented) {
     // Make browser plugin track lifetime of |request|.
     MessagingNatives.BindToGC(request, function() {
       // Avoid showing a warning message if the decision has already been made.
       if (decisionMade) {
         return;
@@ skipping 19 matching lines @@
   }
 };
 
 WebViewEvents.prototype.handleSizeChangedEvent = function(
     event, webViewEvent) {
   this.webViewInternal.onSizeChanged(webViewEvent);
 };
 
 exports.WebViewEvents = WebViewEvents;
 exports.CreateEvent = CreateEvent;