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

Unified Diff: content/browser/web_contents/web_contents_impl.h

Issue 972313002: Make <webview> use out-of-process iframe architecture. (Closed) Base URL: ssh://saopaulo.wat/mnt/dev/shared/src@testoopif2z-better-chrome
Patch Set: add basic postMessage test Created 5 years, 7 months 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/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 0004d0b54061443e48ca67312ffa362afc7836f1..a00dc0a88489e45e38b165ba0567ae4678688b3b 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -280,6 +280,8 @@ class CONTENT_EXPORT WebContentsImpl
void WasHidden() override;
bool NeedToFireBeforeUnload() override;
void DispatchBeforeUnload(bool for_cross_site_transition) override;
+ void AttachToEmbedderFrame(WebContents* embedder_web_contents,
+ RenderFrameHost* embedder_frame) override;
void Stop() override;
WebContents* Clone() override;
void ReloadFocusedFrame(bool ignore_cache) override;
@@ -600,6 +602,7 @@ class CONTENT_EXPORT WebContentsImpl
bool FocusLocationBarByDefault() override;
void SetFocusToLocationBar(bool select_all) override;
bool IsHidden() override;
+ int64 GetEmbedderFrameTreeNodeID() override;
// NotificationObserver ------------------------------------------------------
@@ -735,6 +738,25 @@ class CONTENT_EXPORT WebContentsImpl
class DestructionObserver;
+ // Represents a WebContents node in a tree of WebContents structure.
+ //
+ // Two WebContents with separate FrameTree can be connected by
+ // parent-child relationship using this class. Note that their FrameTrees
Charlie Reis 2015/05/19 07:12:31 outer/inner
lazyboy 2015/05/21 23:23:47 Done, please check.
+ // still remain disjoint/separate.
+ struct WebContentsTreeNode {
+ public:
+ WebContentsTreeNode();
+ ~WebContentsTreeNode();
+
+ void set_parent_web_contents(WebContentsImpl* parent_web_contents) {
+ parent_web_contents_ = parent_web_contents;
+ }
+ WebContentsImpl* parent_web_contents() { return parent_web_contents_; }
+
+ private:
+ WebContentsImpl* parent_web_contents_;
+ };
+
// See WebContents::Create for a description of these parameters.
WebContentsImpl(BrowserContext* browser_context,
WebContentsImpl* opener);
@@ -1049,6 +1071,10 @@ class CONTENT_EXPORT WebContentsImpl
// Manages the frame tree of the page and process swaps in each node.
FrameTree frame_tree_;
+ // If this WebContents is part of a "tree of WebContents" structure, then
+ // this contain information about the structure.
+ WebContentsTreeNode node_;
+
// SavePackage, lazily created.
scoped_refptr<SavePackage> save_package_;

Powered by Google App Engine
This is Rietveld 408576698