Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(622)

Unified Diff: content/browser/frame_host/navigation_entry_impl.h

Issue 743773003: OOPIF: Data URLs are now rendered in the renderer that initiated the navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing android compile Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_entry_impl.h
diff --git a/content/browser/frame_host/navigation_entry_impl.h b/content/browser/frame_host/navigation_entry_impl.h
index 37de18213cbdd53ac969227d40466cf61e3a2adb..8505f5bdbf88c8feb80ff7af1caf72d7e157c7dc 100644
--- a/content/browser/frame_host/navigation_entry_impl.h
+++ b/content/browser/frame_host/navigation_entry_impl.h
@@ -107,6 +107,13 @@ class CONTENT_EXPORT NavigationEntryImpl
return site_instance_.get();
}
+ // The |source_site_instance| is used to identify the SiteInstance of the
+ // frame that initiated the navigation.
+ void set_source_site_instance(SiteInstanceImpl* source_site_instance);
+ SiteInstanceImpl* source_site_instance() const {
+ return source_site_instance_.get();
+ }
+
// Remember the set of bindings granted to this NavigationEntry at the time
// of commit, to ensure that we do not grant it additional bindings if we
// navigate back to it in the future. This can only be changed once.
@@ -268,6 +275,9 @@ class CONTENT_EXPORT NavigationEntryImpl
// This member is not persisted with session restore.
std::string extra_headers_;
+ // This member is cleared in |ResetForCommit| and not persisted.
+ scoped_refptr<SiteInstanceImpl> source_site_instance_;
+
// Used for specifying base URL for pages loaded via data URLs. Only used and
// persisted by Android WebView.
GURL base_url_for_data_url_;
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/frame_host/navigation_entry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698