| 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 14 matching lines...) Expand all Loading... |
| 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 "core/frame/FrameHost.h" | 31 #include "core/frame/FrameHost.h" |
| 32 | 32 |
| 33 #include "core/frame/FrameView.h" | 33 #include "core/frame/FrameView.h" |
| 34 #include "core/page/Page.h" | 34 #include "core/page/Page.h" |
| 35 #include "core/page/scrolling/OverscrollController.h" | |
| 36 #include "public/platform/Platform.h" | 35 #include "public/platform/Platform.h" |
| 37 #include "public/platform/WebScheduler.h" | 36 #include "public/platform/WebScheduler.h" |
| 38 | 37 |
| 39 namespace blink { | 38 namespace blink { |
| 40 | 39 |
| 41 FrameHost* FrameHost::create(Page& page) { | 40 FrameHost* FrameHost::create(Page& page) { |
| 42 return new FrameHost(page); | 41 return new FrameHost(page); |
| 43 } | 42 } |
| 44 | 43 |
| 45 FrameHost::FrameHost(Page& page) : m_page(&page) {} | 44 FrameHost::FrameHost(Page& page) : m_page(&page) {} |
| (...skipping 10 matching lines...) Expand all Loading... |
| 56 } | 55 } |
| 57 | 56 |
| 58 BrowserControls& FrameHost::browserControls() { | 57 BrowserControls& FrameHost::browserControls() { |
| 59 return m_page->browserControls(); | 58 return m_page->browserControls(); |
| 60 } | 59 } |
| 61 | 60 |
| 62 const BrowserControls& FrameHost::browserControls() const { | 61 const BrowserControls& FrameHost::browserControls() const { |
| 63 return m_page->browserControls(); | 62 return m_page->browserControls(); |
| 64 } | 63 } |
| 65 | 64 |
| 66 OverscrollController& FrameHost::overscrollController() { | |
| 67 return page().overscrollController(); | |
| 68 } | |
| 69 | |
| 70 const OverscrollController& FrameHost::overscrollController() const { | |
| 71 return page().overscrollController(); | |
| 72 } | |
| 73 | |
| 74 DEFINE_TRACE(FrameHost) { | 65 DEFINE_TRACE(FrameHost) { |
| 75 visitor->trace(m_page); | 66 visitor->trace(m_page); |
| 76 } | 67 } |
| 77 | 68 |
| 78 void FrameHost::incrementSubframeCount() { | 69 void FrameHost::incrementSubframeCount() { |
| 79 page().incrementSubframeCount(); | 70 page().incrementSubframeCount(); |
| 80 } | 71 } |
| 81 | 72 |
| 82 void FrameHost::decrementSubframeCount() { | 73 void FrameHost::decrementSubframeCount() { |
| 83 page().decrementSubframeCount(); | 74 page().decrementSubframeCount(); |
| 84 } | 75 } |
| 76 |
| 85 int FrameHost::subframeCount() const { | 77 int FrameHost::subframeCount() const { |
| 86 return page().subframeCount(); | 78 return page().subframeCount(); |
| 87 } | 79 } |
| 88 | 80 |
| 89 } // namespace blink | 81 } // namespace blink |
| OLD | NEW |