Chromium Code Reviews| 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.
|
| } |
| } |