| 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. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. |
| 7 * All rights reserved. | 7 * All rights reserved. |
| 8 * Copyright (C) 2009 Google Inc. All rights reserved. | 8 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. | 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. |
| 10 * (http://www.torchmobile.com/) | 10 * (http://www.torchmobile.com/) |
| (...skipping 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1191 | 1191 |
| 1192 PaintInvalidatorContextAdapter context(paintInvalidationState); | 1192 PaintInvalidatorContextAdapter context(paintInvalidationState); |
| 1193 | 1193 |
| 1194 const LayoutBoxModelObject& paintInvalidationContainer = | 1194 const LayoutBoxModelObject& paintInvalidationContainer = |
| 1195 paintInvalidationState.paintInvalidationContainer(); | 1195 paintInvalidationState.paintInvalidationContainer(); |
| 1196 DCHECK(paintInvalidationContainer == containerForPaintInvalidation()); | 1196 DCHECK(paintInvalidationContainer == containerForPaintInvalidation()); |
| 1197 | 1197 |
| 1198 ObjectPaintInvalidator paintInvalidator(*this); | 1198 ObjectPaintInvalidator paintInvalidator(*this); |
| 1199 context.oldVisualRect = visualRect(); | 1199 context.oldVisualRect = visualRect(); |
| 1200 context.oldLocation = paintInvalidator.locationInBacking(); | 1200 context.oldLocation = paintInvalidator.locationInBacking(); |
| 1201 context.newVisualRect = paintInvalidationState.computeVisualRectInBacking(); | 1201 LayoutRect newVisualRect = |
| 1202 context.newLocation = paintInvalidationState.computeLocationInBacking( | 1202 paintInvalidationState.computeVisualRectInBacking(); |
| 1203 context.newVisualRect.location()); | 1203 context.newLocation = |
| 1204 paintInvalidationState.computeLocationInBacking(newVisualRect.location()); |
| 1204 | 1205 |
| 1205 IntSize adjustment = | 1206 IntSize adjustment = |
| 1206 scrollAdjustmentForPaintInvalidation(paintInvalidationContainer); | 1207 scrollAdjustmentForPaintInvalidation(paintInvalidationContainer); |
| 1207 context.newLocation.move(adjustment); | 1208 context.newLocation.move(adjustment); |
| 1208 context.newVisualRect.move(adjustment); | 1209 newVisualRect.move(adjustment); |
| 1209 | 1210 |
| 1210 adjustVisualRectForRasterEffects(context.newVisualRect); | 1211 adjustVisualRectForRasterEffects(newVisualRect); |
| 1211 | 1212 |
| 1212 setVisualRect(context.newVisualRect); | 1213 setVisualRect(newVisualRect); |
| 1213 paintInvalidator.setLocationInBacking(context.newLocation); | 1214 paintInvalidator.setLocationInBacking(context.newLocation); |
| 1214 | 1215 |
| 1215 if (!shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState() && | 1216 if (!shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState() && |
| 1216 paintInvalidationState | 1217 paintInvalidationState |
| 1217 .forcedSubtreeInvalidationRectUpdateWithinContainerOnly()) { | 1218 .forcedSubtreeInvalidationRectUpdateWithinContainerOnly()) { |
| 1218 // We are done updating the visual rect. No other paint invalidation work | 1219 // We are done updating the visual rect. No other paint invalidation work |
| 1219 // to do for this object. | 1220 // to do for this object. |
| 1220 return PaintInvalidationNone; | 1221 return PaintInvalidationNone; |
| 1221 } | 1222 } |
| 1222 | 1223 |
| (...skipping 2371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3594 const blink::LayoutObject* root = object1; | 3595 const blink::LayoutObject* root = object1; |
| 3595 while (root->parent()) | 3596 while (root->parent()) |
| 3596 root = root->parent(); | 3597 root = root->parent(); |
| 3597 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3598 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3598 } else { | 3599 } else { |
| 3599 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3600 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
| 3600 } | 3601 } |
| 3601 } | 3602 } |
| 3602 | 3603 |
| 3603 #endif | 3604 #endif |
| OLD | NEW |