| 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 1254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1265 toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r)
; | 1265 toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r)
; |
| 1266 return; | 1266 return; |
| 1267 } | 1267 } |
| 1268 } | 1268 } |
| 1269 | 1269 |
| 1270 void RenderObject::invalidatePaintForWholeRenderer() const | 1270 void RenderObject::invalidatePaintForWholeRenderer() const |
| 1271 { | 1271 { |
| 1272 if (!isRooted()) | 1272 if (!isRooted()) |
| 1273 return; | 1273 return; |
| 1274 | 1274 |
| 1275 // FIXME: really, we're in the paint invalidation phase here, and the follow
ing queries are legal. | |
| 1276 // Until those states are fully fledged, I'll just disable the ASSERTS. | |
| 1277 DisableCompositingQueryAsserts disabler; | |
| 1278 const RenderLayerModelObject* paintInvalidationContainer = containerForPaint
Invalidation(); | 1275 const RenderLayerModelObject* paintInvalidationContainer = containerForPaint
Invalidation(); |
| 1279 | 1276 |
| 1280 // FIXME: We should invalidate only previousPaintInvalidationRect, but for n
ow we invalidate both the previous | 1277 // FIXME: We should invalidate only previousPaintInvalidationRect, but for n
ow we invalidate both the previous |
| 1281 // and current paint rects to meet the expectations of some callers in some
cases (crbug.com/397555): | 1278 // and current paint rects to meet the expectations of some callers in some
cases (crbug.com/397555): |
| 1282 // - transform style change without a layout - crbug.com/394004; | 1279 // - transform style change without a layout - crbug.com/394004; |
| 1283 // - some objects don't save previousPaintInvalidationRect - crbug.com/39413
3. | 1280 // - some objects don't save previousPaintInvalidationRect - crbug.com/39413
3. |
| 1284 LayoutRect paintInvalidationRect = boundsRectForPaintInvalidation(paintInval
idationContainer); | 1281 LayoutRect paintInvalidationRect = boundsRectForPaintInvalidation(paintInval
idationContainer); |
| 1285 invalidatePaintUsingContainer(paintInvalidationContainer, paintInvalidationR
ect, InvalidationPaint); | 1282 invalidatePaintUsingContainer(paintInvalidationContainer, paintInvalidationR
ect, InvalidationPaint); |
| 1286 if (paintInvalidationRect != previousPaintInvalidationRect()) | 1283 if (paintInvalidationRect != previousPaintInvalidationRect()) |
| 1287 invalidatePaintUsingContainer(paintInvalidationContainer, previousPaintI
nvalidationRect(), InvalidationPaint); | 1284 invalidatePaintUsingContainer(paintInvalidationContainer, previousPaintI
nvalidationRect(), InvalidationPaint); |
| (...skipping 1276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2564 { | 2561 { |
| 2565 if (object1) { | 2562 if (object1) { |
| 2566 const blink::RenderObject* root = object1; | 2563 const blink::RenderObject* root = object1; |
| 2567 while (root->parent()) | 2564 while (root->parent()) |
| 2568 root = root->parent(); | 2565 root = root->parent(); |
| 2569 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 2566 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 2570 } | 2567 } |
| 2571 } | 2568 } |
| 2572 | 2569 |
| 2573 #endif | 2570 #endif |
| OLD | NEW |