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

Side by Side 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, 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 22 matching lines...) Expand all
33 33
34 #include "sky/engine/core/page/Page.h" 34 #include "sky/engine/core/page/Page.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 PassOwnPtr<FrameHost> FrameHost::create(Page& page, ServiceProvider* services) 38 PassOwnPtr<FrameHost> FrameHost::create(Page& page, ServiceProvider* services)
39 { 39 {
40 return adoptPtr(new FrameHost(page, services)); 40 return adoptPtr(new FrameHost(page, services));
41 } 41 }
42 42
43 PassOwnPtr<FrameHost> FrameHost::createDummy(Settings* settings)
44 {
45 return adoptPtr(new FrameHost(settings));
46 }
47
43 FrameHost::FrameHost(Page& page, ServiceProvider* services) 48 FrameHost::FrameHost(Page& page, ServiceProvider* services)
44 : m_page(&page) 49 : m_page(&page)
45 , m_services(services) 50 , m_services(services)
51 , m_settings(nullptr)
46 { 52 {
47 } 53 }
48 54
55 FrameHost::FrameHost(Settings* settings)
56 : m_page(nullptr)
57 , m_services(nullptr)
58 , m_settings(settings)
59 {
60 }
61
49 // Explicitly in the .cpp to avoid default constructor in .h 62 // Explicitly in the .cpp to avoid default constructor in .h
50 FrameHost::~FrameHost() 63 FrameHost::~FrameHost()
51 { 64 {
52 } 65 }
53 66
54 Settings& FrameHost::settings() const 67 Settings& FrameHost::settings() const
55 { 68 {
69 if (m_settings)
70 return *m_settings;
56 return m_page->settings(); 71 return m_page->settings();
57 } 72 }
58 73
59 float FrameHost::deviceScaleFactor() const 74 float FrameHost::deviceScaleFactor() const
60 { 75 {
61 return m_page->deviceScaleFactor(); 76 return 1.0;
77 // 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.
62 } 78 }
63 79
64 } 80 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698