Merge pull request #2424 from deepak1556/web_contents_patch

webcontents: minor patches

atom/browser/lib/guest-view-manager.coffee

@@ -3,6 +3,7 @@ webContents = require 'web-contents'
 webViewManager = null  # Doesn't exist in early initialization.
 
 supportedWebViewEvents = [
+  'load-commit'
   'did-finish-load'
   'did-fail-load'
   'did-frame-finish-load'

atom/browser/web_view_guest_delegate.cc

@@ -5,7 +5,9 @@
 #include "atom/browser/web_view_guest_delegate.h"
 
 #include "atom/browser/api/atom_api_web_contents.h"
+#include "atom/common/native_mate_converters/gurl_converter.h"
 #include "content/public/browser/guest_host.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 
@@ -128,6 +130,12 @@ void WebViewGuestDelegate::RenderViewReady() {
     render_view_host_view->SetBackgroundColor(SK_ColorTRANSPARENT);
 }
 
+void WebViewGuestDelegate::DidCommitProvisionalLoadForFrame(
+    content::RenderFrameHost* render_frame_host,
+    const GURL& url, ui::PageTransition transition_type) {
+  api_web_contents_->Emit("load-commit", url, !render_frame_host->GetParent());
+}
+
 void WebViewGuestDelegate::DidAttach(int guest_proxy_routing_id) {
   api_web_contents_->Emit("did-attach");
 }

atom/browser/web_view_guest_delegate.h

@@ -59,6 +59,9 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
  protected:
   // content::WebContentsObserver:
   void RenderViewReady() override;
+  void DidCommitProvisionalLoadForFrame(
+      content::RenderFrameHost* render_frame_host,
+      const GURL& url, ui::PageTransition transition_type) override;
 
   // content::BrowserPluginGuestDelegate:
   void DidAttach(int guest_proxy_routing_id) final;

atom/renderer/lib/override.coffee

@@ -11,6 +11,7 @@ resolveUrl = (url) ->
 # Window object returned by "window.open".
 class BrowserWindowProxy
   constructor: (@guestId) ->
+    @closed = false
     ipc.on 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSED', (guestId) =>
       if guestId is @guestId
         @closed = true

atom/renderer/lib/web-view/guest-view-internal.coffee

@@ -4,6 +4,7 @@ webFrame = require 'web-frame'
 requestId = 0
 
 WEB_VIEW_EVENTS =
+  'load-commit': ['url', 'isMainFrame']
   'did-finish-load': []
   'did-fail-load': ['errorCode', 'errorDescription']
   'did-frame-finish-load': ['isMainFrame']
@@ -32,6 +33,7 @@ dispatchEvent = (webView, event, args...) ->
   for f, i in WEB_VIEW_EVENTS[event]
     domEvent[f] = args[i]
   webView.dispatchEvent domEvent
+  webView.onLoadCommit domEvent if event == 'load-commit'
 
 module.exports =
   registerEvents: (webView, viewInstanceId) ->

atom/renderer/lib/web-view/web-view-attributes.coffee

@@ -120,7 +120,7 @@ class SrcAttribute extends WebViewAttribute
       ''
 
   setValueIgnoreMutation: (value) ->
-    WebViewAttribute::setValueIgnoreMutation value
+    WebViewAttribute::setValueIgnoreMutation.call(this, value)
     # takeRecords() is needed to clear queued up src mutations. Without it, it
     # is possible for this change to get picked up asyncronously by src's
     # mutation observer |observer|, and then get handled even though we do not

atom/renderer/lib/web-view/web-view.coffee

@@ -157,10 +157,10 @@ class WebViewImpl
       enumerable: true
 
   # Updates state upon loadcommit.
-  onLoadCommit: (@baseUrlForDataUrl, @currentEntryIndex, @entryCount, @processId, url, isTopLevel) ->
+  onLoadCommit: (webViewEvent) ->
     oldValue = @webviewNode.getAttribute webViewConstants.ATTRIBUTE_SRC
-    newValue = url
-    if isTopLevel and (oldValue != newValue)
+    newValue = webViewEvent.url
+    if webViewEvent.isMainFrame and (oldValue != newValue)
       # Touching the src attribute triggers a navigation. To avoid
       # triggering a page reload on every guest-initiated navigation,
       # we do not handle this mutation

docs/api/web-view-tag.md

@@ -335,6 +335,15 @@ examples.
 
 ## DOM events
 
+### load-commit
+
+* `url` String
+* `isMainFrame` Boolean
+
+Fired when a load has committed. This includes navigation within the current
+document as well as subframe document-level loads, but does not include
+asynchronous resource loads.
+
 ### did-finish-load
 
 Fired when the navigation is done, i.e. the spinner of the tab will stop

spec/chromium-spec.coffee

@@ -37,6 +37,7 @@ describe 'chromium feature', ->
   describe 'window.open', ->
     it 'returns a BrowserWindowProxy object', ->
       b = window.open 'about:blank', 'test', 'show=no'
+      assert.equal b.closed, false
       assert.equal b.constructor.name, 'BrowserWindowProxy'
       b.close()