Add is_srcdoc to FrameNavigationEntry and restore about::srcdoc URL.

content/browser/frame_host/frame_navigation_entry.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_
 #define CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 21 matching lines @@
  public:
   FrameNavigationEntry();
   FrameNavigationEntry(const std::string& frame_unique_name,
                        int64_t item_sequence_number,
                        int64_t document_sequence_number,
                        scoped_refptr<SiteInstanceImpl> site_instance,
                        scoped_refptr<SiteInstanceImpl> source_site_instance,
                        const GURL& url,
                        const Referrer& referrer,
                        const std::string& method,
-                       int64_t post_id);
+                       int64_t post_id,
+                       bool is_srcdoc);
 
   // Creates a copy of this FrameNavigationEntry that can be modified
   // independently from the original.
   FrameNavigationEntry* Clone() const;
 
   // Updates all the members of this entry.
   void UpdateEntry(const std::string& frame_unique_name,
                    int64_t item_sequence_number,
                    int64_t document_sequence_number,
                    SiteInstanceImpl* site_instance,
                    scoped_refptr<SiteInstanceImpl> source_site_instance,
                    const GURL& url,
                    const Referrer& referrer,
                    const std::vector<GURL>& redirect_chain,
                    const PageState& page_state,
                    const std::string& method,
-                   int64_t post_id);
+                   int64_t post_id,
+                   bool is_srcdoc);
 
   // The unique name of the frame this entry is for.  This is a stable name for
   // the frame based on its position in the tree and relation to other named
   // frames, which does not change after cross-process navigations or restores.
   // Only the main frame can have an empty name.
   //
   // This is unique relative to other frames in the same page, but not among
   // other pages (i.e., not globally unique).
   const std::string& frame_unique_name() const { return frame_unique_name_; }
   void set_frame_unique_name(const std::string& frame_unique_name) {
@@ skipping 57 matching lines @@
 
   // The id of the post corresponding to this navigation or -1 if the
   // navigation was not a POST.
   int64_t post_id() const { return post_id_; }
   void set_post_id(int64_t post_id) { post_id_ = post_id; }
 
   // The data sent during a POST navigation. Returns nullptr if the navigation
   // is not a POST.
   scoped_refptr<ResourceRequestBodyImpl> GetPostData() const;
 
+  // Whether the navigation is for an iframe with srcdoc attribute

[Charlie Reis, 2016/11/07 21:32:58]

nit: End with period.

[arthursonzogni, 2016/11/08 12:21:30]

Done.

+  bool is_srcdoc() const { return is_srcdoc_; }
+
  private:
   friend class base::RefCounted<FrameNavigationEntry>;
   virtual ~FrameNavigationEntry();
 
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
   // Add all new fields to |UpdateEntry|.
   // TODO(creis): These fields have implications for session restore.  This is
   // currently managed by NavigationEntry, but the logic will move here.
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   // See the accessors above for descriptions.
   std::string frame_unique_name_;
   int64_t item_sequence_number_;
   int64_t document_sequence_number_;
   scoped_refptr<SiteInstanceImpl> site_instance_;
   // This member is cleared at commit time and is not persisted.
   scoped_refptr<SiteInstanceImpl> source_site_instance_;
   GURL url_;
   Referrer referrer_;
   // This is used when transferring a pending entry from one process to another.
   // We also send the main frame's redirect chain through session sync for
   // offline analysis.
   // It is preserved after commit but should not be persisted.
   std::vector<GURL> redirect_chain_;
   // TODO(creis): Change this to FrameState.
   PageState page_state_;
   std::string method_;
   int64_t post_id_;
+  bool is_srcdoc_;

[Charlie Reis, 2016/11/07 21:32:58]

Does this value get restored properly if you quit and restart, restoring all
your tabs?  It's not persisted directly, but it does look like you might be able
to recover from that in RecursivelyGenerateFrameEntries.

[arthursonzogni, 2016/11/08 12:21:30]

Yes, is_srcdoc is restored properly because of the three lines I added in
RecursivelyGenerateFrameEntries.

But if these lines weren't there, there wouldn't be any problems for the user
either. |is_srcdoc| would be false instead of true and the |url| would be
about::srcdoc instead of about::blank in the browser. Finally the renderer would
see about::srcdoc as it is supposed to do.

 
   DISALLOW_COPY_AND_ASSIGN(FrameNavigationEntry);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_