| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 #include "sky/engine/core/rendering/RenderGeometryMap.h" | 51 #include "sky/engine/core/rendering/RenderGeometryMap.h" |
| 52 #include "sky/engine/core/rendering/RenderImage.h" | 52 #include "sky/engine/core/rendering/RenderImage.h" |
| 53 #include "sky/engine/core/rendering/RenderImageResourceStyleImage.h" | 53 #include "sky/engine/core/rendering/RenderImageResourceStyleImage.h" |
| 54 #include "sky/engine/core/rendering/RenderInline.h" | 54 #include "sky/engine/core/rendering/RenderInline.h" |
| 55 #include "sky/engine/core/rendering/RenderLayer.h" | 55 #include "sky/engine/core/rendering/RenderLayer.h" |
| 56 #include "sky/engine/core/rendering/RenderObjectInlines.h" | 56 #include "sky/engine/core/rendering/RenderObjectInlines.h" |
| 57 #include "sky/engine/core/rendering/RenderParagraph.h" | 57 #include "sky/engine/core/rendering/RenderParagraph.h" |
| 58 #include "sky/engine/core/rendering/RenderText.h" | 58 #include "sky/engine/core/rendering/RenderText.h" |
| 59 #include "sky/engine/core/rendering/RenderTheme.h" | 59 #include "sky/engine/core/rendering/RenderTheme.h" |
| 60 #include "sky/engine/core/rendering/RenderView.h" | 60 #include "sky/engine/core/rendering/RenderView.h" |
| 61 #include "sky/engine/core/rendering/compositing/RenderLayerCompositor.h" | |
| 62 #include "sky/engine/core/rendering/style/ShadowList.h" | 61 #include "sky/engine/core/rendering/style/ShadowList.h" |
| 63 #include "sky/engine/platform/JSONValues.h" | 62 #include "sky/engine/platform/JSONValues.h" |
| 64 #include "sky/engine/platform/Partitions.h" | 63 #include "sky/engine/platform/Partitions.h" |
| 65 #include "sky/engine/platform/TraceEvent.h" | 64 #include "sky/engine/platform/TraceEvent.h" |
| 66 #include "sky/engine/platform/TracedValue.h" | 65 #include "sky/engine/platform/TracedValue.h" |
| 67 #include "sky/engine/platform/geometry/TransformState.h" | 66 #include "sky/engine/platform/geometry/TransformState.h" |
| 68 #include "sky/engine/platform/graphics/GraphicsContext.h" | 67 #include "sky/engine/platform/graphics/GraphicsContext.h" |
| 69 #include "sky/engine/wtf/RefCountedLeakCounter.h" | 68 #include "sky/engine/wtf/RefCountedLeakCounter.h" |
| 70 #include "sky/engine/wtf/text/StringBuilder.h" | 69 #include "sky/engine/wtf/text/StringBuilder.h" |
| 71 #include "sky/engine/wtf/text/WTFString.h" | 70 #include "sky/engine/wtf/text/WTFString.h" |
| (...skipping 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1279 | 1278 |
| 1280 if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->l
ayer()->requiresFullLayerImageForFilters()) { | 1279 if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->l
ayer()->requiresFullLayerImageForFilters()) { |
| 1281 paintInvalidationContainer->layer()->paintInvalidator().setFilterBackend
NeedsPaintInvalidationInRect(r); | 1280 paintInvalidationContainer->layer()->paintInvalidator().setFilterBackend
NeedsPaintInvalidationInRect(r); |
| 1282 return; | 1281 return; |
| 1283 } | 1282 } |
| 1284 | 1283 |
| 1285 if (paintInvalidationContainer->isRenderView()) { | 1284 if (paintInvalidationContainer->isRenderView()) { |
| 1286 toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r)
; | 1285 toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r)
; |
| 1287 return; | 1286 return; |
| 1288 } | 1287 } |
| 1289 if (paintInvalidationContainer->view()->usesCompositing()) { | |
| 1290 ASSERT(paintInvalidationContainer->hasLayer() && (paintInvalidationConta
iner->layer()->compositingState() == PaintsIntoOwnBacking || paintInvalidationCo
ntainer->layer()->compositingState() == PaintsIntoGroupedBacking)); | |
| 1291 paintInvalidationContainer->layer()->paintInvalidator().setBackingNeedsP
aintInvalidationInRect(r); | |
| 1292 } | |
| 1293 } | 1288 } |
| 1294 | 1289 |
| 1295 void RenderObject::invalidatePaintForWholeRenderer() const | 1290 void RenderObject::invalidatePaintForWholeRenderer() const |
| 1296 { | 1291 { |
| 1297 if (!isRooted()) | 1292 if (!isRooted()) |
| 1298 return; | 1293 return; |
| 1299 | 1294 |
| 1300 // FIXME: really, we're in the paint invalidation phase here, and the follow
ing queries are legal. | 1295 // FIXME: really, we're in the paint invalidation phase here, and the follow
ing queries are legal. |
| 1301 // Until those states are fully fledged, I'll just disable the ASSERTS. | 1296 // Until those states are fully fledged, I'll just disable the ASSERTS. |
| 1302 DisableCompositingQueryAsserts disabler; | 1297 DisableCompositingQueryAsserts disabler; |
| (...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2602 { | 2597 { |
| 2603 if (object1) { | 2598 if (object1) { |
| 2604 const blink::RenderObject* root = object1; | 2599 const blink::RenderObject* root = object1; |
| 2605 while (root->parent()) | 2600 while (root->parent()) |
| 2606 root = root->parent(); | 2601 root = root->parent(); |
| 2607 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 2602 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 2608 } | 2603 } |
| 2609 } | 2604 } |
| 2610 | 2605 |
| 2611 #endif | 2606 #endif |
| OLD | NEW |