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

Side by Side Diff: Source/core/rendering/RenderObject.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, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1500 matching lines...) Expand 10 before | Expand all | Expand 10 after
1511 1511
1512 // FIXME: This should be an assert, but editing/selection can trigger this c ase to invalidate 1512 // FIXME: This should be an assert, but editing/selection can trigger this c ase to invalidate
1513 // the selection. crbug.com/368140. 1513 // the selection. crbug.com/368140.
1514 if (!isRooted()) 1514 if (!isRooted())
1515 return; 1515 return;
1516 1516
1517 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintUsingContainer()", 1517 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintUsingContainer()",
1518 "object", this->debugName().ascii(), 1518 "object", this->debugName().ascii(),
1519 "info", jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString (invalidationReason))); 1519 "info", jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString (invalidationReason)));
1520 1520
1521 // For querying RenderLayer::compositingState()
1522 DisableCompositingQueryAsserts disabler;
1523
1521 if (paintInvalidationContainer->isRenderFlowThread()) { 1524 if (paintInvalidationContainer->isRenderFlowThread()) {
1522 toRenderFlowThread(paintInvalidationContainer)->paintInvalidationRectang leInRegions(r); 1525 toRenderFlowThread(paintInvalidationContainer)->paintInvalidationRectang leInRegions(r);
1523 return; 1526 return;
1524 } 1527 }
1525 1528
1526 if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->l ayer()->requiresFullLayerImageForFilters()) { 1529 if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->l ayer()->requiresFullLayerImageForFilters()) {
1527 paintInvalidationContainer->layer()->paintInvalidator().setFilterBackend NeedsPaintInvalidationInRect(r); 1530 paintInvalidationContainer->layer()->paintInvalidator().setFilterBackend NeedsPaintInvalidationInRect(r);
1528 return; 1531 return;
1529 } 1532 }
1530 1533
(...skipping 1948 matching lines...) Expand 10 before | Expand all | Expand 10 after
3479 { 3482 {
3480 if (object1) { 3483 if (object1) {
3481 const blink::RenderObject* root = object1; 3484 const blink::RenderObject* root = object1;
3482 while (root->parent()) 3485 while (root->parent())
3483 root = root->parent(); 3486 root = root->parent();
3484 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3487 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3485 } 3488 }
3486 } 3489 }
3487 3490
3488 #endif 3491 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerScrollableArea.cpp ('k') | Source/core/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698