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 11 matching lines...) Expand all Loading... | |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "core/rendering/RenderTreeAsText.h" | 27 #include "core/rendering/RenderTreeAsText.h" |
28 | 28 |
29 #include "core/HTMLNames.h" | 29 #include "core/HTMLNames.h" |
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/editing/FrameSelection.h" | 33 #include "core/editing/FrameSelection.h" |
33 #include "core/frame/FrameView.h" | 34 #include "core/frame/FrameView.h" |
34 #include "core/frame/LocalFrame.h" | 35 #include "core/frame/LocalFrame.h" |
35 #include "core/html/HTMLElement.h" | 36 #include "core/html/HTMLElement.h" |
36 #include "core/page/PrintContext.h" | 37 #include "core/page/PrintContext.h" |
37 #include "core/rendering/FlowThreadController.h" | 38 #include "core/rendering/FlowThreadController.h" |
38 #include "core/rendering/InlineTextBox.h" | 39 #include "core/rendering/InlineTextBox.h" |
39 #include "core/rendering/RenderBR.h" | 40 #include "core/rendering/RenderBR.h" |
40 #include "core/rendering/RenderDetailsMarker.h" | 41 #include "core/rendering/RenderDetailsMarker.h" |
41 #include "core/rendering/RenderFileUploadControl.h" | 42 #include "core/rendering/RenderFileUploadControl.h" |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
169 | 170 |
170 if (behavior & RenderAsTextShowAddresses) | 171 if (behavior & RenderAsTextShowAddresses) |
171 ts << " " << static_cast<const void*>(&o); | 172 ts << " " << static_cast<const void*>(&o); |
172 | 173 |
173 if (o.style() && o.style()->zIndex()) | 174 if (o.style() && o.style()->zIndex()) |
174 ts << " zI: " << o.style()->zIndex(); | 175 ts << " zI: " << o.style()->zIndex(); |
175 | 176 |
176 if (o.node()) { | 177 if (o.node()) { |
177 String tagName = getTagName(o.node()); | 178 String tagName = getTagName(o.node()); |
178 // FIXME: Temporary hack to make tests pass by simulating the old genera ted content output. | 179 // FIXME: Temporary hack to make tests pass by simulating the old genera ted content output. |
179 if (o.isPseudoElement() || (o.parent() && o.parent()->isPseudoElement()) ) | 180 if (o.isPseudoElement() || (o.parent() && o.parent()->isPseudoElement() && toPseudoElement(o.parent()->node())->pseudoId() != FIRST_LETTER)) |
Julien - ping for review
2014/10/09 18:24:49
:-(
I would like us to remove this code upfront (
dsinclair
2014/10/09 21:14:23
Done.
https://codereview.chromium.org/645623003
| |
180 tagName = emptyAtom; | 181 tagName = emptyAtom; |
181 if (!tagName.isEmpty()) { | 182 if (!tagName.isEmpty()) { |
182 ts << " {" << tagName << "}"; | 183 ts << " {" << tagName << "}"; |
183 // flag empty or unstyled AppleStyleSpan because we never | 184 // flag empty or unstyled AppleStyleSpan because we never |
184 // want to leave them in the DOM | 185 // want to leave them in the DOM |
185 if (isEmptyOrUnstyledAppleStyleSpan(o.node())) | 186 if (isEmptyOrUnstyledAppleStyleSpan(o.node())) |
186 ts << " *empty or unstyled AppleStyleSpan*"; | 187 ts << " *empty or unstyled AppleStyleSpan*"; |
187 } | 188 } |
188 } | 189 } |
189 | 190 |
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
773 element->document().updateLayout(); | 774 element->document().updateLayout(); |
774 | 775 |
775 RenderObject* renderer = element->renderer(); | 776 RenderObject* renderer = element->renderer(); |
776 if (!renderer || !renderer->isListItem()) | 777 if (!renderer || !renderer->isListItem()) |
777 return String(); | 778 return String(); |
778 | 779 |
779 return toRenderListItem(renderer)->markerText(); | 780 return toRenderListItem(renderer)->markerText(); |
780 } | 781 } |
781 | 782 |
782 } // namespace blink | 783 } // namespace blink |
OLD | NEW |