Chromium Code Reviews| 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 2852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2863 | 2863 |
| 2864 scrollContentsIfNeededRecursive(); | 2864 scrollContentsIfNeededRecursive(); |
| 2865 DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() || | 2865 DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() || |
| 2866 lifecycle().state() >= DocumentLifecycle::CompositingClean); | 2866 lifecycle().state() >= DocumentLifecycle::CompositingClean); |
| 2867 | 2867 |
| 2868 m_frame->host()->globalRootScrollerController().didUpdateCompositing(); | 2868 m_frame->host()->globalRootScrollerController().didUpdateCompositing(); |
| 2869 | 2869 |
| 2870 if (targetState >= DocumentLifecycle::PrePaintClean) { | 2870 if (targetState >= DocumentLifecycle::PrePaintClean) { |
| 2871 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) | 2871 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) |
| 2872 invalidateTreeIfNeededRecursive(); | 2872 invalidateTreeIfNeededRecursive(); |
| 2873 if (view.compositor()->inCompositingMode()) | 2873 |
| 2874 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); | 2874 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
|
chrishtr
2016/12/06 23:56:07
This code is not needed for SPv2, and tries to cal
| |
| 2875 if (view.compositor()->inCompositingMode()) | |
| 2876 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); | |
| 2877 } | |
| 2875 | 2878 |
| 2876 updateCompositedSelectionIfNeeded(); | 2879 updateCompositedSelectionIfNeeded(); |
| 2877 } | 2880 } |
| 2878 } | 2881 } |
| 2879 | 2882 |
| 2880 if (targetState >= DocumentLifecycle::PrePaintClean) { | 2883 if (targetState >= DocumentLifecycle::PrePaintClean) { |
| 2881 updatePaintProperties(); | 2884 updatePaintProperties(); |
| 2882 } | 2885 } |
| 2883 | 2886 |
| 2884 if (targetState == DocumentLifecycle::PaintClean) { | 2887 if (targetState == DocumentLifecycle::PaintClean) { |
| (...skipping 1772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4657 DCHECK(m_frame->isMainFrame()); | 4660 DCHECK(m_frame->isMainFrame()); |
| 4658 return m_initialViewportSize.width(); | 4661 return m_initialViewportSize.width(); |
| 4659 } | 4662 } |
| 4660 | 4663 |
| 4661 int FrameView::initialViewportHeight() const { | 4664 int FrameView::initialViewportHeight() const { |
| 4662 DCHECK(m_frame->isMainFrame()); | 4665 DCHECK(m_frame->isMainFrame()); |
| 4663 return m_initialViewportSize.height(); | 4666 return m_initialViewportSize.height(); |
| 4664 } | 4667 } |
| 4665 | 4668 |
| 4666 } // namespace blink | 4669 } // namespace blink |
| OLD | NEW |