| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 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 "config.h" | 31 #include "config.h" |
| 32 #include "core/frame/FrameHost.h" | 32 #include "core/frame/FrameHost.h" |
| 33 | 33 |
| 34 #include "core/frame/EventHandlerRegistry.h" | |
| 35 #include "core/page/Chrome.h" | 34 #include "core/page/Chrome.h" |
| 36 #include "core/page/ChromeClient.h" | 35 #include "core/page/ChromeClient.h" |
| 37 #include "core/page/Page.h" | 36 #include "core/page/Page.h" |
| 38 | 37 |
| 39 namespace blink { | 38 namespace blink { |
| 40 | 39 |
| 41 PassOwnPtr<FrameHost> FrameHost::create(Page& page, ServiceProvider& services) | 40 PassOwnPtr<FrameHost> FrameHost::create(Page& page, ServiceProvider& services) |
| 42 { | 41 { |
| 43 return adoptPtr(new FrameHost(page, services)); | 42 return adoptPtr(new FrameHost(page, services)); |
| 44 } | 43 } |
| 45 | 44 |
| 46 FrameHost::FrameHost(Page& page, ServiceProvider& services) | 45 FrameHost::FrameHost(Page& page, ServiceProvider& services) |
| 47 : m_page(&page) | 46 : m_page(&page) |
| 48 , m_services(services) | 47 , m_services(services) |
| 49 , m_eventHandlerRegistry(adoptPtr(new EventHandlerRegistry(*this))) | |
| 50 { | 48 { |
| 51 } | 49 } |
| 52 | 50 |
| 53 // Explicitly in the .cpp to avoid default constructor in .h | 51 // Explicitly in the .cpp to avoid default constructor in .h |
| 54 FrameHost::~FrameHost() | 52 FrameHost::~FrameHost() |
| 55 { | 53 { |
| 56 } | 54 } |
| 57 | 55 |
| 58 Settings& FrameHost::settings() const | 56 Settings& FrameHost::settings() const |
| 59 { | 57 { |
| 60 return m_page->settings(); | 58 return m_page->settings(); |
| 61 } | 59 } |
| 62 | 60 |
| 63 Chrome& FrameHost::chrome() const | 61 Chrome& FrameHost::chrome() const |
| 64 { | 62 { |
| 65 return m_page->chrome(); | 63 return m_page->chrome(); |
| 66 } | 64 } |
| 67 | 65 |
| 68 UseCounter& FrameHost::useCounter() const | 66 UseCounter& FrameHost::useCounter() const |
| 69 { | 67 { |
| 70 return m_page->useCounter(); | 68 return m_page->useCounter(); |
| 71 } | 69 } |
| 72 | 70 |
| 73 float FrameHost::deviceScaleFactor() const | 71 float FrameHost::deviceScaleFactor() const |
| 74 { | 72 { |
| 75 return m_page->deviceScaleFactor(); | 73 return m_page->deviceScaleFactor(); |
| 76 } | 74 } |
| 77 | 75 |
| 78 EventHandlerRegistry& FrameHost::eventHandlerRegistry() const | |
| 79 { | |
| 80 return *m_eventHandlerRegistry; | |
| 81 } | |
| 82 | |
| 83 void FrameHost::trace(Visitor* visitor) | 76 void FrameHost::trace(Visitor* visitor) |
| 84 { | 77 { |
| 85 visitor->trace(m_page); | 78 visitor->trace(m_page); |
| 86 visitor->trace(m_eventHandlerRegistry); | |
| 87 } | 79 } |
| 88 | 80 |
| 89 } | 81 } |
| OLD | NEW |