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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
306 m_isPaginated = false; | 306 m_isPaginated = false; |
307 m_enclosingPaginationLayer = 0; | 307 m_enclosingPaginationLayer = 0; |
308 } | 308 } |
309 | 309 |
310 repainter().repaintAfterLayout(geometryMap, flags & CheckForRepaint); | 310 repainter().repaintAfterLayout(geometryMap, flags & CheckForRepaint); |
311 | 311 |
312 // Go ahead and update the reflection's position and size. | 312 // Go ahead and update the reflection's position and size. |
313 if (m_reflectionInfo) | 313 if (m_reflectionInfo) |
314 m_reflectionInfo->reflection()->layout(); | 314 m_reflectionInfo->reflection()->layout(); |
315 | 315 |
316 // Clear the IsCompositingUpdateRoot flag once we've found the first composi
ting layer in this update. | |
317 bool isUpdateRoot = (flags & IsCompositingUpdateRoot); | |
318 if (hasCompositedLayerMapping()) | |
319 flags &= ~IsCompositingUpdateRoot; | |
320 | |
321 if (useRegionBasedColumns() && renderer()->isInFlowRenderFlowThread()) { | 316 if (useRegionBasedColumns() && renderer()->isInFlowRenderFlowThread()) { |
322 updatePagination(); | 317 updatePagination(); |
323 flags |= UpdatePagination; | 318 flags |= UpdatePagination; |
324 } | 319 } |
325 | 320 |
326 if (renderer()->hasColumns()) | 321 if (renderer()->hasColumns()) |
327 flags |= UpdatePagination; | 322 flags |= UpdatePagination; |
328 | 323 |
329 for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) | 324 for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) |
330 child->updateLayerPositions(geometryMap, flags); | 325 child->updateLayerPositions(geometryMap, flags); |
331 | 326 |
332 if ((flags & UpdateCompositingLayers) && hasCompositedLayerMapping()) | 327 if ((flags & NeedsFullRepaintInBacking) && hasCompositedLayerMapping() && !c
ompositedLayerMapping()->paintsIntoCompositedAncestor()) |
333 compositedLayerMapping()->updateAfterLayout(flags & NeedsFullRepaintInBa
cking, isUpdateRoot); | 328 compositedLayerMapping()->setContentsNeedDisplay(); |
334 | 329 |
335 if (geometryMap) | 330 if (geometryMap) |
336 geometryMap->popMappingsToAncestor(parent()); | 331 geometryMap->popMappingsToAncestor(parent()); |
337 } | 332 } |
338 | 333 |
339 void RenderLayer::setAncestorChainHasSelfPaintingLayerDescendant() | 334 void RenderLayer::setAncestorChainHasSelfPaintingLayerDescendant() |
340 { | 335 { |
341 for (RenderLayer* layer = this; layer; layer = layer->parent()) { | 336 for (RenderLayer* layer = this; layer; layer = layer->parent()) { |
342 if (!layer->m_hasSelfPaintingLayerDescendantDirty && layer->hasSelfPaint
ingLayerDescendant()) | 337 if (!layer->m_hasSelfPaintingLayerDescendantDirty && layer->hasSelfPaint
ingLayerDescendant()) |
343 break; | 338 break; |
(...skipping 3820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4164 } | 4159 } |
4165 } | 4160 } |
4166 | 4161 |
4167 void showLayerTree(const WebCore::RenderObject* renderer) | 4162 void showLayerTree(const WebCore::RenderObject* renderer) |
4168 { | 4163 { |
4169 if (!renderer) | 4164 if (!renderer) |
4170 return; | 4165 return; |
4171 showLayerTree(renderer->enclosingLayer()); | 4166 showLayerTree(renderer->enclosingLayer()); |
4172 } | 4167 } |
4173 #endif | 4168 #endif |
OLD | NEW |