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

Unified Diff: Source/core/page/Page.cpp

Issue 346403002: Initialize WebCore::Frame when swapping frames. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: tests, less leaks Created 6 years, 6 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/WebFrame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/Page.cpp
diff --git a/Source/core/page/Page.cpp b/Source/core/page/Page.cpp
index 1a4b76b9ca4f2adc2e8b74d815bb825e90d57247..8484efb036a2c895e22da75f4cb0d693129da03f 100644
--- a/Source/core/page/Page.cpp
+++ b/Source/core/page/Page.cpp
@@ -202,7 +202,11 @@ PassRefPtrWillBeRawPtr<ClientRectList> Page::nonFastScrollableRects(const LocalF
void Page::setMainFrame(Frame* mainFrame)
{
- ASSERT(!m_mainFrame); // Should only be called during initialization
+ // Should only be called during initialization or swaps between local and
+ // remote frames.
+ // FIXME: Unfortunately we can't assert on this at the moment, because this
+ // is called in the base constructor for both LocalFrame and RemoteFrame,
+ // when the vtables for the derived classes have not yet been setup.
m_mainFrame = mainFrame;
}
« no previous file with comments | « no previous file | Source/web/WebFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698