OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. |
3 * | 3 * |
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
5 * | 5 * |
6 * Other contributors: | 6 * Other contributors: |
7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 if (curr->compositingState() != PaintsIntoOwnBacking && curr->compositin
gState() != PaintsIntoGroupedBacking) | 89 if (curr->compositingState() != PaintsIntoOwnBacking && curr->compositin
gState() != PaintsIntoGroupedBacking) |
90 curr->paintInvalidator().paintInvalidationIncludingNonCompositingDes
cendantsInternal(paintInvalidationContainer); | 90 curr->paintInvalidator().paintInvalidationIncludingNonCompositingDes
cendantsInternal(paintInvalidationContainer); |
91 } | 91 } |
92 } | 92 } |
93 | 93 |
94 void RenderLayerRepainter::setBackingNeedsPaintInvalidationInRect(const LayoutRe
ct& r) | 94 void RenderLayerRepainter::setBackingNeedsPaintInvalidationInRect(const LayoutRe
ct& r) |
95 { | 95 { |
96 // https://bugs.webkit.org/show_bug.cgi?id=61159 describes an unreproducible
crash here, | 96 // https://bugs.webkit.org/show_bug.cgi?id=61159 describes an unreproducible
crash here, |
97 // so assert but check that the layer is composited. | 97 // so assert but check that the layer is composited. |
98 ASSERT(m_renderer.compositingState() != NotComposited); | 98 ASSERT(m_renderer.compositingState() != NotComposited); |
| 99 |
| 100 WebInvalidationDebugAnnotations annotations = WebInvalidationDebugAnnotation
sNone; |
| 101 if (!m_renderer.hadPaintInvalidation()) |
| 102 annotations = WebInvalidationDebugAnnotationsFirstPaint; |
| 103 m_renderer.setHadPaintInvalidation(); |
| 104 |
99 // FIXME: generalize accessors to backing GraphicsLayers so that this code i
s squashing-agnostic. | 105 // FIXME: generalize accessors to backing GraphicsLayers so that this code i
s squashing-agnostic. |
100 if (m_renderer.layer()->groupedMapping()) { | 106 if (m_renderer.layer()->groupedMapping()) { |
101 LayoutRect paintInvalidationRect = r; | 107 LayoutRect paintInvalidationRect = r; |
102 paintInvalidationRect.move(m_renderer.layer()->subpixelAccumulation()); | 108 paintInvalidationRect.move(m_renderer.layer()->subpixelAccumulation()); |
103 if (GraphicsLayer* squashingLayer = m_renderer.layer()->groupedMapping()
->squashingLayer()) | 109 if (GraphicsLayer* squashingLayer = m_renderer.layer()->groupedMapping()
->squashingLayer()) |
104 squashingLayer->setNeedsDisplayInRect(pixelSnappedIntRect(paintInval
idationRect)); | 110 squashingLayer->setNeedsDisplayInRect(pixelSnappedIntRect(paintInval
idationRect), annotations); |
105 } else { | 111 } else { |
106 m_renderer.layer()->compositedLayerMapping()->setContentsNeedDisplayInRe
ct(r); | 112 m_renderer.layer()->compositedLayerMapping()->setContentsNeedDisplayInRe
ct(r, annotations); |
107 } | 113 } |
108 } | 114 } |
109 | 115 |
110 } // namespace blink | 116 } // namespace blink |
OLD | NEW |