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

Unified Diff: sky/engine/core/frame/FrameHost.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/FrameHost.cpp
diff --git a/sky/engine/core/frame/FrameHost.cpp b/sky/engine/core/frame/FrameHost.cpp
index 458ce032e3bc1878360c51773559c1fe0c70ad3d..02f52245be0fd23f582511d9fe251871eb6c63c0 100644
--- a/sky/engine/core/frame/FrameHost.cpp
+++ b/sky/engine/core/frame/FrameHost.cpp
@@ -40,9 +40,22 @@ PassOwnPtr<FrameHost> FrameHost::create(Page& page, ServiceProvider* services)
return adoptPtr(new FrameHost(page, services));
}
+PassOwnPtr<FrameHost> FrameHost::createDummy(Settings* settings)
+{
+ return adoptPtr(new FrameHost(settings));
+}
+
FrameHost::FrameHost(Page& page, ServiceProvider* services)
: m_page(&page)
, m_services(services)
+ , m_settings(nullptr)
+{
+}
+
+FrameHost::FrameHost(Settings* settings)
+ : m_page(nullptr)
+ , m_services(nullptr)
+ , m_settings(settings)
{
}
@@ -53,12 +66,15 @@ FrameHost::~FrameHost()
Settings& FrameHost::settings() const
{
+ if (m_settings)
+ return *m_settings;
return m_page->settings();
}
float FrameHost::deviceScaleFactor() const
{
- return m_page->deviceScaleFactor();
+ return 1.0;
+// return m_page->deviceScaleFactor();
Hixie 2015/05/26 18:07:16 this is exciting. What does it mean?
eseidel 2015/05/26 19:13:04 This is probably wrong.
}
}

Powered by Google App Engine
This is Rietveld 408576698