Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(325)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2549353002: Implement PaintLayer::scrollsWithViewport for SPv2. (Closed)
Patch Set: none Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2856 matching lines...) Expand 10 before | Expand all | Expand 10 after
2867 2867
2868 scrollContentsIfNeededRecursive(); 2868 scrollContentsIfNeededRecursive();
2869 DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() || 2869 DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() ||
2870 lifecycle().state() >= DocumentLifecycle::CompositingClean); 2870 lifecycle().state() >= DocumentLifecycle::CompositingClean);
2871 2871
2872 m_frame->host()->globalRootScrollerController().didUpdateCompositing(); 2872 m_frame->host()->globalRootScrollerController().didUpdateCompositing();
2873 2873
2874 if (targetState >= DocumentLifecycle::PrePaintClean) { 2874 if (targetState >= DocumentLifecycle::PrePaintClean) {
2875 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) 2875 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
2876 invalidateTreeIfNeededRecursive(); 2876 invalidateTreeIfNeededRecursive();
2877 if (view.compositor()->inCompositingMode()) 2877
2878 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); 2878 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
2879 if (view.compositor()->inCompositingMode())
2880 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
2881 }
2879 2882
2880 updateCompositedSelectionIfNeeded(); 2883 updateCompositedSelectionIfNeeded();
2881 } 2884 }
2882 } 2885 }
2883 2886
2884 if (targetState >= DocumentLifecycle::PrePaintClean) { 2887 if (targetState >= DocumentLifecycle::PrePaintClean) {
2885 updatePaintProperties(); 2888 updatePaintProperties();
2886 } 2889 }
2887 2890
2888 if (targetState == DocumentLifecycle::PaintClean) { 2891 if (targetState == DocumentLifecycle::PaintClean) {
(...skipping 1771 matching lines...) Expand 10 before | Expand all | Expand 10 after
4660 DCHECK(m_frame->isMainFrame()); 4663 DCHECK(m_frame->isMainFrame());
4661 return m_initialViewportSize.width(); 4664 return m_initialViewportSize.width();
4662 } 4665 }
4663 4666
4664 int FrameView::initialViewportHeight() const { 4667 int FrameView::initialViewportHeight() const {
4665 DCHECK(m_frame->isMainFrame()); 4668 DCHECK(m_frame->isMainFrame());
4666 return m_initialViewportSize.height(); 4669 return m_initialViewportSize.height();
4667 } 4670 }
4668 4671
4669 } // namespace blink 4672 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698