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

Unified Diff: sky/engine/core/frame/LocalFrame.cpp

Issue 1148253003: Add LayoutRoot (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Updated 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: sky/engine/core/frame/LocalFrame.cpp
diff --git a/sky/engine/core/frame/LocalFrame.cpp b/sky/engine/core/frame/LocalFrame.cpp
index 50e0c9143229e522e0aeec87e7084280002b79ca..69bd6f3768bd447c6f578179761ebd0c87411ba7 100644
--- a/sky/engine/core/frame/LocalFrame.cpp
+++ b/sky/engine/core/frame/LocalFrame.cpp
@@ -74,8 +74,10 @@ inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host)
, m_newEventHandler(adoptPtr(new NewEventHandler(*this)))
, m_console(FrameConsole::create(*this))
, m_inputMethodController(InputMethodController::create(*this))
+ , m_document(nullptr)
{
- page()->setMainFrame(this);
+ if (page())
+ page()->setMainFrame(this);
}
PassRefPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client, FrameHost* host)
@@ -235,8 +237,15 @@ RenderView* LocalFrame::contentRenderer() const
return document() ? document()->renderView() : 0;
}
+void LocalFrame::setDocument(Document* document)
+{
+ m_document = document;
+}
+
Document* LocalFrame::document() const
{
+ if (m_document)
+ return m_document;
return m_domWindow ? m_domWindow->document() : 0;
}
@@ -280,7 +289,6 @@ PassRefPtr<Range> LocalFrame::rangeForPoint(const IntPoint& framePoint)
void LocalFrame::createView(const IntSize& viewportSize, const Color& backgroundColor, bool transparent)
{
ASSERT(this);
- ASSERT(page());
setView(nullptr);

Powered by Google App Engine
This is Rietveld 408576698