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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 506553004: Make the compositing assert disabler for paint invalidation more targeted. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix. 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 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after
1488 1488
1489 // FIXME: This should be an assert, but editing/selection can trigger this c ase to invalidate 1489 // FIXME: This should be an assert, but editing/selection can trigger this c ase to invalidate
1490 // the selection. crbug.com/368140. 1490 // the selection. crbug.com/368140.
1491 if (!isRooted()) 1491 if (!isRooted())
1492 return; 1492 return;
1493 1493
1494 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintUsingContainer()", 1494 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintUsingContainer()",
1495 "object", this->debugName().ascii(), 1495 "object", this->debugName().ascii(),
1496 "info", jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString (invalidationReason))); 1496 "info", jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString (invalidationReason)));
1497 1497
1498 // For querying RenderLayer::compositingState()
1499 DisableCompositingQueryAsserts disabler;
1500
1501 if (paintInvalidationContainer->isRenderFlowThread()) { 1498 if (paintInvalidationContainer->isRenderFlowThread()) {
1502 toRenderFlowThread(paintInvalidationContainer)->paintInvalidationRectang leInRegions(r); 1499 toRenderFlowThread(paintInvalidationContainer)->paintInvalidationRectang leInRegions(r);
1503 return; 1500 return;
1504 } 1501 }
1505 1502
1506 if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->l ayer()->requiresFullLayerImageForFilters()) { 1503 if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->l ayer()->requiresFullLayerImageForFilters()) {
1507 paintInvalidationContainer->layer()->paintInvalidator().setFilterBackend NeedsPaintInvalidationInRect(r); 1504 paintInvalidationContainer->layer()->paintInvalidator().setFilterBackend NeedsPaintInvalidationInRect(r);
1508 return; 1505 return;
1509 } 1506 }
1510 1507
(...skipping 1943 matching lines...) Expand 10 before | Expand all | Expand 10 after
3454 { 3451 {
3455 if (object1) { 3452 if (object1) {
3456 const blink::RenderObject* root = object1; 3453 const blink::RenderObject* root = object1;
3457 while (root->parent()) 3454 while (root->parent())
3458 root = root->parent(); 3455 root = root->parent();
3459 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3456 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3460 } 3457 }
3461 } 3458 }
3462 3459
3463 #endif 3460 #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