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

Unified Diff: Source/web/WebFrameImpl.h

Issue 23506013: Make the embedder responsible for creating the WebFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix lifetime on frame detach Created 7 years, 3 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
« no previous file with comments | « no previous file | Source/web/WebFrameImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebFrameImpl.h
diff --git a/Source/web/WebFrameImpl.h b/Source/web/WebFrameImpl.h
index 18696db49c5f91d0674899fa1422e2116c2c11bd..e64563291479d392e05621a6e2bdff1d9d33916c 100644
--- a/Source/web/WebFrameImpl.h
+++ b/Source/web/WebFrameImpl.h
@@ -76,10 +76,11 @@ class WebFrameImpl
, public WebCore::FrameDestructionObserver {
public:
// WebFrame methods:
+ virtual void close();
virtual WebString uniqueName() const;
virtual WebString assignedName() const;
virtual void setName(const WebString&);
- virtual long long identifier() const;
+ virtual long long embedderIdentifier() const;
virtual WebVector<WebIconURL> iconURLs(int iconTypesMask) const;
virtual WebSize scrollOffset() const;
virtual void setScrollOffset(const WebSize&);
@@ -237,7 +238,10 @@ public:
// WebCore::FrameDestructionObserver methods.
virtual void willDetachPage();
- static PassRefPtr<WebFrameImpl> create(WebFrameClient* client);
+ static WebFrameImpl* create(WebFrameClient*);
+ // FIXME: Move the embedderIdentifier concept fully to the embedder and
+ // remove this factory method.
+ static WebFrameImpl* create(WebFrameClient*, long long embedderIdentifier);
virtual ~WebFrameImpl();
// Called by the WebViewImpl to initialize the main frame for the page.
@@ -326,7 +330,7 @@ private:
InvalidateAll // Both content area and the scrollbar.
};
- explicit WebFrameImpl(WebFrameClient*);
+ WebFrameImpl(WebFrameClient*, long long frame_identifier);
// Sets the local WebCore frame and registers destruction observers.
void setWebCoreFrame(WebCore::Frame*);
@@ -490,7 +494,7 @@ private:
OwnPtr<ChromePrintContext> m_printContext;
// The identifier of this frame.
- long long m_identifier;
+ long long m_embedderIdentifier;
// Ensure we don't overwrite valid history data during same document loads
// from HistoryItems
« no previous file with comments | « no previous file | Source/web/WebFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698