| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 ClipRect damageRect, clipRectToApply; | 655 ClipRect damageRect, clipRectToApply; |
| 656 layer->clipper().calculateRects(ClipRectsContext(rootLayer, UncachedClipRect
s), paintRect, layerBounds, damageRect, clipRectToApply); | 656 layer->clipper().calculateRects(ClipRectsContext(rootLayer, UncachedClipRect
s), paintRect, layerBounds, damageRect, clipRectToApply); |
| 657 | 657 |
| 658 // Ensure our lists are up-to-date. | 658 // Ensure our lists are up-to-date. |
| 659 layer->stackingNode()->updateLayerListsIfNeeded(); | 659 layer->stackingNode()->updateLayerListsIfNeeded(); |
| 660 | 660 |
| 661 LayoutPoint offsetFromRoot; | 661 LayoutPoint offsetFromRoot; |
| 662 layer->convertToLayerCoords(rootLayer, offsetFromRoot); | 662 layer->convertToLayerCoords(rootLayer, offsetFromRoot); |
| 663 bool shouldPaint = (behavior & LayoutAsTextShowAllLayers) ? true : layer->in
tersectsDamageRect(layerBounds, damageRect.rect(), offsetFromRoot); | 663 bool shouldPaint = (behavior & LayoutAsTextShowAllLayers) ? true : layer->in
tersectsDamageRect(layerBounds, damageRect.rect(), offsetFromRoot); |
| 664 | 664 |
| 665 if (layer->layoutObject()->isLayoutPart() && toLayoutPart(layer->layoutObjec
t())->isThrottledFrameView()) | 665 if (layer->layoutObject()->isLayoutView() && toLayoutView(layer->layoutObjec
t())->frameView()->shouldThrottleRendering()) |
| 666 shouldPaint = false; | 666 shouldPaint = false; |
| 667 | 667 |
| 668 Vector<PaintLayerStackingNode*>* negList = layer->stackingNode()->negZOrderL
ist(); | 668 Vector<PaintLayerStackingNode*>* negList = layer->stackingNode()->negZOrderL
ist(); |
| 669 bool paintsBackgroundSeparately = negList && negList->size() > 0; | 669 bool paintsBackgroundSeparately = negList && negList->size() > 0; |
| 670 if (shouldPaint && paintsBackgroundSeparately) | 670 if (shouldPaint && paintsBackgroundSeparately) |
| 671 write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect()
, LayerPaintPhaseBackground, indent, behavior); | 671 write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect()
, LayerPaintPhaseBackground, indent, behavior); |
| 672 | 672 |
| 673 if (negList) { | 673 if (negList) { |
| 674 int currIndent = indent; | 674 int currIndent = indent; |
| 675 if (behavior & LayoutAsTextShowLayerNesting) { | 675 if (behavior & LayoutAsTextShowLayerNesting) { |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 845 element->document().updateLayout(); | 845 element->document().updateLayout(); |
| 846 | 846 |
| 847 LayoutObject* layoutObject = element->layoutObject(); | 847 LayoutObject* layoutObject = element->layoutObject(); |
| 848 if (!layoutObject || !layoutObject->isListItem()) | 848 if (!layoutObject || !layoutObject->isListItem()) |
| 849 return String(); | 849 return String(); |
| 850 | 850 |
| 851 return toLayoutListItem(layoutObject)->markerText(); | 851 return toLayoutListItem(layoutObject)->markerText(); |
| 852 } | 852 } |
| 853 | 853 |
| 854 } // namespace blink | 854 } // namespace blink |
| OLD | NEW |