| 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 2860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2871 | 2871 |
| 2872 scrollContentsIfNeededRecursive(); | 2872 scrollContentsIfNeededRecursive(); |
| 2873 DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() || | 2873 DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() || |
| 2874 lifecycle().state() >= DocumentLifecycle::CompositingClean); | 2874 lifecycle().state() >= DocumentLifecycle::CompositingClean); |
| 2875 | 2875 |
| 2876 m_frame->host()->globalRootScrollerController().didUpdateCompositing(); | 2876 m_frame->host()->globalRootScrollerController().didUpdateCompositing(); |
| 2877 | 2877 |
| 2878 if (targetState >= DocumentLifecycle::PrePaintClean) { | 2878 if (targetState >= DocumentLifecycle::PrePaintClean) { |
| 2879 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) | 2879 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) |
| 2880 invalidateTreeIfNeededRecursive(); | 2880 invalidateTreeIfNeededRecursive(); |
| 2881 if (view.compositor()->inCompositingMode()) | 2881 |
| 2882 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); | 2882 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
| 2883 if (view.compositor()->inCompositingMode()) |
| 2884 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); |
| 2885 } |
| 2883 | 2886 |
| 2884 updateCompositedSelectionIfNeeded(); | 2887 updateCompositedSelectionIfNeeded(); |
| 2885 } | 2888 } |
| 2886 } | 2889 } |
| 2887 | 2890 |
| 2888 if (targetState >= DocumentLifecycle::PrePaintClean) { | 2891 if (targetState >= DocumentLifecycle::PrePaintClean) { |
| 2889 updatePaintProperties(); | 2892 updatePaintProperties(); |
| 2890 } | 2893 } |
| 2891 | 2894 |
| 2892 if (targetState == DocumentLifecycle::PaintClean) { | 2895 if (targetState == DocumentLifecycle::PaintClean) { |
| (...skipping 1766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4659 DCHECK(m_frame->isMainFrame()); | 4662 DCHECK(m_frame->isMainFrame()); |
| 4660 return m_initialViewportSize.width(); | 4663 return m_initialViewportSize.width(); |
| 4661 } | 4664 } |
| 4662 | 4665 |
| 4663 int FrameView::initialViewportHeight() const { | 4666 int FrameView::initialViewportHeight() const { |
| 4664 DCHECK(m_frame->isMainFrame()); | 4667 DCHECK(m_frame->isMainFrame()); |
| 4665 return m_initialViewportSize.height(); | 4668 return m_initialViewportSize.height(); |
| 4666 } | 4669 } |
| 4667 | 4670 |
| 4668 } // namespace blink | 4671 } // namespace blink |
| OLD | NEW |