When starting a provisional load, indicate whether the provisional URL is about:srcdoc

This corresponds to an iframe loading the document given in its srcdoc attribute

BUG=143337
R=creis@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11788015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175396 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/captive_portal/captive_portal_tab_helper.cc

@@ -65,6 +65,7 @@ void CaptivePortalTabHelper::DidStartProvisionalLoadForFrame(
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
+    bool is_iframe_srcdoc,
     content::RenderViewHost* render_view_host) {
   DCHECK(CalledOnValidThread());
 

chrome/browser/captive_portal/captive_portal_tab_helper.h

@@ -71,6 +71,7 @@ class CaptivePortalTabHelper
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
+      bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) OVERRIDE;
 
   virtual void DidCommitProvisionalLoadForFrame(

chrome/browser/content_settings/tab_specific_content_settings.cc

@@ -499,6 +499,7 @@ void TabSpecificContentSettings::DidStartProvisionalLoadForFrame(
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
+    bool is_iframe_srcdoc,
     RenderViewHost* render_view_host) {
   if (!is_main_frame)
     return;

chrome/browser/content_settings/tab_specific_content_settings.h

@@ -243,6 +243,7 @@ class TabSpecificContentSettings
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
+      bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void AppCacheAccessed(const GURL& manifest_url,
                                 bool blocked_by_policy) OVERRIDE;

chrome/browser/extensions/api/web_navigation/web_navigation_api.cc

@@ -360,6 +360,7 @@ void WebNavigationTabObserver::DidStartProvisionalLoadForFrame(
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
+    bool is_iframe_srcdoc,
     content::RenderViewHost* render_view_host) {
   if (!render_view_host_)
     render_view_host_ = render_view_host;

chrome/browser/extensions/api/web_navigation/web_navigation_api.h

@@ -61,6 +61,7 @@ class WebNavigationTabObserver
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
+      bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidCommitProvisionalLoadForFrame(
       int64 frame_num,

chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

@@ -189,6 +189,7 @@ class DelayLoadStartAndExecuteJavascript
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
+      bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) OVERRIDE {
     if (validated_url != delay_url_ || !rvh_)
       return;

chrome/browser/net/load_time_stats.cc

@@ -271,6 +271,7 @@ void LoadTimeStatsTabHelper::DidStartProvisionalLoadForFrame(
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
+    bool is_iframe_srcdoc,
     content::RenderViewHost* render_view_host) {
   if (!is_main_frame)
     return;

chrome/browser/net/load_time_stats.h

@@ -132,6 +132,7 @@ class LoadTimeStatsTabHelper
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
+      bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidStopLoading(
       content::RenderViewHost* render_view_host) OVERRIDE;

chrome/browser/prerender/prerender_contents.cc

@@ -558,6 +558,7 @@ void PrerenderContents::DidStartProvisionalLoadForFrame(
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
+    bool is_iframe_srcdoc,
     RenderViewHost* render_view_host) {
   if (is_main_frame) {
     if (!AddAliasURL(validated_url))

chrome/browser/prerender/prerender_contents.h

@@ -226,6 +226,7 @@ class PrerenderContents : public content::NotificationObserver,
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
+      bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidFinishLoad(
       int64 frame_id,

chrome/browser/prerender/prerender_tab_helper.cc

@@ -203,6 +203,7 @@ void PrerenderTabHelper::DidStartProvisionalLoadForFrame(
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
+      bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) {
   if (is_main_frame) {
     // Record the beginning of a new PPLT navigation.

chrome/browser/prerender/prerender_tab_helper.h

@@ -35,6 +35,7 @@ class PrerenderTabHelper
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
+      bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidCommitProvisionalLoadForFrame(
       int64 frame_id,

content/browser/browser_plugin/browser_plugin_guest.cc

@@ -244,6 +244,7 @@ void BrowserPluginGuest::DidStartProvisionalLoadForFrame(
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
+    bool is_iframe_srcdoc,
     RenderViewHost* render_view_host) {
   // Inform the embedder of the loadStart.
   SendMessageToEmbedder(

content/browser/browser_plugin/browser_plugin_guest.h

@@ -113,6 +113,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
+      bool is_iframe_srcdoc,
       RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidFailProvisionalLoad(
       int64 frame_id,

content/browser/web_contents/web_contents_impl.cc

@@ -1978,6 +1978,7 @@ void WebContentsImpl::DidStartProvisionalLoadForFrame(
     bool is_main_frame,
     const GURL& url) {
   bool is_error_page = (url.spec() == kUnreachableWebDataURL);
+  bool is_iframe_srcdoc = (url.spec() == chrome::kAboutSrcDocURL);
   GURL validated_url(url);
   RenderProcessHost* render_process_host =
       render_view_host->GetProcess();
@@ -1987,7 +1988,7 @@ void WebContentsImpl::DidStartProvisionalLoadForFrame(
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DidStartProvisionalLoadForFrame(frame_id, parent_frame_id,
                     is_main_frame, validated_url, is_error_page,
-                    render_view_host));
+                    is_iframe_srcdoc, render_view_host));
 
   if (is_main_frame) {
     // Notify observers about the provisional change in the main frame URL.

content/public/browser/web_contents_observer.h

@@ -59,6 +59,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
+      bool is_iframe_srcdoc,
       RenderViewHost* render_view_host) {}
   virtual void ProvisionalChangeToMainFrameUrl(
       const GURL& url,

content/public/common/url_constants.cc

@@ -30,6 +30,7 @@ const char kSwappedOutScheme[] = "swappedout";
 const char kViewSourceScheme[] = "view-source";
 
 const char kAboutBlankURL[] = "about:blank";
+const char kAboutSrcDocURL[] = "about:srcdoc";
 const char kChromeUIAppCacheInternalsHost[] = "appcache-internals";
 const char kChromeUIBlobInternalsHost[] = "blob-internals";
 const char kChromeUIBrowserCrashHost[] = "inducebrowsercrashforrealz";

content/public/common/url_constants.h

@@ -36,6 +36,7 @@ CONTENT_EXPORT extern const char kViewSourceScheme[];
 
 // Hosts for about URLs.
 CONTENT_EXPORT extern const char kAboutBlankURL[];
+CONTENT_EXPORT extern const char kAboutSrcDocURL[];
 CONTENT_EXPORT extern const char kChromeUIAppCacheInternalsHost[];
 CONTENT_EXPORT extern const char kChromeUIBlobInternalsHost[];
 CONTENT_EXPORT extern const char kChromeUIBrowserCrashHost[];