No-op code cleanups in safari-driver.

(Following adding templating to HTML5 MessageEvent extern.)
SeleniumHQ · Sep 12, 2014 · 467316d · 467316d
1 parent d53e906
commit 467316d
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 23 deletions.
diff --git a/javascript/safari-driver/extension/server.js b/javascript/safari-driver/extension/server.js
@@ -14,12 +14,12 @@
 // limitations under the License.
 
 goog.provide('safaridriver.extension.Server');
+goog.provide('safaridriver.extension.Server.CommandHandler');
 
 goog.require('bot.ErrorCode');
 goog.require('bot.response');
 goog.require('goog.Disposable');
 goog.require('goog.log');
-goog.require('goog.object');
 goog.require('goog.string');
 goog.require('safaridriver.Command');
 goog.require('safaridriver.alert');
@@ -154,7 +154,7 @@ map[CommandName.SCREENSHOT] = commands.takeScreenshot;
 map[CommandName.ACCEPT_ALERT] = commands.handleNoAlertsPresent;
 map[CommandName.DISMISS_ALERT] = commands.handleNoAlertsPresent;
 map[CommandName.GET_ALERT_TEXT] = commands.handleNoAlertsPresent;
-map[CommandName.SET_ALERT_TEXT] = commands.handleNoAlertsPresent
+map[CommandName.SET_ALERT_TEXT] = commands.handleNoAlertsPresent;
 
 map[CommandName.GET_AVAILABLE_LOG_TYPES] = commands.getAvailableLogTypes;
 map[CommandName.GET_LOG] = commands.getLogs;
