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

Side by Side Diff: Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

Issue 1315543004: Fix assert about lifecycle in setTracksPaintInvalidations for spv2 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ()s Created 5 years, 4 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 } 871 }
872 872
873 void DeprecatedPaintLayerCompositor::resetTrackedPaintInvalidationRects() 873 void DeprecatedPaintLayerCompositor::resetTrackedPaintInvalidationRects()
874 { 874 {
875 if (GraphicsLayer* rootLayer = rootGraphicsLayer()) 875 if (GraphicsLayer* rootLayer = rootGraphicsLayer())
876 resetTrackedPaintInvalidationRectsRecursive(rootLayer); 876 resetTrackedPaintInvalidationRectsRecursive(rootLayer);
877 } 877 }
878 878
879 void DeprecatedPaintLayerCompositor::setTracksPaintInvalidations(bool tracksPain tInvalidations) 879 void DeprecatedPaintLayerCompositor::setTracksPaintInvalidations(bool tracksPain tInvalidations)
880 { 880 {
881 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean); 881 ASSERT(lifecycle().state() ==
882 (RuntimeEnabledFeatures::slimmingPaintV2Enabled()
883 ? DocumentLifecycle::CompositingForSlimmingPaintV2Clean : DocumentLi fecycle::PaintInvalidationClean));
882 m_isTrackingPaintInvalidations = tracksPaintInvalidations; 884 m_isTrackingPaintInvalidations = tracksPaintInvalidations;
883 } 885 }
884 886
885 bool DeprecatedPaintLayerCompositor::isTrackingPaintInvalidations() const 887 bool DeprecatedPaintLayerCompositor::isTrackingPaintInvalidations() const
886 { 888 {
887 return m_isTrackingPaintInvalidations; 889 return m_isTrackingPaintInvalidations;
888 } 890 }
889 891
890 bool DeprecatedPaintLayerCompositor::requiresHorizontalScrollbarLayer() const 892 bool DeprecatedPaintLayerCompositor::requiresHorizontalScrollbarLayer() const
891 { 893 {
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
1201 } else if (graphicsLayer == m_scrollLayer.get()) { 1203 } else if (graphicsLayer == m_scrollLayer.get()) {
1202 name = "LocalFrame Scrolling Layer"; 1204 name = "LocalFrame Scrolling Layer";
1203 } else { 1205 } else {
1204 ASSERT_NOT_REACHED(); 1206 ASSERT_NOT_REACHED();
1205 } 1207 }
1206 1208
1207 return name; 1209 return name;
1208 } 1210 }
1209 1211
1210 } // namespace blink 1212 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698