| 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 652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 663 void LayoutTreeAsText::writeLayers(TextStream& ts, | 663 void LayoutTreeAsText::writeLayers(TextStream& ts, |
| 664 const PaintLayer* rootLayer, | 664 const PaintLayer* rootLayer, |
| 665 PaintLayer* layer, | 665 PaintLayer* layer, |
| 666 const LayoutRect& paintRect, | 666 const LayoutRect& paintRect, |
| 667 int indent, | 667 int indent, |
| 668 LayoutAsTextBehavior behavior, | 668 LayoutAsTextBehavior behavior, |
| 669 const PaintLayer* markedLayer) { | 669 const PaintLayer* markedLayer) { |
| 670 // Calculate the clip rects we should use. | 670 // Calculate the clip rects we should use. |
| 671 LayoutRect layerBounds; | 671 LayoutRect layerBounds; |
| 672 ClipRect damageRect, clipRectToApply; | 672 ClipRect damageRect, clipRectToApply; |
| 673 layer->clipper().calculateRects( | 673 layer->clipper(PaintLayer::DoNotUseGeometryMapper) |
| 674 ClipRectsContext(rootLayer, UncachedClipRects), paintRect, layerBounds, | 674 .calculateRects(ClipRectsContext(rootLayer, UncachedClipRects), paintRect, |
| 675 damageRect, clipRectToApply); | 675 layerBounds, damageRect, clipRectToApply); |
| 676 | 676 |
| 677 // Ensure our lists are up to date. | 677 // Ensure our lists are up to date. |
| 678 layer->stackingNode()->updateLayerListsIfNeeded(); | 678 layer->stackingNode()->updateLayerListsIfNeeded(); |
| 679 | 679 |
| 680 LayoutPoint offsetFromRoot; | 680 LayoutPoint offsetFromRoot; |
| 681 layer->convertToLayerCoords(rootLayer, offsetFromRoot); | 681 layer->convertToLayerCoords(rootLayer, offsetFromRoot); |
| 682 bool shouldPaint = (behavior & LayoutAsTextShowAllLayers) | 682 bool shouldPaint = (behavior & LayoutAsTextShowAllLayers) |
| 683 ? true | 683 ? true |
| 684 : layer->intersectsDamageRect( | 684 : layer->intersectsDamageRect( |
| 685 layerBounds, damageRect.rect(), offsetFromRoot); | 685 layerBounds, damageRect.rect(), offsetFromRoot); |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 881 element->document().updateStyleAndLayout(); | 881 element->document().updateStyleAndLayout(); |
| 882 | 882 |
| 883 LayoutObject* layoutObject = element->layoutObject(); | 883 LayoutObject* layoutObject = element->layoutObject(); |
| 884 if (!layoutObject || !layoutObject->isListItem()) | 884 if (!layoutObject || !layoutObject->isListItem()) |
| 885 return String(); | 885 return String(); |
| 886 | 886 |
| 887 return toLayoutListItem(layoutObject)->markerText(); | 887 return toLayoutListItem(layoutObject)->markerText(); |
| 888 } | 888 } |
| 889 | 889 |
| 890 } // namespace blink | 890 } // namespace blink |
| OLD | NEW |