| OLD | NEW |
| 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 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "sky/engine/config.h" | 31 #include "sky/engine/config.h" |
| 32 #include "sky/engine/core/frame/FrameHost.h" | 32 #include "sky/engine/core/frame/FrameHost.h" |
| 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 FrameHost::FrameHost(Page& page, ServiceProvider& services) | 43 FrameHost::FrameHost(Page& page, ServiceProvider* services) |
| 44 : m_page(&page) | 44 : m_page(&page) |
| 45 , m_services(services) | 45 , m_services(services) |
| 46 { | 46 { |
| 47 } | 47 } |
| 48 | 48 |
| 49 // Explicitly in the .cpp to avoid default constructor in .h | 49 // Explicitly in the .cpp to avoid default constructor in .h |
| 50 FrameHost::~FrameHost() | 50 FrameHost::~FrameHost() |
| 51 { | 51 { |
| 52 } | 52 } |
| 53 | 53 |
| 54 Settings& FrameHost::settings() const | 54 Settings& FrameHost::settings() const |
| 55 { | 55 { |
| 56 return m_page->settings(); | 56 return m_page->settings(); |
| 57 } | 57 } |
| 58 | 58 |
| 59 float FrameHost::deviceScaleFactor() const | 59 float FrameHost::deviceScaleFactor() const |
| 60 { | 60 { |
| 61 return m_page->deviceScaleFactor(); | 61 return m_page->deviceScaleFactor(); |
| 62 } | 62 } |
| 63 | 63 |
| 64 } | 64 } |
| OLD | NEW |