| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "core/frame/RootFrameViewport.h" | 5 #include "core/frame/RootFrameViewport.h" |
| 6 | 6 |
| 7 #include "core/frame/FrameView.h" | 7 #include "core/frame/FrameView.h" |
| 8 #include "core/layout/ScrollAlignment.h" | 8 #include "core/layout/ScrollAlignment.h" |
| 9 #include "platform/geometry/DoubleRect.h" | 9 #include "platform/geometry/DoubleRect.h" |
| 10 #include "platform/geometry/FloatRect.h" | 10 #include "platform/geometry/FloatRect.h" |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 GraphicsLayer* RootFrameViewport::layerForHorizontalScrollbar() const | 295 GraphicsLayer* RootFrameViewport::layerForHorizontalScrollbar() const |
| 296 { | 296 { |
| 297 return layoutViewport().layerForHorizontalScrollbar(); | 297 return layoutViewport().layerForHorizontalScrollbar(); |
| 298 } | 298 } |
| 299 | 299 |
| 300 GraphicsLayer* RootFrameViewport::layerForVerticalScrollbar() const | 300 GraphicsLayer* RootFrameViewport::layerForVerticalScrollbar() const |
| 301 { | 301 { |
| 302 return layoutViewport().layerForVerticalScrollbar(); | 302 return layoutViewport().layerForVerticalScrollbar(); |
| 303 } | 303 } |
| 304 | 304 |
| 305 GraphicsLayer* RootFrameViewport::layerForScrollCorner() const |
| 306 { |
| 307 return layoutViewport().layerForScrollCorner(); |
| 308 } |
| 309 |
| 305 ScrollResult RootFrameViewport::userScroll(ScrollGranularity granularity, const
FloatSize& delta) | 310 ScrollResult RootFrameViewport::userScroll(ScrollGranularity granularity, const
FloatSize& delta) |
| 306 { | 311 { |
| 307 // TODO(bokan/ymalik): Once smooth scrolling is permanently enabled we | 312 // TODO(bokan/ymalik): Once smooth scrolling is permanently enabled we |
| 308 // should be able to remove this method override and use the base class | 313 // should be able to remove this method override and use the base class |
| 309 // version: ScrollableArea::userScroll. | 314 // version: ScrollableArea::userScroll. |
| 310 | 315 |
| 311 updateScrollAnimator(); | 316 updateScrollAnimator(); |
| 312 | 317 |
| 313 // Distribute the scroll between the visual and layout viewport. | 318 // Distribute the scroll between the visual and layout viewport. |
| 314 | 319 |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 } | 423 } |
| 419 | 424 |
| 420 DEFINE_TRACE(RootFrameViewport) | 425 DEFINE_TRACE(RootFrameViewport) |
| 421 { | 426 { |
| 422 visitor->trace(m_visualViewport); | 427 visitor->trace(m_visualViewport); |
| 423 visitor->trace(m_layoutViewport); | 428 visitor->trace(m_layoutViewport); |
| 424 ScrollableArea::trace(visitor); | 429 ScrollableArea::trace(visitor); |
| 425 } | 430 } |
| 426 | 431 |
| 427 } // namespace blink | 432 } // namespace blink |
| OLD | NEW |