Fix for how webview.executeScript and webivew.insertCSS check for page navigtation when loading dat…

extensions/renderer/resources/web_view.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.
 
 // This module implements Webview (<webview>) as a custom element that wraps a
 // BrowserPlugin object element. The object element is hidden within
 // the shadow DOM of the Webview element.
 
 var DocumentNatives = requireNative('document_natives');
 var GuestViewInternal =
@@ skipping 270 matching lines @@
  */
 WebViewInternal.prototype.validateExecuteCodeCall  = function() {
   var ERROR_MSG_CANNOT_INJECT_SCRIPT = '<webview>: ' +
       'Script cannot be injected into content until the page has loaded.';
   if (!this.guestInstanceId) {
     throw new Error(ERROR_MSG_CANNOT_INJECT_SCRIPT);
   }
 };
 
 /**
- * @private
- */
+  * @private
+  */

[Fady Samuel, 2014/09/25 20:09:03]

Just remove this comment. We don't use this style in chrome.

[paulmeyer, 2014/09/25 20:39:51]

Done.

 WebViewInternal.prototype.executeScript = function(var_args) {
   this.validateExecuteCodeCall();
-  var args = $Array.concat([this.guestInstanceId, this.src],
+  var webview_src = this.src;
+  if (this.baseURLForDataURL != '') {

[Fady Samuel, 2014/09/25 20:09:03]

s/URL/Url preferred in Javascript.

[paulmeyer, 2014/09/25 20:39:51]

Done.

+    webview_src = this.baseURLForDataURL;
+  }
+  var args = $Array.concat([this.guestInstanceId, webview_src],
                            $Array.slice(arguments));
   $Function.apply(WebView.executeScript, null, args);
 };
 
 /**
- * @private
- */
+  * @private
+  */

[Fady Samuel, 2014/09/25 20:09:03]

Just remove this comment. we don't use this style in chrome.

[paulmeyer, 2014/09/25 20:39:51]

Done.

 WebViewInternal.prototype.insertCSS = function(var_args) {
   this.validateExecuteCodeCall();
-  var args = $Array.concat([this.guestInstanceId, this.src],
+  var webview_src = this.src;
+  if (this.baseURLForDataURL != '') {

[Fady Samuel, 2014/09/25 20:09:03]

s/URL/Url preferred in Javascript.

[paulmeyer, 2014/09/25 20:39:51]

Done.

+    webview_src = this.baseURLForDataURL;
+  }
+  var args = $Array.concat([this.guestInstanceId, webview_src],
                            $Array.slice(arguments));
   $Function.apply(WebView.insertCSS, null, args);
 };
 
 WebViewInternal.prototype.setupAutoSizeProperties = function() {
   $Array.forEach(AUTO_SIZE_ATTRIBUTES, function(attributeName) {
     this[attributeName] = this.webviewNode.getAttribute(attributeName);
     Object.defineProperty(this.webviewNode, attributeName, {
       get: function() {
         return this[attributeName];
@@ skipping 403 matching lines @@
       this.on[propertyName] = value;
       if (value)
         this.webviewNode.addEventListener(eventName, value);
     }.bind(this),
     enumerable: true
   });
 };
 
 // Updates state upon loadcommit.
 WebViewInternal.prototype.onLoadCommit = function(
-    currentEntryIndex, entryCount, processId, url, isTopLevel) {
+    baseURLForDataURL, currentEntryIndex, entryCount,
+    processId, url, isTopLevel) {
+  this.baseURLForDataURL = baseURLForDataURL;
   this.currentEntryIndex = currentEntryIndex;
   this.entryCount = entryCount;
   this.processId = processId;
   var oldValue = this.webviewNode.getAttribute('src');
   var newValue = url;
   if (isTopLevel && (oldValue != newValue)) {
     // Touching the src attribute triggers a navigation. To avoid
     // triggering a page reload on every guest-initiated navigation,
     // we use the flag ignoreNextSrcAttributeChange here.
     this.ignoreNextSrcAttributeChange = true;
@@ skipping 256 matching lines @@
 
 /**
  * Implemented when the experimental API is available.
  * @private
  */
 WebViewInternal.prototype.setupExperimentalContextMenus = function() {
 };
 
 exports.WebView = WebView;
 exports.WebViewInternal = WebViewInternal;