OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
10 * | 10 * |
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
648 } | 648 } |
649 | 649 |
650 void FrameView::setContentsSize(const IntSize& size) { | 650 void FrameView::setContentsSize(const IntSize& size) { |
651 if (size == contentsSize()) | 651 if (size == contentsSize()) |
652 return; | 652 return; |
653 | 653 |
654 m_contentsSize = size; | 654 m_contentsSize = size; |
655 updateScrollbars(); | 655 updateScrollbars(); |
656 ScrollableArea::contentsResized(); | 656 ScrollableArea::contentsResized(); |
657 | 657 |
658 if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() && | |
659 !RuntimeEnabledFeatures::rootLayerScrollingEnabled()) | |
660 setNeedsPaintPropertyUpdate(); | |
661 | |
662 Page* page = frame().page(); | 658 Page* page = frame().page(); |
663 if (!page) | 659 if (!page) |
664 return; | 660 return; |
665 | 661 |
666 updateParentScrollableAreaSet(); | 662 updateParentScrollableAreaSet(); |
667 | 663 |
668 page->chromeClient().contentsSizeChanged(m_frame.get(), size); | 664 page->chromeClient().contentsSizeChanged(m_frame.get(), size); |
669 | 665 |
670 // Ensure the scrollToFragmentAnchor is called before | 666 // Ensure the scrollToFragmentAnchor is called before |
671 // restoreScrollPositionAndViewState when reload | 667 // restoreScrollPositionAndViewState when reload |
(...skipping 3338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4010 scrollOriginChanged()) | 4006 scrollOriginChanged()) |
4011 updateScrollbars(); | 4007 updateScrollbars(); |
4012 } | 4008 } |
4013 | 4009 |
4014 void FrameView::updateScrollbars() { | 4010 void FrameView::updateScrollbars() { |
4015 m_needsScrollbarsUpdate = false; | 4011 m_needsScrollbarsUpdate = false; |
4016 | 4012 |
4017 if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) | 4013 if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) |
4018 return; | 4014 return; |
4019 | 4015 |
4016 if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) | |
4017 setNeedsPaintPropertyUpdate(); | |
Xianzhu
2016/12/21 23:46:34
This is moved here because updateScrollbars() is c
| |
4018 | |
4020 // Avoid drawing two sets of scrollbars when visual viewport is enabled. | 4019 // Avoid drawing two sets of scrollbars when visual viewport is enabled. |
4021 if (visualViewportSuppliesScrollbars()) { | 4020 if (visualViewportSuppliesScrollbars()) { |
4022 m_scrollbarManager.setHasHorizontalScrollbar(false); | 4021 m_scrollbarManager.setHasHorizontalScrollbar(false); |
4023 m_scrollbarManager.setHasVerticalScrollbar(false); | 4022 m_scrollbarManager.setHasVerticalScrollbar(false); |
4024 adjustScrollOffsetFromUpdateScrollbars(); | 4023 adjustScrollOffsetFromUpdateScrollbars(); |
4025 return; | 4024 return; |
4026 } | 4025 } |
4027 | 4026 |
4028 if (m_inUpdateScrollbars) | 4027 if (m_inUpdateScrollbars) |
4029 return; | 4028 return; |
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4876 reason < MainThreadScrollingReason::kMainThreadScrollingReasonCount; | 4875 reason < MainThreadScrollingReason::kMainThreadScrollingReasonCount; |
4877 ++reason) { | 4876 ++reason) { |
4878 if (m_mainThreadScrollingReasonsCounter[reason] > 0) { | 4877 if (m_mainThreadScrollingReasonsCounter[reason] > 0) { |
4879 reasons |= 1 << (reason - 1); | 4878 reasons |= 1 << (reason - 1); |
4880 } | 4879 } |
4881 } | 4880 } |
4882 return reasons; | 4881 return reasons; |
4883 } | 4882 } |
4884 | 4883 |
4885 } // namespace blink | 4884 } // namespace blink |
OLD | NEW |