| 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 15 matching lines...) Expand all Loading... |
| 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" | 34 #include "core/frame/EventHandlerRegistry.h" |
| 35 #include "core/inspector/ConsoleMessageStorage.h" | 35 #include "core/inspector/ConsoleMessageStorage.h" |
| 36 #include "core/inspector/InspectorController.h" | |
| 37 #include "core/page/Chrome.h" | 36 #include "core/page/Chrome.h" |
| 38 #include "core/page/ChromeClient.h" | 37 #include "core/page/ChromeClient.h" |
| 39 #include "core/page/Page.h" | 38 #include "core/page/Page.h" |
| 40 | 39 |
| 41 namespace blink { | 40 namespace blink { |
| 42 | 41 |
| 43 PassOwnPtrWillBeRawPtr<FrameHost> FrameHost::create(Page& page) | 42 PassOwnPtrWillBeRawPtr<FrameHost> FrameHost::create(Page& page) |
| 44 { | 43 { |
| 45 return adoptPtrWillBeNoop(new FrameHost(page)); | 44 return adoptPtrWillBeNoop(new FrameHost(page)); |
| 46 } | 45 } |
| (...skipping 20 matching lines...) Expand all Loading... |
| 67 Chrome& FrameHost::chrome() const | 66 Chrome& FrameHost::chrome() const |
| 68 { | 67 { |
| 69 return m_page->chrome(); | 68 return m_page->chrome(); |
| 70 } | 69 } |
| 71 | 70 |
| 72 UseCounter& FrameHost::useCounter() const | 71 UseCounter& FrameHost::useCounter() const |
| 73 { | 72 { |
| 74 return m_page->useCounter(); | 73 return m_page->useCounter(); |
| 75 } | 74 } |
| 76 | 75 |
| 77 InstrumentingAgents* FrameHost::instrumentingAgents() const | |
| 78 { | |
| 79 return m_page->inspectorController().instrumentingAgents(); | |
| 80 } | |
| 81 | |
| 82 float FrameHost::deviceScaleFactor() const | 76 float FrameHost::deviceScaleFactor() const |
| 83 { | 77 { |
| 84 return m_page->deviceScaleFactor(); | 78 return m_page->deviceScaleFactor(); |
| 85 } | 79 } |
| 86 | 80 |
| 87 PinchViewport& FrameHost::pinchViewport() const | 81 PinchViewport& FrameHost::pinchViewport() const |
| 88 { | 82 { |
| 89 return *m_pinchViewport; | 83 return *m_pinchViewport; |
| 90 } | 84 } |
| 91 | 85 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 122 | 116 |
| 123 int FrameHost::subframeCount() const | 117 int FrameHost::subframeCount() const |
| 124 { | 118 { |
| 125 #if ENABLE(ASSERT) | 119 #if ENABLE(ASSERT) |
| 126 checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame()); | 120 checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame()); |
| 127 #endif | 121 #endif |
| 128 return m_subframeCount; | 122 return m_subframeCount; |
| 129 } | 123 } |
| 130 | 124 |
| 131 } | 125 } |
| OLD | NEW |