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