@@ -404,7 +404,7 @@ safaridriver.extension.Server.prototype.onClose_ = function(url) {
 
 /**
  * Called when there is a communication error with the WebSocket.
- * @param {!MessageEvent} event The error event.
+ * @param {!MessageEvent.<*>} event The error event.
  * @private
  */
 safaridriver.extension.Server.prototype.onError_ = function(event) {
@@ -415,7 +415,7 @@ safaridriver.extension.Server.prototype.onError_ = function(event) {
 
 /**
  * Called when the WebSocket receives a message.
- * @param {!MessageEvent} event The message event.
+ * @param {!MessageEvent.<*>} event The message event.
  * @private
  */
 safaridriver.extension.Server.prototype.onMessage_ = function(event) {

diff --git a/javascript/safari-driver/inject/inject.js b/javascript/safari-driver/inject/inject.js
@@ -63,7 +63,7 @@ goog.exportSymbol('init', safaridriver.inject.init);
 /**
  * Forwards connection requests from the content page to the extension.
  * @param {!safaridriver.message.Message} message The connect message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @private
  */
 safaridriver.inject.onConnect_ = function(message, e) {
@@ -81,7 +81,7 @@ safaridriver.inject.onConnect_ = function(message, e) {
 
 /**
  * @param {!safaridriver.inject.message.Encode} message The message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @private
  */
 safaridriver.inject.onEncode_ = function(message, e) {

diff --git a/javascript/safari-driver/inject/message/message.js b/javascript/safari-driver/inject/message/message.js
@@ -24,7 +24,7 @@ goog.provide('safaridriver.inject.message');
  * Checks whether the given message event originated from the DOMWindow running
  * this script. These messages are exchanged between the injected script and its
  * corresponding content page.
- * @param {!MessageEvent} e The message event to check.
+ * @param {!MessageEvent.<*>} e The message event to check.
  * @return {boolean} Whether the message came from this window.
  */
 safaridriver.inject.message.isFromSelf = function(e) {
@@ -35,7 +35,7 @@ safaridriver.inject.message.isFromSelf = function(e) {
 /**
  * Checks whether the given message event was sent by a frame belonging to the
  * same browser window as this script's context.
- * @param {!MessageEvent} e The message event to check.
+ * @param {!MessageEvent.<*>} e The message event to check.
  * @return {boolean} Whether the message came from a frame belonging to this
  *     browser window.
  */
@@ -46,7 +46,7 @@ safaridriver.inject.message.isFromFrame = function(e) {
 
 /**
  * Checks whether the given message event was sent by the top most window.
- * @param {!MessageEvent} e The message event to check.
+ * @param {!MessageEvent.<*>} e The message event to check.
  * @return {boolean} Whether the message came from the topmost frame.
  */
 safaridriver.inject.message.isFromTop = function(e) {

diff --git a/javascript/safari-driver/inject/page/page.js b/javascript/safari-driver/inject/page/page.js
@@ -238,7 +238,7 @@ safaridriver.inject.page.sendAlert_ = function(dialog, var_args) {
 /**
  * Handles command messages from the injected script.
  * @param {!safaridriver.message.Command} message The command message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @throws {Error} If the command is not supported by this script.
  * @private
  */

diff --git a/javascript/safari-driver/inject/tab.js b/javascript/safari-driver/inject/tab.js
@@ -26,6 +26,7 @@ goog.require('bot.inject');
 goog.require('bot.json');
 goog.require('bot.response');
 goog.require('goog.asserts');
+goog.require('goog.dom');
 goog.require('goog.object');
 goog.require('safaridriver.Command');
 goog.require('safaridriver.Tab');
@@ -236,7 +237,7 @@ safaridriver.inject.Tab.prototype.init = function() {
 
 /**
  * @param {!safaridriver.message.Log} message The log message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @private
  */
 safaridriver.inject.Tab.prototype.onLogMessage_ = function(message, e) {
@@ -248,7 +249,7 @@ safaridriver.inject.Tab.prototype.onLogMessage_ = function(message, e) {
 
 /**
  * @param {!safaridriver.message.Alert} message The alert message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @private
  */
 safaridriver.inject.Tab.prototype.onAlert_ = function(message, e) {
@@ -279,7 +280,7 @@ safaridriver.inject.Tab.prototype.onAlert_ = function(message, e) {
 
 /**
  * @param {!safaridriver.message.LoadModule} message The alert message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @private
  */
 safaridriver.inject.Tab.prototype.onLoadModule_ = function(message, e) {
@@ -294,7 +295,7 @@ safaridriver.inject.Tab.prototype.onLoadModule_ = function(message, e) {
 /**
  * Responds to an activate message sent from another frame in this window.
  * @param {!safaridriver.inject.message.Activate} message The activate message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @private
  */
 safaridriver.inject.Tab.prototype.onActivate_ = function(message, e) {
@@ -324,7 +325,7 @@ safaridriver.inject.Tab.prototype.onActivate_ = function(message, e) {
  * start handling command messages.
  * @param {!safaridriver.inject.message.ActivateFrame} message The activate
  *     message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @private
  */
 safaridriver.inject.Tab.prototype.onActivateFrame_ = function(message, e) {
@@ -341,7 +342,7 @@ safaridriver.inject.Tab.prototype.onActivateFrame_ = function(message, e) {
 
 /**
  * @param {!safaridriver.message.Message} message The activate message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @private
  */
 safaridriver.inject.Tab.prototype.onReactivateFrame_ = function(message, e) {
@@ -368,7 +369,7 @@ safaridriver.inject.Tab.prototype.onReactivateFrame_ = function(message, e) {
 /**
  * Responds to load messages.
  * @param {!safaridriver.message.Message} message The message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @private
  */
 safaridriver.inject.Tab.prototype.onLoad_ = function(message, e) {
@@ -496,7 +497,7 @@ safaridriver.inject.Tab.prototype.checkFrame_ = function() {
 
 /**
  * @param {!safaridriver.message.Command} message The command message.
- * @param {!MessageEvent} e The original message event.
+ * @param {!MessageEvent.<*>} e The original message event.
  * @private
  */
 safaridriver.inject.Tab.prototype.onFrameCommand_ = function(message, e) {
@@ -630,7 +631,7 @@ safaridriver.inject.Tab.prototype.executeInPage = function(command) {
 
 /**
  * @param {!safaridriver.message.Response} message The message.
- * @param {!MessageEvent} e The original message.
+ * @param {!MessageEvent.<*>} e The original message.
  * @private
  */
 safaridriver.inject.Tab.prototype.onPageResponse_ = function(message, e) {

diff --git a/javascript/safari-driver/message/message.js b/javascript/safari-driver/message/message.js
@@ -89,8 +89,8 @@ safaridriver.message.throwInvalidMessageError = function(data) {
 
 /**
  * Creates a {@link safaridriver.message.Message} from a message event.
- * @param {!(SafariExtensionMessageEvent|MessageEvent)} event The raw event to
- *     convert to a message.
+ * @param {!(SafariExtensionMessageEvent|MessageEvent.<*>)} event The raw event
+ *     to convert to a message.
  * @return {!safaridriver.message.Message} The new message.
  * @throws {Error} If the event does not conform to the message protocol.
  */

diff --git a/javascript/safari-driver/message/messagetarget.js b/javascript/safari-driver/message/messagetarget.js
@@ -45,7 +45,7 @@ safaridriver.message.MessageTarget = function(source, opt_consumeMessages) {
 
   /**
    * @private {function(this: safaridriver.message.MessageTarget,
-   *                    !(SafariExtensionMessageEvent|MessageEvent))}
+   *                    !(SafariExtensionMessageEvent|MessageEvent.<*>))}
    */
   this.boundOnMessage_ = goog.bind(this.onMessage_, this);
 
@@ -129,7 +129,7 @@ safaridriver.message.MessageTarget.prototype.logSevere = function(
 
 
 /**
- * @param {!(SafariExtensionMessageEvent|MessageEvent)} e The message event.
+ * @param {!(SafariExtensionMessageEvent|MessageEvent.<*>)} e The message event.
  * @private
  */
 safaridriver.message.MessageTarget.prototype.onMessage_ = function(e) {