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 2138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2149 if (!diff.needsFullLayout()) { | 2149 if (!diff.needsFullLayout()) { |
| 2150 if (updatedDiff.needsFullLayout()) | 2150 if (updatedDiff.needsFullLayout()) |
| 2151 setNeedsLayoutAndPrefWidthsRecalc(); | 2151 setNeedsLayoutAndPrefWidthsRecalc(); |
| 2152 else if (updatedDiff.needsPositionedMovementLayout()) | 2152 else if (updatedDiff.needsPositionedMovementLayout()) |
| 2153 setNeedsPositionedMovementLayout(); | 2153 setNeedsPositionedMovementLayout(); |
| 2154 } | 2154 } |
| 2155 | 2155 |
| 2156 if (contextSensitiveProperties & ContextSensitivePropertyTransform && !needs Layout()) { | 2156 if (contextSensitiveProperties & ContextSensitivePropertyTransform && !needs Layout()) { |
| 2157 if (RenderBlock* container = containingBlock()) | 2157 if (RenderBlock* container = containingBlock()) |
| 2158 container->setNeedsOverflowRecalcAfterStyleChange(); | 2158 container->setNeedsOverflowRecalcAfterStyleChange(); |
| 2159 if (isBox()) | |
| 2160 toRenderBox(this)->updateLayerTransform(); | |
|
ajuma
2014/06/17 23:21:39
This should be unnecessary given the above call to
| |
| 2161 } | 2159 } |
| 2162 | 2160 |
| 2163 if (updatedDiff.needsRepaint()) { | 2161 if (updatedDiff.needsRepaint()) { |
| 2164 // Repaint with the new style, e.g., for example if we go from not havin g | 2162 // Repaint with the new style, e.g., for example if we go from not havin g |
| 2165 // an outline to having an outline. | 2163 // an outline to having an outline. |
| 2166 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled() && needsLayout() ) | 2164 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled() && needsLayout() ) |
| 2167 setShouldDoFullPaintInvalidationAfterLayout(true); | 2165 setShouldDoFullPaintInvalidationAfterLayout(true); |
| 2168 else if (!selfNeedsLayout()) | 2166 else if (!selfNeedsLayout()) |
| 2169 paintInvalidationForWholeRenderer(); | 2167 paintInvalidationForWholeRenderer(); |
| 2170 } | 2168 } |
| (...skipping 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3550 { | 3548 { |
| 3551 if (object1) { | 3549 if (object1) { |
| 3552 const WebCore::RenderObject* root = object1; | 3550 const WebCore::RenderObject* root = object1; |
| 3553 while (root->parent()) | 3551 while (root->parent()) |
| 3554 root = root->parent(); | 3552 root = root->parent(); |
| 3555 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3553 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3556 } | 3554 } |
| 3557 } | 3555 } |
| 3558 | 3556 |
| 3559 #endif | 3557 #endif |
| OLD | NEW |