Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1504 | 1504 |
| 1505 // FIXME: This should be an assert, but editing/selection can trigger this c ase to invalidate | 1505 // FIXME: This should be an assert, but editing/selection can trigger this c ase to invalidate |
| 1506 // the selection. crbug.com/368140. | 1506 // the selection. crbug.com/368140. |
| 1507 if (!isRooted()) | 1507 if (!isRooted()) |
| 1508 return; | 1508 return; |
| 1509 | 1509 |
| 1510 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintUsingContainer()", | 1510 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject: :invalidatePaintUsingContainer()", |
| 1511 "object", this->debugName().ascii(), | 1511 "object", this->debugName().ascii(), |
| 1512 "info", TracedValue::fromJSONValue(jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString(invalidationReason)))); | 1512 "info", TracedValue::fromJSONValue(jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString(invalidationReason)))); |
| 1513 | 1513 |
| 1514 // FIXME: Don't read compositing state here since we do this in the middle o f recalc/layout. | 1514 // For querying RenderLayer::compositingState() |
| 1515 DisableCompositingQueryAsserts disabler; | 1515 DisableCompositingQueryAsserts disabler; |
|
dsinclair
2014/06/13 17:50:04
Can this be moved down into the if (v->usesComposi
chrishtr
2014/06/13 22:46:49
Per top-level comments, it can't be moved down.
| |
| 1516 if (paintInvalidationContainer->compositingState() == PaintsIntoGroupedBacki ng) { | |
| 1517 ASSERT(paintInvalidationContainer->groupedMapping()); | |
| 1518 ASSERT(paintInvalidationContainer->layer()); | |
| 1519 | |
| 1520 // Not clean, but if squashing layer does not yet exist here (e.g. paint invalidation coming from within recomputing compositing requirements) | |
| 1521 // then it's ok to just exit here, since the squashing layer will get in validate when it is newly created. | |
| 1522 if (!paintInvalidationContainer->groupedMapping()->squashingLayer()) | |
| 1523 return; | |
| 1524 } | |
| 1525 | 1516 |
| 1526 if (paintInvalidationContainer->isRenderFlowThread()) { | 1517 if (paintInvalidationContainer->isRenderFlowThread()) { |
| 1527 toRenderFlowThread(paintInvalidationContainer)->repaintRectangleInRegion s(r); | 1518 toRenderFlowThread(paintInvalidationContainer)->repaintRectangleInRegion s(r); |
| 1528 return; | 1519 return; |
| 1529 } | 1520 } |
| 1530 | 1521 |
| 1531 if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->l ayer()->requiresFullLayerImageForFilters()) { | 1522 if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->l ayer()->requiresFullLayerImageForFilters()) { |
| 1532 paintInvalidationContainer->layer()->repainter().setFilterBackendNeedsRe paintingInRect(r); | 1523 paintInvalidationContainer->layer()->repainter().setFilterBackendNeedsRe paintingInRect(r); |
| 1533 return; | 1524 return; |
| 1534 } | 1525 } |
| (...skipping 2015 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3550 { | 3541 { |
| 3551 if (object1) { | 3542 if (object1) { |
| 3552 const WebCore::RenderObject* root = object1; | 3543 const WebCore::RenderObject* root = object1; |
| 3553 while (root->parent()) | 3544 while (root->parent()) |
| 3554 root = root->parent(); | 3545 root = root->parent(); |
| 3555 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3546 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3556 } | 3547 } |
| 3557 } | 3548 } |
| 3558 | 3549 |
| 3559 #endif | 3550 #endif |
| OLD | NEW |