| 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 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 | 649 |
| 650 if (paintPhase != LayerPaintPhaseBackground) | 650 if (paintPhase != LayerPaintPhaseBackground) |
| 651 write(ts, *layer.layoutObject(), indent + 1, behavior); | 651 write(ts, *layer.layoutObject(), indent + 1, behavior); |
| 652 } | 652 } |
| 653 | 653 |
| 654 static Vector<PaintLayerStackingNode*> normalFlowListFor( | 654 static Vector<PaintLayerStackingNode*> normalFlowListFor( |
| 655 PaintLayerStackingNode* node) { | 655 PaintLayerStackingNode* node) { |
| 656 PaintLayerStackingNodeIterator it(*node, NormalFlowChildren); | 656 PaintLayerStackingNodeIterator it(*node, NormalFlowChildren); |
| 657 Vector<PaintLayerStackingNode*> vector; | 657 Vector<PaintLayerStackingNode*> vector; |
| 658 while (PaintLayerStackingNode* normalFlowChild = it.next()) | 658 while (PaintLayerStackingNode* normalFlowChild = it.next()) |
| 659 vector.append(normalFlowChild); | 659 vector.push_back(normalFlowChild); |
| 660 return vector; | 660 return vector; |
| 661 } | 661 } |
| 662 | 662 |
| 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) { |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 883 element->document().updateStyleAndLayout(); | 883 element->document().updateStyleAndLayout(); |
| 884 | 884 |
| 885 LayoutObject* layoutObject = element->layoutObject(); | 885 LayoutObject* layoutObject = element->layoutObject(); |
| 886 if (!layoutObject || !layoutObject->isListItem()) | 886 if (!layoutObject || !layoutObject->isListItem()) |
| 887 return String(); | 887 return String(); |
| 888 | 888 |
| 889 return toLayoutListItem(layoutObject)->markerText(); | 889 return toLayoutListItem(layoutObject)->markerText(); |
| 890 } | 890 } |
| 891 | 891 |
| 892 } // namespace blink | 892 } // namespace blink |
| OLD | NEW |