Merge pull request #6810 from electron/iframe-ismainpage-event

Send isMainFrame as argument to did-navigate-in-page event

atom/browser/api/atom_api_web_contents.cc

@@ -674,7 +674,7 @@ void WebContents::DidFinishNavigation(
     if (is_main_frame && !is_in_page) {
       Emit("did-navigate", url);
     } else if (is_in_page) {
-      Emit("did-navigate-in-page", url);
+      Emit("did-navigate-in-page", url, is_main_frame);
     }
   } else {
     auto url = navigation_handle->GetURL();

docs/api/web-contents.md

@@ -185,6 +185,7 @@ Returns:
 
 * `event` Event
 * `url` String
+* `isMainFrame` Boolean
 
 Emitted when an in-page navigation happened.
 

docs/api/web-view-tag.md

@@ -710,6 +710,7 @@ this purpose.
 
 Returns:
 
+* `isMainFrame` Boolean
 * `url` String
 
 Emitted when an in-page navigation happened.

lib/renderer/web-view/guest-view-internal.js

@@ -22,7 +22,7 @@ var WEB_VIEW_EVENTS = {
   'new-window': ['url', 'frameName', 'disposition', 'options'],
   'will-navigate': ['url'],
   'did-navigate': ['url'],
-  'did-navigate-in-page': ['url'],
+  'did-navigate-in-page': ['url', 'isMainFrame'],
   'close': [],
   'crashed': [],
   'gpu-crashed': [],