| 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 27 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 PassOwnPtrWillBeRawPtr<FrameHost> FrameHost::create(Page& page) | 41 PassOwnPtrWillBeRawPtr<FrameHost> FrameHost::create(Page& page) |
| 42 { | 42 { |
| 43 return adoptPtrWillBeNoop(new FrameHost(page)); | 43 return adoptPtrWillBeNoop(new FrameHost(page)); |
| 44 } | 44 } |
| 45 | 45 |
| 46 FrameHost::FrameHost(Page& page) | 46 FrameHost::FrameHost(Page& page) |
| 47 : m_page(&page) | 47 : m_page(&page) |
| 48 , m_pinchViewport(adoptPtr(new PinchViewport(*this))) | |
| 49 , m_eventHandlerRegistry(adoptPtrWillBeNoop(new EventHandlerRegistry(*this))
) | 48 , m_eventHandlerRegistry(adoptPtrWillBeNoop(new EventHandlerRegistry(*this))
) |
| 50 { | 49 { |
| 51 } | 50 } |
| 52 | 51 |
| 53 // Explicitly in the .cpp to avoid default constructor in .h | 52 // Explicitly in the .cpp to avoid default constructor in .h |
| 54 FrameHost::~FrameHost() | 53 FrameHost::~FrameHost() |
| 55 { | 54 { |
| 56 } | 55 } |
| 57 | 56 |
| 58 Settings& FrameHost::settings() const | 57 Settings& FrameHost::settings() const |
| 59 { | 58 { |
| 60 return m_page->settings(); | 59 return m_page->settings(); |
| 61 } | 60 } |
| 62 | 61 |
| 63 Chrome& FrameHost::chrome() const | 62 Chrome& FrameHost::chrome() const |
| 64 { | 63 { |
| 65 return m_page->chrome(); | 64 return m_page->chrome(); |
| 66 } | 65 } |
| 67 | 66 |
| 68 UseCounter& FrameHost::useCounter() const | 67 UseCounter& FrameHost::useCounter() const |
| 69 { | 68 { |
| 70 return m_page->useCounter(); | 69 return m_page->useCounter(); |
| 71 } | 70 } |
| 72 | 71 |
| 73 float FrameHost::deviceScaleFactor() const | 72 float FrameHost::deviceScaleFactor() const |
| 74 { | 73 { |
| 75 return m_page->deviceScaleFactor(); | 74 return m_page->deviceScaleFactor(); |
| 76 } | 75 } |
| 77 | 76 |
| 78 PinchViewport& FrameHost::pinchViewport() const | |
| 79 { | |
| 80 return *m_pinchViewport; | |
| 81 } | |
| 82 | |
| 83 EventHandlerRegistry& FrameHost::eventHandlerRegistry() const | 77 EventHandlerRegistry& FrameHost::eventHandlerRegistry() const |
| 84 { | 78 { |
| 85 return *m_eventHandlerRegistry; | 79 return *m_eventHandlerRegistry; |
| 86 } | 80 } |
| 87 | 81 |
| 88 void FrameHost::trace(Visitor* visitor) | 82 void FrameHost::trace(Visitor* visitor) |
| 89 { | 83 { |
| 90 visitor->trace(m_page); | 84 visitor->trace(m_page); |
| 91 visitor->trace(m_eventHandlerRegistry); | 85 visitor->trace(m_eventHandlerRegistry); |
| 92 } | 86 } |
| 93 | 87 |
| 94 } | 88 } |
| OLD | NEW |