| 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 19 matching lines...) Expand all Loading... |
| 30 #include "core/css/StylePropertySet.h" | 30 #include "core/css/StylePropertySet.h" |
| 31 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
| 32 #include "core/dom/PseudoElement.h" | 32 #include "core/dom/PseudoElement.h" |
| 33 #include "core/editing/FrameSelection.h" | 33 #include "core/editing/FrameSelection.h" |
| 34 #include "core/frame/FrameView.h" | 34 #include "core/frame/FrameView.h" |
| 35 #include "core/frame/LocalFrame.h" | 35 #include "core/frame/LocalFrame.h" |
| 36 #include "core/frame/Settings.h" | 36 #include "core/frame/Settings.h" |
| 37 #include "core/html/HTMLElement.h" | 37 #include "core/html/HTMLElement.h" |
| 38 #include "core/layout/Layer.h" | 38 #include "core/layout/Layer.h" |
| 39 #include "core/layout/LayoutDetailsMarker.h" | 39 #include "core/layout/LayoutDetailsMarker.h" |
| 40 #include "core/layout/LayoutListItem.h" |
| 41 #include "core/layout/LayoutListMarker.h" |
| 40 #include "core/layout/LayoutPart.h" | 42 #include "core/layout/LayoutPart.h" |
| 41 #include "core/layout/LayoutTableCell.h" | 43 #include "core/layout/LayoutTableCell.h" |
| 42 #include "core/layout/compositing/CompositedLayerMapping.h" | 44 #include "core/layout/compositing/CompositedLayerMapping.h" |
| 43 #include "core/layout/line/InlineTextBox.h" | 45 #include "core/layout/line/InlineTextBox.h" |
| 44 #include "core/layout/svg/LayoutSVGContainer.h" | 46 #include "core/layout/svg/LayoutSVGContainer.h" |
| 45 #include "core/layout/svg/LayoutSVGGradientStop.h" | 47 #include "core/layout/svg/LayoutSVGGradientStop.h" |
| 46 #include "core/layout/svg/LayoutSVGImage.h" | 48 #include "core/layout/svg/LayoutSVGImage.h" |
| 47 #include "core/layout/svg/LayoutSVGInlineText.h" | 49 #include "core/layout/svg/LayoutSVGInlineText.h" |
| 48 #include "core/layout/svg/LayoutSVGPath.h" | 50 #include "core/layout/svg/LayoutSVGPath.h" |
| 49 #include "core/layout/svg/LayoutSVGRoot.h" | 51 #include "core/layout/svg/LayoutSVGRoot.h" |
| 50 #include "core/layout/svg/LayoutSVGText.h" | 52 #include "core/layout/svg/LayoutSVGText.h" |
| 51 #include "core/layout/svg/SVGLayoutTreeAsText.h" | 53 #include "core/layout/svg/SVGLayoutTreeAsText.h" |
| 52 #include "core/page/PrintContext.h" | 54 #include "core/page/PrintContext.h" |
| 53 #include "core/rendering/RenderFileUploadControl.h" | 55 #include "core/rendering/RenderFileUploadControl.h" |
| 54 #include "core/rendering/RenderInline.h" | 56 #include "core/rendering/RenderInline.h" |
| 55 #include "core/rendering/RenderListItem.h" | |
| 56 #include "core/rendering/RenderListMarker.h" | |
| 57 #include "core/rendering/RenderView.h" | 57 #include "core/rendering/RenderView.h" |
| 58 #include "wtf/HexNumber.h" | 58 #include "wtf/HexNumber.h" |
| 59 #include "wtf/Vector.h" | 59 #include "wtf/Vector.h" |
| 60 #include "wtf/unicode/CharacterNames.h" | 60 #include "wtf/unicode/CharacterNames.h" |
| 61 | 61 |
| 62 namespace blink { | 62 namespace blink { |
| 63 | 63 |
| 64 using namespace HTMLNames; | 64 using namespace HTMLNames; |
| 65 | 65 |
| 66 static void printBorderStyle(TextStream& ts, const EBorderStyle borderStyle) | 66 static void printBorderStyle(TextStream& ts, const EBorderStyle borderStyle) |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 case LayoutDetailsMarker::Up: | 319 case LayoutDetailsMarker::Up: |
| 320 ts << "up"; | 320 ts << "up"; |
| 321 break; | 321 break; |
| 322 case LayoutDetailsMarker::Down: | 322 case LayoutDetailsMarker::Down: |
| 323 ts << "down"; | 323 ts << "down"; |
| 324 break; | 324 break; |
| 325 } | 325 } |
| 326 } | 326 } |
| 327 | 327 |
| 328 if (o.isListMarker()) { | 328 if (o.isListMarker()) { |
| 329 String text = toRenderListMarker(o).text(); | 329 String text = toLayoutListMarker(o).text(); |
| 330 if (!text.isEmpty()) { | 330 if (!text.isEmpty()) { |
| 331 if (text.length() != 1) { | 331 if (text.length() != 1) { |
| 332 text = quoteAndEscapeNonPrintables(text); | 332 text = quoteAndEscapeNonPrintables(text); |
| 333 } else { | 333 } else { |
| 334 switch (text[0]) { | 334 switch (text[0]) { |
| 335 case bullet: | 335 case bullet: |
| 336 text = "bullet"; | 336 text = "bullet"; |
| 337 break; | 337 break; |
| 338 case blackSquare: | 338 case blackSquare: |
| 339 text = "black square"; | 339 text = "black square"; |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 776 String markerTextForListItem(Element* element) | 776 String markerTextForListItem(Element* element) |
| 777 { | 777 { |
| 778 // Make sure the element is not freed during the layout. | 778 // Make sure the element is not freed during the layout. |
| 779 RefPtrWillBeRawPtr<Element> protector(element); | 779 RefPtrWillBeRawPtr<Element> protector(element); |
| 780 element->document().updateLayout(); | 780 element->document().updateLayout(); |
| 781 | 781 |
| 782 LayoutObject* renderer = element->renderer(); | 782 LayoutObject* renderer = element->renderer(); |
| 783 if (!renderer || !renderer->isListItem()) | 783 if (!renderer || !renderer->isListItem()) |
| 784 return String(); | 784 return String(); |
| 785 | 785 |
| 786 return toRenderListItem(renderer)->markerText(); | 786 return toLayoutListItem(renderer)->markerText(); |
| 787 } | 787 } |
| 788 | 788 |
| 789 } // namespace blink | 789 } // namespace blink |
| OLD | NEW |