| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "bindings/core/v8/NodeOrString.h" | 5 #include "bindings/core/v8/NodeOrString.h" |
| 6 #include "core/dom/ClientRect.h" | 6 #include "core/dom/ClientRect.h" |
| 7 #include "core/frame/BrowserControls.h" | 7 #include "core/frame/BrowserControls.h" |
| 8 #include "core/frame/FrameHost.h" | 8 #include "core/frame/FrameHost.h" |
| 9 #include "core/frame/FrameView.h" | 9 #include "core/frame/FrameView.h" |
| 10 #include "core/frame/RootFrameViewport.h" | 10 #include "core/frame/RootFrameViewport.h" |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 LocalFrame* mainFrame() const { | 106 LocalFrame* mainFrame() const { |
| 107 return webViewImpl()->mainFrameImpl()->frame(); | 107 return webViewImpl()->mainFrameImpl()->frame(); |
| 108 } | 108 } |
| 109 | 109 |
| 110 WebLocalFrame* mainWebFrame() const { return webViewImpl()->mainFrameImpl(); } | 110 WebLocalFrame* mainWebFrame() const { return webViewImpl()->mainFrameImpl(); } |
| 111 | 111 |
| 112 FrameView* mainFrameView() const { | 112 FrameView* mainFrameView() const { |
| 113 return webViewImpl()->mainFrameImpl()->frame()->view(); | 113 return webViewImpl()->mainFrameImpl()->frame()->view(); |
| 114 } | 114 } |
| 115 | 115 |
| 116 VisualViewport& visualViewport() const { | 116 VisualViewport& visualViewport() const { return page().visualViewport(); } |
| 117 return frameHost().visualViewport(); | |
| 118 } | |
| 119 | 117 |
| 120 BrowserControls& browserControls() const { return page().browserControls(); } | 118 BrowserControls& browserControls() const { return page().browserControls(); } |
| 121 | 119 |
| 122 Node* effectiveRootScroller(Document* doc) const { | 120 Node* effectiveRootScroller(Document* doc) const { |
| 123 return &doc->rootScrollerController().effectiveRootScroller(); | 121 return &doc->rootScrollerController().effectiveRootScroller(); |
| 124 } | 122 } |
| 125 | 123 |
| 126 WebCoalescedInputEvent generateTouchGestureEvent(WebInputEvent::Type type, | 124 WebCoalescedInputEvent generateTouchGestureEvent(WebInputEvent::Type type, |
| 127 int deltaX = 0, | 125 int deltaX = 0, |
| 128 int deltaY = 0) { | 126 int deltaY = 0) { |
| (...skipping 1182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1311 // FrameView without a layout. | 1309 // FrameView without a layout. |
| 1312 iframe->remove(); | 1310 iframe->remove(); |
| 1313 | 1311 |
| 1314 EXPECT_EQ(mainFrameView()->layoutViewportScrollableArea(), | 1312 EXPECT_EQ(mainFrameView()->layoutViewportScrollableArea(), |
| 1315 &mainFrameView()->getRootFrameViewport()->layoutViewport()); | 1313 &mainFrameView()->getRootFrameViewport()->layoutViewport()); |
| 1316 } | 1314 } |
| 1317 | 1315 |
| 1318 } // namespace | 1316 } // namespace |
| 1319 | 1317 |
| 1320 } // namespace blink | 1318 } // namespace blink |
| OLD | NEW |