| 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 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 656 ClipRect damageRect, clipRectToApply; | 656 ClipRect damageRect, clipRectToApply; |
| 657 layer->clipper().calculateRects(ClipRectsContext(rootLayer, UncachedClipRect
s), paintRect, layerBounds, damageRect, clipRectToApply); | 657 layer->clipper().calculateRects(ClipRectsContext(rootLayer, UncachedClipRect
s), paintRect, layerBounds, damageRect, clipRectToApply); |
| 658 | 658 |
| 659 // Ensure our lists are up-to-date. | 659 // Ensure our lists are up-to-date. |
| 660 layer->stackingNode()->updateLayerListsIfNeeded(); | 660 layer->stackingNode()->updateLayerListsIfNeeded(); |
| 661 | 661 |
| 662 LayoutPoint offsetFromRoot; | 662 LayoutPoint offsetFromRoot; |
| 663 layer->convertToLayerCoords(rootLayer, offsetFromRoot); | 663 layer->convertToLayerCoords(rootLayer, offsetFromRoot); |
| 664 bool shouldPaint = (behavior & LayoutAsTextShowAllLayers) ? true : layer->in
tersectsDamageRect(layerBounds, damageRect.rect(), offsetFromRoot); | 664 bool shouldPaint = (behavior & LayoutAsTextShowAllLayers) ? true : layer->in
tersectsDamageRect(layerBounds, damageRect.rect(), offsetFromRoot); |
| 665 | 665 |
| 666 if (layer->layoutObject()->isLayoutPart() && toLayoutPart(layer->layoutObjec
t())->isThrottledFrameView()) |
| 667 shouldPaint = false; |
| 668 |
| 666 Vector<PaintLayerStackingNode*>* negList = layer->stackingNode()->negZOrderL
ist(); | 669 Vector<PaintLayerStackingNode*>* negList = layer->stackingNode()->negZOrderL
ist(); |
| 667 bool paintsBackgroundSeparately = negList && negList->size() > 0; | 670 bool paintsBackgroundSeparately = negList && negList->size() > 0; |
| 668 if (shouldPaint && paintsBackgroundSeparately) | 671 if (shouldPaint && paintsBackgroundSeparately) |
| 669 write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect()
, LayerPaintPhaseBackground, indent, behavior); | 672 write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect()
, LayerPaintPhaseBackground, indent, behavior); |
| 670 | 673 |
| 671 if (negList) { | 674 if (negList) { |
| 672 int currIndent = indent; | 675 int currIndent = indent; |
| 673 if (behavior & LayoutAsTextShowLayerNesting) { | 676 if (behavior & LayoutAsTextShowLayerNesting) { |
| 674 writeIndent(ts, indent); | 677 writeIndent(ts, indent); |
| 675 ts << " negative z-order list(" << negList->size() << ")\n"; | 678 ts << " negative z-order list(" << negList->size() << ")\n"; |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 841 element->document().updateLayout(); | 844 element->document().updateLayout(); |
| 842 | 845 |
| 843 LayoutObject* layoutObject = element->layoutObject(); | 846 LayoutObject* layoutObject = element->layoutObject(); |
| 844 if (!layoutObject || !layoutObject->isListItem()) | 847 if (!layoutObject || !layoutObject->isListItem()) |
| 845 return String(); | 848 return String(); |
| 846 | 849 |
| 847 return toLayoutListItem(layoutObject)->markerText(); | 850 return toLayoutListItem(layoutObject)->markerText(); |
| 848 } | 851 } |
| 849 | 852 |
| 850 } // namespace blink | 853 } // namespace blink |
| OLD | NEW |