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

Unified Diff: Source/core/rendering/RenderView.cpp

Issue 516603003: Revert of Make the compositing assert disabler for paint invalidation more targeted. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/compositing/RenderLayerCompositor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderView.cpp
diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp
index 6f2ee39eb12e6c96b822a4226e6982519d25bde2..de8d07d1456ce345bfe93fa1cd4eddafd00e8485 100644
--- a/Source/core/rendering/RenderView.cpp
+++ b/Source/core/rendering/RenderView.cpp
@@ -589,10 +589,6 @@
{
HashSet<RenderBlock*> processedBlocks;
- // For querying RenderLayer::compositingState()
- // FIXME: this may be wrong. crbug.com/407416
- DisableCompositingQueryAsserts disabler;
-
RenderObject* end = rendererAfterPosition(m_selectionEnd, m_selectionEndPos);
for (RenderObject* o = m_selectionStart; o && o != end; o = o->nextInPreOrder()) {
if (!o->canBeSelectionLeaf() && o != m_selectionStart && o != m_selectionEnd)
@@ -746,10 +742,6 @@
if (!m_frameView || blockPaintInvalidationMode == PaintInvalidationNothing)
return;
- // For querying RenderLayer::compositingState()
- // FIXME: this is wrong, selection should not cause eager invalidation. crbug.com/407416
- DisableCompositingQueryAsserts disabler;
-
// Have any of the old selected objects changed compared to the new selection?
for (SelectedObjectMap::iterator i = oldSelectedObjects.begin(); i != oldObjectsEnd; ++i) {
RenderObject* obj = i->key;
@@ -802,10 +794,6 @@
void RenderView::clearSelection()
{
- // For querying RenderLayer::compositingState()
- // This is correct, since destroying render objects needs to cause eager paint invalidations.
- DisableCompositingQueryAsserts disabler;
-
layer()->invalidatePaintForBlockSelectionGaps();
setSelection(0, -1, 0, -1, PaintInvalidationNewMinusOld);
}
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/compositing/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698