| 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 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1209 context.newBounds = | 1209 context.newBounds = |
| 1210 paintInvalidationState.computePaintInvalidationRectInBacking(); | 1210 paintInvalidationState.computePaintInvalidationRectInBacking(); |
| 1211 context.newLocation = | 1211 context.newLocation = |
| 1212 paintInvalidationState.computePositionFromPaintInvalidationBacking(); | 1212 paintInvalidationState.computePositionFromPaintInvalidationBacking(); |
| 1213 | 1213 |
| 1214 IntSize adjustment = | 1214 IntSize adjustment = |
| 1215 scrollAdjustmentForPaintInvalidation(paintInvalidationContainer); | 1215 scrollAdjustmentForPaintInvalidation(paintInvalidationContainer); |
| 1216 context.newLocation.move(adjustment); | 1216 context.newLocation.move(adjustment); |
| 1217 context.newBounds.move(adjustment); | 1217 context.newBounds.move(adjustment); |
| 1218 | 1218 |
| 1219 adjustVisualRectForRasterEffects(context.newBounds); |
| 1220 |
| 1219 setPreviousPaintInvalidationRect(context.newBounds); | 1221 setPreviousPaintInvalidationRect(context.newBounds); |
| 1220 setPreviousPositionFromPaintInvalidationBacking(context.newLocation); | 1222 setPreviousPositionFromPaintInvalidationBacking(context.newLocation); |
| 1221 | 1223 |
| 1222 if (!shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState() && | 1224 if (!shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState() && |
| 1223 paintInvalidationState | 1225 paintInvalidationState |
| 1224 .forcedSubtreeInvalidationRectUpdateWithinContainerOnly()) { | 1226 .forcedSubtreeInvalidationRectUpdateWithinContainerOnly()) { |
| 1225 // We are done updating the paint invalidation rect. No other paint | 1227 // We are done updating the paint invalidation rect. No other paint |
| 1226 // invalidation work to do for this object. | 1228 // invalidation work to do for this object. |
| 1227 return PaintInvalidationNone; | 1229 return PaintInvalidationNone; |
| 1228 } | 1230 } |
| (...skipping 2308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3537 const blink::LayoutObject* root = object1; | 3539 const blink::LayoutObject* root = object1; |
| 3538 while (root->parent()) | 3540 while (root->parent()) |
| 3539 root = root->parent(); | 3541 root = root->parent(); |
| 3540 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3542 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3541 } else { | 3543 } else { |
| 3542 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3544 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
| 3543 } | 3545 } |
| 3544 } | 3546 } |
| 3545 | 3547 |
| 3546 #endif | 3548 #endif |
| OLD | NEW |