WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-243303-20220730114506.patch (text/plain), 105.47 KB, created by
alan
on 2022-07-30 11:45:07 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
alan
Created:
2022-07-30 11:45:07 PDT
Size:
105.47 KB
patch
obsolete
>From 4606086485d36f1025efe2240294e1ee541aeb24 Mon Sep 17 00:00:00 2001 >From: Alan Bujtas <zalan@apple.com> >Date: Sat, 30 Jul 2022 11:37:50 -0700 >Subject: [PATCH] [IFC][Integration] Enable vertical list items for IFC > https://bugs.webkit.org/show_bug.cgi?id=243303 > >Reviewed by Antti Koivisto. > >* LayoutTests/platform/ios/css1/box_properties/margin_right-expected.txt: >* LayoutTests/platform/ios/css1/box_properties/padding_right-expected.txt: >* LayoutTests/platform/ios/fast/lists/001-vertical-expected.txt: >* LayoutTests/platform/ios/fast/lists/002-expected.txt: >* LayoutTests/platform/ios/fast/lists/003-expected.txt: >* LayoutTests/platform/ios/fast/lists/003-vertical-expected.txt: >* LayoutTests/platform/ios/fast/lists/008-vertical-expected.txt: >* LayoutTests/platform/ios/fast/overflow/overflow-rtl-vertical-expected.txt: >* LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt: >* LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt: >* LayoutTests/platform/mac/fast/lists/002-expected.txt: >* LayoutTests/platform/mac/fast/lists/003-expected.txt: >* LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt: >* Source/WebCore/Sources.txt: >* Source/WebCore/WebCore.xcodeproj/project.pbxproj: >* Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp: >(WebCore::Layout::isWrappableRun): >* Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h: >(WebCore::Layout::InlineLevelBox::isListMarker const): >* Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp: >(WebCore::Layout::toLineRunType): >* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp: >(WebCore::Layout::LineBoxBuilder::adjustIdeographicBaselineIfApplicable): >* Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp: >(WebCore::Layout::isAtSoftWrapOpportunity): >* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp: >(WebCore::Layout::InlineDisplayContentBuilder::processNonBidiContent): >(WebCore::Layout::InlineDisplayContentBuilder::processBidiContent): >(WebCore::Layout::InlineDisplayContentBuilder::outsideListMarkerVisualPosition const): >* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.h: >* Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp: >(WebCore::LayoutIntegration::BoxTree::buildTreeForInlineContent): >* Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp: >(WebCore::LayoutIntegration::canUseForChild): >(WebCore::LayoutIntegration::canUseForLineLayoutWithReason): >* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp: >(WebCore::LayoutIntegration::LineLayout::updateListMarkerDimensions): >* Source/WebCore/layout/layouttree/LayoutBox.h: >(WebCore::Layout::Box::isImage const): >(WebCore::Layout::Box::isListMarkerBox const): >(WebCore::Layout::Box::isListMarker const): Deleted. >(WebCore::Layout::Box::isInsideListMarker const): Deleted. >(WebCore::Layout::Box::isOutsideListMarker const): Deleted. >* Source/WebCore/layout/layouttree/LayoutReplacedBox.cpp: >(WebCore::Layout::ReplacedBox::ReplacedBox): >* Source/WebCore/layout/layouttree/LayoutReplacedBox.h: >(WebCore::Layout::ReplacedBox::ReplacedBox): >--- > Source/WebCore/Sources.txt | 1 + > .../WebCore/WebCore.xcodeproj/project.pbxproj | 6 + > .../inline/InlineContentBreaker.cpp | 2 +- > .../inline/InlineLevelBox.h | 2 +- > .../formattingContexts/inline/InlineLine.cpp | 2 +- > .../inline/InlineLineBoxBuilder.cpp | 10 +- > .../inline/InlineLineBuilder.cpp | 2 +- > .../display/InlineDisplayContentBuilder.cpp | 43 +-- > .../display/InlineDisplayContentBuilder.h | 2 + > .../integration/LayoutIntegrationBoxTree.cpp | 12 +- > .../integration/LayoutIntegrationCoverage.cpp | 4 +- > .../inline/LayoutIntegrationLineLayout.cpp | 3 +- > Source/WebCore/layout/layouttree/LayoutBox.h | 17 +- > .../layout/layouttree/LayoutListMarkerBox.cpp | 49 ++++ > .../layout/layouttree/LayoutListMarkerBox.h | 57 ++++ > .../layout/layouttree/LayoutReplacedBox.cpp | 4 +- > .../layout/layouttree/LayoutReplacedBox.h | 2 +- > .../box_properties/margin_right-expected.txt | 12 +- > .../box_properties/padding_right-expected.txt | 8 +- > .../ios/fast/lists/001-vertical-expected.txt | 8 +- > .../platform/ios/fast/lists/002-expected.txt | 4 +- > .../platform/ios/fast/lists/003-expected.txt | 30 +-- > .../ios/fast/lists/003-vertical-expected.txt | 232 ++++++++--------- > .../ios/fast/lists/008-vertical-expected.txt | 244 +++++++++--------- > .../overflow-rtl-vertical-expected.txt | 18 +- > .../box_properties/margin_right-expected.txt | 12 +- > .../box_properties/padding_right-expected.txt | 8 +- > .../platform/mac/fast/lists/002-expected.txt | 4 +- > .../platform/mac/fast/lists/003-expected.txt | 30 +-- > .../mac/fast/lists/003-vertical-expected.txt | 30 +-- > 30 files changed, 495 insertions(+), 363 deletions(-) > create mode 100644 Source/WebCore/layout/layouttree/LayoutListMarkerBox.cpp > create mode 100644 Source/WebCore/layout/layouttree/LayoutListMarkerBox.h > >diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt >index 7fd730e860a5..8892260e4739 100644 >--- a/Source/WebCore/Sources.txt >+++ b/Source/WebCore/Sources.txt >@@ -1612,6 +1612,7 @@ layout/layouttree/LayoutBoxGeometry.cpp > layout/layouttree/LayoutInitialContainingBlock.cpp > layout/layouttree/LayoutInlineTextBox.cpp > layout/layouttree/LayoutLineBreakBox.cpp >+layout/layouttree/LayoutListMarkerBox.cpp > layout/layouttree/LayoutReplacedBox.cpp > layout/layouttree/LayoutTreeBuilder.cpp > layout/formattingContexts/table/TableFormattingContext.cpp >diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >index 0aa1ca706841..ea2076c8f23f 100644 >--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj >+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >@@ -2264,6 +2264,7 @@ > 6F6EE74326D44EE300374CDA /* InlineLineBoxVerticalAligner.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F6EE74126D44EE200374CDA /* InlineLineBoxVerticalAligner.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 6F7CA3C6208C2957002F29AB /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F7CA3C4208C2956002F29AB /* LayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 6F7CA3CA208C2B2E002F29AB /* InlineFormattingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F7CA3C8208C2B2E002F29AB /* InlineFormattingContext.h */; settings = {ATTRIBUTES = (Private, ); }; }; >+ 6F7E06502894FE4F00FB3EC9 /* LayoutListMarkerBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F7E064F2894FE4F00FB3EC9 /* LayoutListMarkerBox.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 6F91421125152138004E4FEA /* InlineDisplayLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F91420F25152137004E4FEA /* InlineDisplayLine.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 6F995A161A70756200A735F4 /* WebGLSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F995A141A70756200A735F4 /* WebGLSync.h */; }; > 6F995A201A7078B100A735F4 /* WebGLQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F995A181A7078B100A735F4 /* WebGLQuery.h */; }; >@@ -11182,6 +11183,8 @@ > 6F7CA3C5208C2956002F29AB /* LayoutState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutState.cpp; sourceTree = "<group>"; }; > 6F7CA3C8208C2B2E002F29AB /* InlineFormattingContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InlineFormattingContext.h; sourceTree = "<group>"; }; > 6F7CA3C9208C2B2E002F29AB /* InlineFormattingContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InlineFormattingContext.cpp; sourceTree = "<group>"; }; >+ 6F7E064F2894FE4F00FB3EC9 /* LayoutListMarkerBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutListMarkerBox.h; sourceTree = "<group>"; }; >+ 6F7E06512894FE6000FB3EC9 /* LayoutListMarkerBox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutListMarkerBox.cpp; sourceTree = "<group>"; }; > 6F8F460121B03BB40041AC3A /* FormattingQuirks.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FormattingQuirks.cpp; sourceTree = "<group>"; }; > 6F8F460321B03BC60041AC3A /* BlockFormattingQuirks.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = BlockFormattingQuirks.cpp; sourceTree = "<group>"; }; > 6F91420F25152137004E4FEA /* InlineDisplayLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineDisplayLine.h; sourceTree = "<group>"; }; >@@ -19623,6 +19626,8 @@ > 11100FC72092764C0081AA6C /* LayoutIterator.h */, > 6FFA4BFE23F2FECD007E4EBC /* LayoutLineBreakBox.cpp */, > 6FFA4C0023F2FED9007E4EBC /* LayoutLineBreakBox.h */, >+ 6F7E06512894FE6000FB3EC9 /* LayoutListMarkerBox.cpp */, >+ 6F7E064F2894FE4F00FB3EC9 /* LayoutListMarkerBox.h */, > 111C615720AD1AE1005B82FA /* LayoutReplacedBox.cpp */, > 111C615620AD1AE1005B82FA /* LayoutReplacedBox.h */, > 11100FD5209514DE0081AA6C /* LayoutTreeBuilder.cpp */, >@@ -36643,6 +36648,7 @@ > E403B7A3251B11C10019E800 /* LayoutIntegrationPagination.h in Headers */, > 11310CF420BA4A3D0065A8D0 /* LayoutIterator.h in Headers */, > 6FFA4C0123F2FED9007E4EBC /* LayoutLineBreakBox.h in Headers */, >+ 6F7E06502894FE4F00FB3EC9 /* LayoutListMarkerBox.h in Headers */, > 931D72F615FE695300C4C07E /* LayoutMilestone.h in Headers */, > 141DC051164834B900371E5A /* LayoutPoint.h in Headers */, > 141DC053164834B900371E5A /* LayoutRect.h in Headers */, >diff --git a/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp b/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp >index 6b0426afb553..2528fc5bf4ce 100644 >--- a/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp >+++ b/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp >@@ -292,7 +292,7 @@ static std::optional<size_t> findTrailingRunIndex(const InlineContentBreaker::Co > > static bool isWrappableRun(const InlineContentBreaker::ContinuousContent::Run& run) > { >- ASSERT(run.inlineItem.isText() || run.inlineItem.isInlineBoxStart() || run.inlineItem.isInlineBoxEnd() || run.inlineItem.layoutBox().isImage() || run.inlineItem.layoutBox().isListMarker()); >+ ASSERT(run.inlineItem.isText() || run.inlineItem.isInlineBoxStart() || run.inlineItem.isInlineBoxEnd() || run.inlineItem.layoutBox().isImage() || run.inlineItem.layoutBox().isListMarkerBox()); > if (!run.inlineItem.isText()) { > // Can't break horizontal spacing -> e.g. <span style="padding-right: 100px;">textcontent</span>, if the [inline box end] is the overflown inline item > // we need to check if there's another inline item beyond the [inline box end] to split. >diff --git a/Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h b/Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h >index d6b95ba5277f..0ac8876b9a15 100644 >--- a/Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h >+++ b/Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h >@@ -84,7 +84,7 @@ public: > bool isRootInlineBox() const { return m_type == Type::RootInlineBox; } > bool isLineSpanningInlineBox() const { return m_type == Type::LineSpanningInlineBox; } > bool isAtomicInlineLevelBox() const { return m_type == Type::AtomicInlineLevelBox; } >- bool isListMarker() const { return isAtomicInlineLevelBox() && layoutBox().isListMarker(); } >+ bool isListMarker() const { return isAtomicInlineLevelBox() && layoutBox().isListMarkerBox(); } > bool isLineBreakBox() const { return m_type == Type::LineBreakBox; } > > enum class Type : uint8_t { >diff --git a/Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp b/Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp >index 6eb4b965b7b2..dd70798d1864 100644 >--- a/Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp >+++ b/Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp >@@ -578,7 +578,7 @@ inline static Line::Run::Type toLineRunType(const InlineItem& inlineItem) > case InlineItem::Type::WordBreakOpportunity: > return Line::Run::Type::WordBreakOpportunity; > case InlineItem::Type::Box: >- return inlineItem.layoutBox().isListMarker() ? Line::Run::Type::ListMarker : Line::Run::Type::GenericInlineLevelBox; >+ return inlineItem.layoutBox().isListMarkerBox() ? Line::Run::Type::ListMarker : Line::Run::Type::GenericInlineLevelBox; > case InlineItem::Type::InlineBoxStart: > return Line::Run::Type::InlineBoxStart; > case InlineItem::Type::InlineBoxEnd: >diff --git a/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp b/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp >index 75a2416e3319..2d801b52055e 100644 >--- a/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp >+++ b/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp >@@ -29,6 +29,7 @@ > #include "InlineLineBoxVerticalAligner.h" > #include "InlineLineBuilder.h" > #include "LayoutBoxGeometry.h" >+#include "LayoutListMarkerBox.h" > #include "LayoutReplacedBox.h" > > #if ENABLE(LAYOUT_FORMATTING_CONTEXT) >@@ -431,17 +432,18 @@ void LineBoxBuilder::adjustIdeographicBaselineIfApplicable(LineBox& lineBox, siz > if (!initiatesLayoutBoundsChange) > return; > >+ auto behavesAsText = inlineLevelBox.isLineBreakBox() || (inlineLevelBox.isListMarker() && !downcast<ListMarkerBox>(inlineLevelBox.layoutBox()).isImage()); > auto layoutBoundsPrimaryMetrics = LayoutBoundsMetrics { }; >- if (inlineLevelBox.isInlineBox()) >+ if (behavesAsText) { >+ auto& parentInlineBox = lineBox.inlineLevelBoxForLayoutBox(inlineLevelBox.layoutBox().parent()); >+ layoutBoundsPrimaryMetrics = layoutBoundsPrimaryMetricsForInlineBox(parentInlineBox, IdeographicBaseline); >+ } else if (inlineLevelBox.isInlineBox()) > layoutBoundsPrimaryMetrics = layoutBoundsPrimaryMetricsForInlineBox(inlineLevelBox, IdeographicBaseline); > else if (inlineLevelBox.isAtomicInlineLevelBox()) { > auto inlineLevelBoxHeight = inlineLevelBox.layoutBounds().height(); > InlineLayoutUnit ideographicBaseline = roundToInt(inlineLevelBoxHeight / 2); > // Move the baseline position but keep the same logical height. > layoutBoundsPrimaryMetrics = { ideographicBaseline, inlineLevelBoxHeight - ideographicBaseline }; >- } else if (inlineLevelBox.isLineBreakBox()) { >- auto& parentInlineBox = lineBox.inlineLevelBoxForLayoutBox(inlineLevelBox.layoutBox().parent()); >- layoutBoundsPrimaryMetrics = layoutBoundsPrimaryMetricsForInlineBox(parentInlineBox, IdeographicBaseline); > } > setBaselineAndLayoutBounds(inlineLevelBox, layoutBoundsPrimaryMetrics); > >diff --git a/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp b/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp >index 7dcd6f7a2931..ca960d5e8fb9 100644 >--- a/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp >+++ b/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp >@@ -144,7 +144,7 @@ static inline bool isAtSoftWrapOpportunity(const InlineFormattingContext& inline > // brings in unnecessary complexity. > return true; > } >- if (current.layoutBox().isListMarker() || next.layoutBox().isListMarker()) >+ if (current.layoutBox().isListMarkerBox() || next.layoutBox().isListMarkerBox()) > return false; > if (current.isBox() || next.isBox()) { > auto isImageContent = current.layoutBox().isImage() || next.layoutBox().isImage(); >diff --git a/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp b/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp >index c5df2ba1df9f..4306b37a643d 100644 >--- a/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp >+++ b/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp >@@ -395,12 +395,11 @@ void InlineDisplayContentBuilder::processNonBidiContent(const LineBuilder::LineC > continue; > } > if (lineRun.isListMarker()) { >- auto logicalRect = lineBox.logicalBorderBoxForAtomicInlineLevelBox(layoutBox, formattingState().boxGeometry(layoutBox)); >- if (layoutBox.isOutsideListMarker()) { >- auto leftOffsetForListMarker = -formattingContext().formattingGeometry().computedTextIndent(InlineFormattingGeometry::IsIntrinsicWidthMode::No, { }, lineBox.logicalRect().width()); >- logicalRect.moveHorizontally(leftOffsetForListMarker); >- } >- appendAtomicInlineLevelDisplayBox(lineRun, visualRectRelativeToRoot(logicalRect), boxes); >+ auto& listMarker = downcast<ListMarkerBox>(layoutBox); >+ auto visualRect = visualRectRelativeToRoot(lineBox.logicalBorderBoxForAtomicInlineLevelBox(layoutBox, formattingState().boxGeometry(layoutBox))); >+ if (listMarker.isOutside()) >+ WebCore::isHorizontalWritingMode(writingMode) ? visualRect.setLeft(outsideListMarkerVisualPosition(listMarker, displayLine)) : visualRect.setTop(outsideListMarkerVisualPosition(listMarker, displayLine)); >+ appendAtomicInlineLevelDisplayBox(lineRun, visualRect, boxes); > continue; > } > if (lineRun.isInlineBoxStart()) { >@@ -659,16 +658,14 @@ void InlineDisplayContentBuilder::processBidiContent(const LineBuilder::LineCont > auto& boxGeometry = formattingState().boxGeometry(layoutBox); > auto logicalRect = lineBox.logicalBorderBoxForAtomicInlineLevelBox(layoutBox, boxGeometry); > auto visualRect = visualRectRelativeToRoot(logicalRect); >- auto boxMarginLeft = [&] { >- auto marginLeftValue = marginLeftInInlineDirection(boxGeometry, isLeftToRightDirection); >- auto mayNeedTextIndentOffset = lineRun.isListMarker() && layoutBox.isOutsideListMarker(); >- if (!mayNeedTextIndentOffset) >- return marginLeftValue; >- auto startOffsetForListMarker = LayoutUnit { -formattingContext().formattingGeometry().computedTextIndent(InlineFormattingGeometry::IsIntrinsicWidthMode::No, { }, lineBox.logicalRect().width()) }; >- return marginLeftValue + (isLeftToRightDirection ? startOffsetForListMarker : -startOffsetForListMarker); >- }(); >- >- isHorizontalWritingMode ? visualRect.moveHorizontally(boxMarginLeft) : visualRect.moveVertically(boxMarginLeft); >+ auto boxMarginLeft = marginLeftInInlineDirection(boxGeometry, isLeftToRightDirection); >+ >+ if (is<ListMarkerBox>(layoutBox) && downcast<ListMarkerBox>(layoutBox).isOutside()) { >+ auto& listMarker = downcast<ListMarkerBox>(layoutBox); >+ isHorizontalWritingMode ? visualRect.setLeft(outsideListMarkerVisualPosition(listMarker, displayLine)) : visualRect.setTop(outsideListMarkerVisualPosition(listMarker, displayLine)); >+ } else >+ isHorizontalWritingMode ? visualRect.moveHorizontally(boxMarginLeft) : visualRect.moveVertically(boxMarginLeft); >+ > appendAtomicInlineLevelDisplayBox(lineRun, visualRect, boxes); > contentRightInInlineDirectionVisualOrder += boxMarginLeft + logicalRect.width() + marginRightInInlineDirection(boxGeometry, isLeftToRightDirection); > displayBoxTree.append(parentDisplayBoxNodeIndex, boxes.size() - 1); >@@ -1044,6 +1041,20 @@ InlineLayoutPoint InlineDisplayContentBuilder::movePointHorizontallyForWritingMo > return visualPoint; > } > >+InlineLayoutUnit InlineDisplayContentBuilder::outsideListMarkerVisualPosition(const ListMarkerBox& listMarker, const InlineDisplay::Line& displayLine) const >+{ >+ ASSERT(listMarker.isOutside()); >+ auto& boxGeometry = formattingState().boxGeometry(listMarker); >+ auto isLeftToRightDirection = listMarker.parent().style().isLeftToRightDirection(); >+ auto isHorizontalWritingMode = WebCore::isHorizontalWritingMode(root().style().writingMode()); >+ auto lineBoxOffset = formattingContext().formattingGeometry().computedTextIndent(InlineFormattingGeometry::IsIntrinsicWidthMode::No, { }, displayLine.lineBoxRect().width()); >+ auto boxMarginLeft = marginLeftInInlineDirection(boxGeometry, isLeftToRightDirection); >+ >+ if (isHorizontalWritingMode) >+ return isLeftToRightDirection ? displayLine.left() - lineBoxOffset + boxMarginLeft : displayLine.right() + lineBoxOffset + boxMarginLeft; >+ return isLeftToRightDirection ? displayLine.top() - lineBoxOffset + boxMarginLeft : displayLine.bottom() + lineBoxOffset + boxMarginLeft; >+} >+ > } > } > >diff --git a/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.h b/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.h >index 3155bf265dee..3d5326461bb1 100644 >--- a/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.h >+++ b/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.h >@@ -39,6 +39,7 @@ struct DisplayBoxTree; > struct IsFirstLastIndex; > class InlineFormattingState; > class LineBox; >+class ListMarkerBox; > > class InlineDisplayContentBuilder { > public: >@@ -73,6 +74,7 @@ private: > void setLeftForWritingMode(InlineDisplay::Box&, InlineLayoutUnit logicalRight, WritingMode) const; > void setRightForWritingMode(InlineDisplay::Box&, InlineLayoutUnit logicalRight, WritingMode) const; > InlineLayoutPoint movePointHorizontallyForWritingMode(const InlineLayoutPoint& topLeft, InlineLayoutUnit horizontalOffset, WritingMode) const; >+ InlineLayoutUnit outsideListMarkerVisualPosition(const ListMarkerBox&, const InlineDisplay::Line&) const; > > const ContainerBox& root() const { return formattingContext().root(); } > const InlineFormattingContext& formattingContext() const { return m_formattingContext; } >diff --git a/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp b/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp >index d4d6335b19c4..688f58aa36a4 100644 >--- a/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp >+++ b/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp >@@ -32,6 +32,7 @@ > #include "LayoutContainerBox.h" > #include "LayoutInlineTextBox.h" > #include "LayoutLineBreakBox.h" >+#include "LayoutListMarkerBox.h" > #include "LayoutReplacedBox.h" > #include "RenderBlock.h" > #include "RenderBlockFlow.h" >@@ -139,12 +140,17 @@ void BoxTree::buildTreeForInlineContent() > return makeUnique<Layout::LineBreakBox>(downcast<RenderLineBreak>(childRenderer).isWBR(), WTFMove(style), WTFMove(firstLineStyle)); > } > >+ if (is<RenderListMarker>(childRenderer)) { >+ auto& listMarkerRenderer = downcast<RenderListMarker>(childRenderer); >+ return makeUnique<Layout::ListMarkerBox>(listMarkerRenderer.isImage() ? Layout::ListMarkerBox::IsImage::Yes : Layout::ListMarkerBox::IsImage::No >+ , listMarkerRenderer.isInside() ? Layout::ListMarkerBox::IsOutside::No : Layout::ListMarkerBox::IsOutside::Yes >+ , WTFMove(style) >+ , WTFMove(firstLineStyle)); >+ } >+ > if (is<RenderReplaced>(childRenderer)) > return makeUnique<Layout::ReplacedBox>(Layout::Box::ElementAttributes { is<RenderImage>(childRenderer) ? Layout::Box::ElementType::Image : Layout::Box::ElementType::GenericElement }, WTFMove(style), WTFMove(firstLineStyle)); > >- if (is<RenderListMarker>(childRenderer)) >- return makeUnique<Layout::ReplacedBox>(Layout::Box::ElementAttributes { downcast<RenderListMarker>(childRenderer).isInside() ? Layout::Box::ElementType::InsideListMarker : Layout::Box::ElementType::OutsideListMarker }, WTFMove(style), WTFMove(firstLineStyle)); >- > if (is<RenderBlock>(childRenderer)) { > auto attributes = Layout::Box::ElementAttributes { Layout::Box::ElementType::IntegrationInlineBlock }; > if (is<RenderTable>(childRenderer) || is<RenderDetailsMarker>(childRenderer) || is<RenderListItem>(childRenderer)) >diff --git a/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp b/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp >index 11f7b7950c28..ecb3a77d200d 100644 >--- a/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp >+++ b/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp >@@ -407,7 +407,7 @@ static OptionSet<AvoidanceReason> canUseForChild(const RenderObject& child, Incl > } > > if (is<RenderListItem>(child)) { >- if (!child.style().isHorizontalWritingMode() || !child.style().isLeftToRightDirection() || child.isPositioned() || child.isFloating()) >+ if (child.isPositioned() || child.isFloating()) > SET_REASON_AND_RETURN_IF_NEEDED(FlowIsUnsupportedListItem, reasons, includeReasons); > return reasons; > } >@@ -496,7 +496,7 @@ OptionSet<AvoidanceReason> canUseForLineLayoutWithReason(const RenderBlockFlow& > } > if (flow.isRubyText() || flow.isRubyBase()) > SET_REASON_AND_RETURN_IF_NEEDED(ContentIsRuby, reasons, includeReasons); >- if (is<RenderListItem>(flow) && (!flow.style().isHorizontalWritingMode() || !flow.style().isLeftToRightDirection() || flow.isPositioned() || flow.isFloating())) >+ if (is<RenderListItem>(flow) && (flow.isPositioned() || flow.isFloating())) > SET_REASON_AND_RETURN_IF_NEEDED(FlowIsUnsupportedListItem, reasons, includeReasons); > if (!flow.style().hangingPunctuation().isEmpty()) > SET_REASON_AND_RETURN_IF_NEEDED(FlowHasHangingPunctuation, reasons, includeReasons); >diff --git a/Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp >index 26ca21abf2f0..4e7bd3da6a2c 100644 >--- a/Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp >+++ b/Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp >@@ -43,6 +43,7 @@ > #include "LayoutIntegrationCoverage.h" > #include "LayoutIntegrationInlineContentBuilder.h" > #include "LayoutIntegrationPagination.h" >+#include "LayoutListMarkerBox.h" > #include "LayoutReplacedBox.h" > #include "LayoutTreeBuilder.h" > #include "PaintInfo.h" >@@ -172,7 +173,7 @@ void LineLayout::updateListMarkerDimensions(const RenderListMarker& listMarker) > updateLayoutBoxDimensions(listMarker); > > auto& layoutBox = m_boxTree.layoutBoxForRenderer(listMarker); >- if (layoutBox.isOutsideListMarker()) { >+ if (downcast<Layout::ListMarkerBox>(layoutBox).isOutside()) { > auto& rootGeometry = m_layoutState.geometryForRootBox(); > auto& listMarkerGeometry = m_inlineFormattingState.boxGeometry(layoutBox); > auto horizontalMargin = listMarkerGeometry.horizontalMargin(); >diff --git a/Source/WebCore/layout/layouttree/LayoutBox.h b/Source/WebCore/layout/layouttree/LayoutBox.h >index 4ce460213dae..85d2b40b4472 100644 >--- a/Source/WebCore/layout/layouttree/LayoutBox.h >+++ b/Source/WebCore/layout/layouttree/LayoutBox.h >@@ -52,8 +52,6 @@ public: > TableBox, // The table box is a block-level box that contains the table's internal table boxes. > Image, > IFrame, >- InsideListMarker, >- OutsideListMarker, > IntegrationBlockContainer, > IntegrationInlineBlock, // Integration sets up inline-block boxes as replaced boxes. > GenericElement >@@ -63,13 +61,14 @@ public: > ElementType elementType; > }; > >- enum BaseTypeFlag : uint8_t { >+ enum BaseTypeFlag { > BoxFlag = 1 << 0, > InlineTextBoxFlag = 1 << 1, > LineBreakBoxFlag = 1 << 2, >- ReplacedBoxFlag = 1 << 3, >- InitialContainingBlockFlag = 1 << 4, >- ContainerBoxFlag = 1 << 5 >+ ListMarkerBoxFlag = 1 << 3, >+ ReplacedBoxFlag = 1 << 4, >+ InitialContainingBlockFlag = 1 << 5, >+ ContainerBoxFlag = 1 << 6 > }; > > virtual ~Box(); >@@ -141,9 +140,6 @@ public: > bool isFlexItem() const; > bool isIFrame() const { return m_elementAttributes && m_elementAttributes.value().elementType == ElementType::IFrame; } > bool isImage() const { return m_elementAttributes && m_elementAttributes.value().elementType == ElementType::Image; } >- bool isListMarker() const { return m_elementAttributes && (m_elementAttributes.value().elementType == ElementType::InsideListMarker || m_elementAttributes.value().elementType == ElementType::OutsideListMarker); } >- bool isInsideListMarker() const { return m_elementAttributes && m_elementAttributes.value().elementType == ElementType::InsideListMarker; } >- bool isOutsideListMarker() const { return m_elementAttributes && m_elementAttributes.value().elementType == ElementType::OutsideListMarker; } > bool isInternalRubyBox() const { return false; } > bool isIntegrationBlockContainer() const { return m_elementAttributes && m_elementAttributes.value().elementType == ElementType::IntegrationBlockContainer; } > bool isIntegrationRoot() const { return isIntegrationBlockContainer() && !m_parent; } >@@ -165,6 +161,7 @@ public: > bool isInlineTextBox() const { return baseTypeFlags().contains(InlineTextBoxFlag); } > bool isLineBreakBox() const { return baseTypeFlags().contains(LineBreakBoxFlag); } > bool isReplacedBox() const { return baseTypeFlags().contains(ReplacedBoxFlag); } >+ bool isListMarkerBox() const { return baseTypeFlags().contains(ListMarkerBoxFlag); } > > bool isPaddingApplicable() const; > bool isOverflowVisible() const; >@@ -232,7 +229,7 @@ private: > mutable WeakPtr<LayoutState> m_cachedLayoutState; > mutable std::unique_ptr<BoxGeometry> m_cachedGeometryForLayoutState; > >- unsigned m_baseTypeFlags : 6; // OptionSet<BaseTypeFlag> >+ unsigned m_baseTypeFlags : 7; // OptionSet<BaseTypeFlag> > bool m_hasRareData : 1; > bool m_isAnonymous : 1; > }; >diff --git a/Source/WebCore/layout/layouttree/LayoutListMarkerBox.cpp b/Source/WebCore/layout/layouttree/LayoutListMarkerBox.cpp >new file mode 100644 >index 000000000000..a0d0b3c192af >--- /dev/null >+++ b/Source/WebCore/layout/layouttree/LayoutListMarkerBox.cpp >@@ -0,0 +1,49 @@ >+/* >+ * Copyright (C) 2022 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+ * THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#include "config.h" >+#include "LayoutListMarkerBox.h" >+ >+#if ENABLE(LAYOUT_FORMATTING_CONTEXT) >+ >+#include "RenderStyle.h" >+#include <wtf/IsoMallocInlines.h> >+ >+namespace WebCore { >+namespace Layout { >+ >+WTF_MAKE_ISO_ALLOCATED_IMPL(ListMarkerBox); >+ >+ListMarkerBox::ListMarkerBox(IsImage isImage, IsOutside isOutside, RenderStyle&& style, std::unique_ptr<RenderStyle>&& firstLineStyle) >+ : ReplacedBox({ }, WTFMove(style), WTFMove(firstLineStyle), Box::ListMarkerBoxFlag) >+ , m_isImage(isImage == IsImage::Yes) >+ , m_isOutside(isOutside == IsOutside::Yes) >+{ >+} >+ >+} >+} >+ >+#endif >diff --git a/Source/WebCore/layout/layouttree/LayoutListMarkerBox.h b/Source/WebCore/layout/layouttree/LayoutListMarkerBox.h >new file mode 100644 >index 000000000000..cf2da8815728 >--- /dev/null >+++ b/Source/WebCore/layout/layouttree/LayoutListMarkerBox.h >@@ -0,0 +1,57 @@ >+/* >+ * Copyright (C) 2022 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+ * THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#pragma once >+ >+#if ENABLE(LAYOUT_FORMATTING_CONTEXT) >+ >+#include "LayoutReplacedBox.h" >+#include <wtf/IsoMalloc.h> >+ >+namespace WebCore { >+ >+namespace Layout { >+ >+class ListMarkerBox : public ReplacedBox { >+ WTF_MAKE_ISO_ALLOCATED(ListMarkerBox); >+public: >+ enum class IsImage : uint8_t { No, Yes }; >+ enum class IsOutside : uint8_t { No, Yes }; >+ ListMarkerBox(IsImage, IsOutside, RenderStyle&&, std::unique_ptr<RenderStyle>&& firstLineStyle = nullptr); >+ >+ bool isImage() const { return m_isImage; } >+ bool isOutside() const { return m_isOutside; } >+ >+private: >+ bool m_isImage { false }; >+ bool m_isOutside { false }; >+}; >+ >+} >+} >+ >+SPECIALIZE_TYPE_TRAITS_LAYOUT_BOX(ListMarkerBox, isListMarkerBox()) >+ >+#endif >diff --git a/Source/WebCore/layout/layouttree/LayoutReplacedBox.cpp b/Source/WebCore/layout/layouttree/LayoutReplacedBox.cpp >index 064a8cab4f61..795d80bb9f77 100644 >--- a/Source/WebCore/layout/layouttree/LayoutReplacedBox.cpp >+++ b/Source/WebCore/layout/layouttree/LayoutReplacedBox.cpp >@@ -36,8 +36,8 @@ namespace Layout { > > WTF_MAKE_ISO_ALLOCATED_IMPL(ReplacedBox); > >-ReplacedBox::ReplacedBox(std::optional<ElementAttributes> elementAttributes, RenderStyle&& style, std::unique_ptr<RenderStyle>&& firstLineStyle) >- : Box(elementAttributes, WTFMove(style), WTFMove(firstLineStyle), Box::ReplacedBoxFlag) >+ReplacedBox::ReplacedBox(std::optional<ElementAttributes> elementAttributes, RenderStyle&& style, std::unique_ptr<RenderStyle>&& firstLineStyle, OptionSet<BaseTypeFlag> baseTypeFlags) >+ : Box(elementAttributes, WTFMove(style), WTFMove(firstLineStyle), baseTypeFlags | ReplacedBoxFlag) > { > } > >diff --git a/Source/WebCore/layout/layouttree/LayoutReplacedBox.h b/Source/WebCore/layout/layouttree/LayoutReplacedBox.h >index def1696fe4c7..ea914886bb42 100644 >--- a/Source/WebCore/layout/layouttree/LayoutReplacedBox.h >+++ b/Source/WebCore/layout/layouttree/LayoutReplacedBox.h >@@ -39,7 +39,7 @@ namespace Layout { > class ReplacedBox : public Box { > WTF_MAKE_ISO_ALLOCATED(ReplacedBox); > public: >- ReplacedBox(std::optional<ElementAttributes>, RenderStyle&&, std::unique_ptr<RenderStyle>&& firstLineStyle = nullptr); >+ ReplacedBox(std::optional<ElementAttributes>, RenderStyle&&, std::unique_ptr<RenderStyle>&& firstLineStyle = nullptr, OptionSet<BaseTypeFlag> = { ReplacedBoxFlag }); > virtual ~ReplacedBox() = default; > > void setCachedImage(CachedImage& cachedImage) { m_cachedImage = &cachedImage; } >diff --git a/LayoutTests/platform/ios/css1/box_properties/margin_right-expected.txt b/LayoutTests/platform/ios/css1/box_properties/margin_right-expected.txt >index dfd30320b4db..a7b3d9105e25 100644 >--- a/LayoutTests/platform/ios/css1/box_properties/margin_right-expected.txt >+++ b/LayoutTests/platform/ios/css1/box_properties/margin_right-expected.txt >@@ -39,18 +39,18 @@ layer at (0,0) size 800x1065 > text run at (408,20) width 180: "width of the parent element." > RenderBlock {UL} at (0,351) size 759x100 [bgcolor=#808080] > RenderListItem {LI} at (40,0) size 719x20 >- RenderListMarker at (-11,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderText {#text} at (7,0) size 712x19 > text run at (7,0) width 712: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray." > RenderListItem {LI} at (40,20) size 694x60 [bgcolor=#FFFFFF] >- RenderListMarker at (7,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderText {#text} at (25,0) size 694x59 > text run at (25,0) width 669: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" > text run at (0,20) width 62: "checked. " > text run at (61,20) width 633: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin" > text run at (205,40) width 489: "to make 50 pixels of margin, and its background-color has been set to white." > RenderListItem {LI} at (40,80) size 719x20 >- RenderListMarker at (516,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderText {#text} at (534,0) size 185x19 > text run at (534,0) width 185: "This is an unclassed list item" > RenderBlock {P} at (0,467) size 784x20 [bgcolor=#C0C0C0] >@@ -93,19 +93,19 @@ layer at (0,0) size 800x1065 > text run at (391,20) width 181: "width of the parent element." > RenderBlock {UL} at (4,204) size 737x120 [bgcolor=#808080] > RenderListItem {LI} at (40,0) size 697x40 >- RenderListMarker at (2,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderText {#text} at (20,0) size 677x39 > text run at (20,0) width 677: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to" > text run at (665,20) width 32: "gray." > RenderListItem {LI} at (40,40) size 672x60 [bgcolor=#FFFFFF] >- RenderListMarker at (-15,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderText {#text} at (3,0) size 669x59 > text run at (3,0) width 669: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" > text run at (27,20) width 62: "checked. " > text run at (88,20) width 584: "This list item has its right margin also set to 25 pixels, which should combine with the list's" > text run at (134,40) width 538: "margin to make 50 pixels of margin, and its background-color has been set to white." > RenderListItem {LI} at (40,100) size 697x20 >- RenderListMarker at (494,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderText {#text} at (512,0) size 185x19 > text run at (512,0) width 185: "This is an unclassed list item" > RenderBlock {P} at (4,340) size 762x20 [bgcolor=#C0C0C0] >diff --git a/LayoutTests/platform/ios/css1/box_properties/padding_right-expected.txt b/LayoutTests/platform/ios/css1/box_properties/padding_right-expected.txt >index a3170ffff3e2..252bc2cc2b54 100644 >--- a/LayoutTests/platform/ios/css1/box_properties/padding_right-expected.txt >+++ b/LayoutTests/platform/ios/css1/box_properties/padding_right-expected.txt >@@ -54,12 +54,12 @@ layer at (0,0) size 800x1233 > text run at (80,40) width 508: "The text has been right-aligned in order to make the right padding easier to see." > RenderBlock {UL} at (0,491) size 784x80 [bgcolor=#808080] > RenderListItem {LI} at (40,0) size 719x40 >- RenderListMarker at (-11,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderText {#text} at (7,0) size 712x39 > text run at (7,0) width 712: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order to" > text run at (692,20) width 27: "test." > RenderListItem {LI} at (40,40) size 719x40 [bgcolor=#FFFFFF] >- RenderListMarker at (3,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderText {#text} at (21,0) size 673x39 > text run at (21,0) width 673: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL" > text run at (639,20) width 55: "element." >@@ -116,12 +116,12 @@ layer at (0,0) size 800x1233 > text run at (489,60) width 83: "easier to see." > RenderBlock {UL} at (4,364) size 762x80 [bgcolor=#808080] > RenderListItem {LI} at (40,0) size 697x40 >- RenderListMarker at (-17,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderText {#text} at (1,0) size 696x39 > text run at (1,0) width 696: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order" > text run at (654,20) width 43: "to test." > RenderListItem {LI} at (40,40) size 697x40 [bgcolor=#FFFFFF] >- RenderListMarker at (6,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderText {#text} at (24,0) size 648x39 > text run at (24,0) width 648: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the" > text run at (592,20) width 80: "UL element." >diff --git a/LayoutTests/platform/ios/fast/lists/001-vertical-expected.txt b/LayoutTests/platform/ios/fast/lists/001-vertical-expected.txt >index 8c58b49b2e6d..934ae8dff649 100644 >--- a/LayoutTests/platform/ios/fast/lists/001-vertical-expected.txt >+++ b/LayoutTests/platform/ios/fast/lists/001-vertical-expected.txt >@@ -15,7 +15,7 @@ layer at (0,0) size 800x600 > text run at (11,132) width 90: "List item text." > RenderBlock {UL} at (124,0) size 144x584 > RenderListItem {LI} at (0,40) size 144x544 [border: (2px solid #FF0000)] >- RenderListMarker at (52,555) size 19x7: bullet >- RenderText {#text} at (52,52) size 39x428 >- text run at (52,52) width 428: "Foo fofodfosjlkdf dslkdjlk asdlksjald djklsd klasjdkas sdajd lsadjkl" >- text run at (72,52) width 72: "asjdlksajdk" >+ RenderListMarker at (53,555) size 19x7: bullet >+ RenderText {#text} at (53,52) size 39x428 >+ text run at (53,52) width 428: "Foo fofodfosjlkdf dslkdjlk asdlksjald djklsd klasjdkas sdajd lsadjkl" >+ text run at (73,52) width 72: "asjdlksajdk" >diff --git a/LayoutTests/platform/ios/fast/lists/002-expected.txt b/LayoutTests/platform/ios/fast/lists/002-expected.txt >index 29785e24ca0e..038af8f5794f 100644 >--- a/LayoutTests/platform/ios/fast/lists/002-expected.txt >+++ b/LayoutTests/platform/ios/fast/lists/002-expected.txt >@@ -6,12 +6,12 @@ layer at (0,0) size 800x600 > RenderBlock {DIV} at (0,0) size 784x40 > RenderBlock {UL} at (0,0) size 784x40 > RenderListItem {LI} at (40,0) size 744x20 >- RenderListMarker at (686,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderInline {A} at (0,0) size 40x19 [color=#0000EE] > RenderText {#text} at (704,0) size 40x19 > text run at (704,0) width 40: "Home" > RenderListItem {LI} at (40,20) size 744x20 >- RenderListMarker at (668,0) size 8x19: bullet >+ RenderListMarker at (-18,0) size 7x19: bullet > RenderInline {A} at (0,0) size 58x19 [color=#0000EE] > RenderText {#text} at (686,0) size 58x19 > text run at (686,0) width 58: "Archives" >diff --git a/LayoutTests/platform/ios/fast/lists/003-expected.txt b/LayoutTests/platform/ios/fast/lists/003-expected.txt >index d20579090f51..8e684f844b68 100644 >--- a/LayoutTests/platform/ios/fast/lists/003-expected.txt >+++ b/LayoutTests/platform/ios/fast/lists/003-expected.txt >@@ -119,42 +119,42 @@ layer at (0,0) size 800x400 > RenderBlock {DIV} at (0,0) size 784x332 > RenderBlock {UL} at (0,0) size 784x160 > RenderListItem {LI} at (40,0) size 744x20 >- RenderListMarker at (686,0) size 7x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 40x19 [color=#0000EE] > RenderText {#text} at (704,0) size 40x19 > text run at (704,0) width 40: "About" > RenderListItem {LI} at (40,20) size 744x20 >- RenderListMarker at (669,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 57x19 [color=#0000EE] > RenderText {#text} at (687,0) size 57x19 > text run at (687,0) width 57: "Site map" > RenderListItem {LI} at (40,40) size 744x20 >- RenderListMarker at (668,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 58x19 [color=#0000EE] > RenderText {#text} at (686,0) size 58x19 > text run at (686,0) width 58: "Archives" > RenderListItem {LI} at (40,60) size 744x20 >- RenderListMarker at (674,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 52x19 [color=#0000EE] > RenderText {#text} at (692,0) size 52x19 > text run at (692,0) width 52: "Projects" > RenderListItem {LI} at (40,80) size 744x20 >- RenderListMarker at (682,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 44x19 [color=#0000EE] > RenderText {#text} at (700,0) size 44x19 > text run at (700,0) width 44: "Photos" > RenderListItem {LI} at (40,100) size 744x20 >- RenderListMarker at (668,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 58x19 [color=#0000EE] > RenderText {#text} at (686,0) size 58x19 > text run at (686,0) width 58: "Statistics" > RenderListItem {LI} at (40,120) size 744x20 >- RenderListMarker at (577,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 149x19 [color=#0000EE] > RenderText {#text} at (595,0) size 149x19 > text run at (595,0) width 149: "Accessibility statement" > RenderListItem {LI} at (40,140) size 744x20 >- RenderListMarker at (612,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 29x19 [color=#0000EE] > RenderText {#text} at (630,0) size 29x19 > text run at (630,0) width 29: "RSS" >@@ -167,38 +167,38 @@ layer at (0,0) size 800x400 > text run at (738,0) width 6: ")" > RenderBlock {UL} at (0,176) size 784x20 > RenderListItem {LI} at (40,0) size 744x20 >- RenderListMarker at (637,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 89x19 [color=#0000EE] > RenderText {#text} at (655,0) size 89x19 > text run at (655,0) width 89: "What is RSS?" > RenderBlock {UL} at (0,212) size 784x120 > RenderListItem {LI} at (40,0) size 744x20 >- RenderListMarker at (634,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 92x19 [color=#0000EE] > RenderText {#text} at (652,0) size 92x19 > text run at (652,0) width 92: "RSS Validator" > RenderListItem {LI} at (40,20) size 744x20 >- RenderListMarker at (577,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 149x19 [color=#0000EE] > RenderText {#text} at (595,0) size 149x19 > text run at (595,0) width 149: "Dive Into Accessibility" > RenderListItem {LI} at (40,40) size 744x20 >- RenderListMarker at (625,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 101x19 [color=#0000EE] > RenderText {#text} at (643,0) size 101x19 > text run at (643,0) width 101: "Dive Into OS X" > RenderListItem {LI} at (40,60) size 744x20 >- RenderListMarker at (627,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 99x19 [color=#0000EE] > RenderText {#text} at (645,0) size 99x19 > text run at (645,0) width 99: "Dive Into J2EE" > RenderListItem {LI} at (40,80) size 744x20 >- RenderListMarker at (615,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 111x19 [color=#0000EE] > RenderText {#text} at (633,0) size 111x19 > text run at (633,0) width 111: "Dive Into Python" > RenderListItem {LI} at (40,100) size 744x20 >- RenderListMarker at (679,0) size 8x19: bullet >+ RenderListMarker at (412,0) size 8x19: bullet > RenderInline {A} at (0,0) size 47x19 [color=#0000EE] > RenderText {#text} at (697,0) size 47x19 > text run at (697,0) width 47: "r\x{E9}sum\x{E9}" >diff --git a/LayoutTests/platform/ios/fast/lists/003-vertical-expected.txt b/LayoutTests/platform/ios/fast/lists/003-vertical-expected.txt >index 4a6aa8451070..8fbccb1511e8 100644 >--- a/LayoutTests/platform/ios/fast/lists/003-vertical-expected.txt >+++ b/LayoutTests/platform/ios/fast/lists/003-vertical-expected.txt >@@ -42,168 +42,168 @@ layer at (0,0) size 500x600 > text run at (41,73) width 4: "." > RenderBlock {OL} at (188,0) size 280x351 > RenderListItem {LI} at (0,40) size 40x311 >- RenderListMarker at (0,-21) size 19x16: "1" >- RenderText {#text} at (0,0) size 39x304 >- text run at (0,0) width 159: "New larger PowerBook. " >- text run at (0,158) width 145: "Still 1 GHz, but with a" >- text run at (20,0) width 146: "17-inch screen. $3299." >+ RenderListMarker at (1,-21) size 19x16: "1" >+ RenderText {#text} at (1,0) size 39x304 >+ text run at (1,0) width 159: "New larger PowerBook. " >+ text run at (1,158) width 145: "Still 1 GHz, but with a" >+ text run at (21,0) width 146: "17-inch screen. $3299." > RenderListItem {LI} at (40,40) size 40x311 >- RenderListMarker at (0,-21) size 19x16: "2" >- RenderText {#text} at (0,0) size 39x311 >- text run at (0,0) width 311: "New smaller PowerBook, with a 12-inch screen." >- text run at (20,0) width 44: "$1799." >+ RenderListMarker at (1,-21) size 19x16: "2" >+ RenderText {#text} at (1,0) size 39x311 >+ text run at (1,0) width 311: "New smaller PowerBook, with a 12-inch screen." >+ text run at (21,0) width 44: "$1799." > RenderListItem {LI} at (80,40) size 100x311 >- RenderListMarker at (0,-21) size 19x16: "3" >- RenderText {#text} at (0,0) size 19x95 >- text run at (0,0) width 95: "New browser: " >+ RenderListMarker at (1,-21) size 19x16: "3" >+ RenderText {#text} at (1,0) size 19x95 >+ text run at (1,0) width 95: "New browser: " > RenderInline {A} at (0,0) size 19x39 [color=#0000EE] >- RenderText {#text} at (0,94) size 19x39 >- text run at (0,94) width 39: "Safari" >- RenderText {#text} at (0,132) size 19x73 >- text run at (0,132) width 8: ". " >- text run at (0,140) width 64: "Engine is " >+ RenderText {#text} at (1,94) size 19x39 >+ text run at (1,94) width 39: "Safari" >+ RenderText {#text} at (1,132) size 19x73 >+ text run at (1,132) width 8: ". " >+ text run at (1,140) width 64: "Engine is " > RenderInline {A} at (0,0) size 19x78 [color=#0000EE] >- RenderText {#text} at (0,204) size 19x78 >- text run at (0,204) width 77: "open source" >- RenderText {#text} at (0,281) size 19x17 >- text run at (0,281) width 17: " (a" >+ RenderText {#text} at (1,204) size 19x78 >+ text run at (1,204) width 77: "open source" >+ RenderText {#text} at (1,281) size 19x17 >+ text run at (1,281) width 17: " (a" > RenderInline {A} at (0,0) size 19x109 [color=#0000EE] >- RenderText {#text} at (20,0) size 19x109 >- text run at (20,0) width 109: "modified version" >- RenderText {#text} at (20,108) size 19x23 >- text run at (20,108) width 22: " of " >+ RenderText {#text} at (21,0) size 19x109 >+ text run at (21,0) width 109: "modified version" >+ RenderText {#text} at (21,108) size 19x23 >+ text run at (21,108) width 22: " of " > RenderInline {A} at (0,0) size 19x58 [color=#0000EE] >- RenderText {#text} at (20,130) size 19x58 >- text run at (20,130) width 57: "KHTML" >- RenderText {#text} at (20,187) size 79x305 >- text run at (20,187) width 78: "), rest of the" >- text run at (40,0) width 305: "application is free but not open source (just like" >- text run at (60,0) width 58: "the OS). " >- text run at (60,57) width 124: "Only runs on 10.2. " >- text run at (60,180) width 122: "Currently in public" >- text run at (80,0) width 31: "beta." >+ RenderText {#text} at (21,130) size 19x58 >+ text run at (21,130) width 57: "KHTML" >+ RenderText {#text} at (21,187) size 79x305 >+ text run at (21,187) width 78: "), rest of the" >+ text run at (41,0) width 305: "application is free but not open source (just like" >+ text run at (61,0) width 58: "the OS). " >+ text run at (61,57) width 124: "Only runs on 10.2. " >+ text run at (61,180) width 122: "Currently in public" >+ text run at (81,0) width 31: "beta." > RenderListItem {LI} at (180,40) size 40x311 >- RenderListMarker at (0,-21) size 19x16: "4" >- RenderText {#text} at (0,0) size 39x268 >- text run at (0,0) width 243: "New presentation software: Keynote. " >- text run at (0,242) width 25: "The" >- text run at (20,0) width 163: "software Steve Jobs uses." >+ RenderListMarker at (1,-21) size 19x16: "4" >+ RenderText {#text} at (1,0) size 39x268 >+ text run at (1,0) width 243: "New presentation software: Keynote. " >+ text run at (1,242) width 25: "The" >+ text run at (21,0) width 163: "software Steve Jobs uses." > RenderListItem {LI} at (220,40) size 40x311 >- RenderListMarker at (0,-21) size 19x16: "5" >- RenderText {#text} at (0,0) size 19x109 >- text run at (0,0) width 109: "New versions of " >+ RenderListMarker at (1,-21) size 19x16: "5" >+ RenderText {#text} at (1,0) size 19x109 >+ text run at (1,0) width 109: "New versions of " > RenderInline {A} at (0,0) size 19x48 [color=#0000EE] >- RenderText {#text} at (0,108) size 19x48 >- text run at (0,108) width 47: "iMovie" >- RenderText {#text} at (0,155) size 19x9 >- text run at (0,155) width 8: ", " >+ RenderText {#text} at (1,108) size 19x48 >+ text run at (1,108) width 47: "iMovie" >+ RenderText {#text} at (1,155) size 19x9 >+ text run at (1,155) width 8: ", " > RenderInline {A} at (0,0) size 19x42 [color=#0000EE] >- RenderText {#text} at (0,163) size 19x42 >- text run at (0,163) width 42: "iPhoto" >- RenderText {#text} at (0,204) size 19x9 >- text run at (0,204) width 8: ", " >+ RenderText {#text} at (1,163) size 19x42 >+ text run at (1,163) width 42: "iPhoto" >+ RenderText {#text} at (1,204) size 19x9 >+ text run at (1,204) width 8: ", " > RenderInline {A} at (0,0) size 19x44 [color=#0000EE] >- RenderText {#text} at (0,212) size 19x44 >- text run at (0,212) width 43: "iTunes" >- RenderText {#text} at (0,255) size 39x260 >- text run at (0,255) width 4: "." >- text run at (20,0) width 169: "Bundled into a box called " >+ RenderText {#text} at (1,212) size 19x44 >+ text run at (1,212) width 43: "iTunes" >+ RenderText {#text} at (1,255) size 39x260 >+ text run at (1,255) width 4: "." >+ text run at (21,0) width 169: "Bundled into a box called " > RenderInline {A} at (0,0) size 19x32 [color=#0000EE] >- RenderText {#text} at (20,168) size 19x32 >- text run at (20,168) width 32: "iLife" >- RenderText {#text} at (20,199) size 19x60 >- text run at (20,199) width 59: ", for $49." >+ RenderText {#text} at (21,168) size 19x32 >+ text run at (21,168) width 32: "iLife" >+ RenderText {#text} at (21,199) size 19x60 >+ text run at (21,199) width 59: ", for $49." > RenderListItem {LI} at (260,40) size 20x311 >- RenderListMarker at (0,-21) size 19x16: "6" >+ RenderListMarker at (1,-21) size 19x16: "6" > RenderInline {A} at (0,0) size 19x115 [color=#0000EE] >- RenderText {#text} at (0,0) size 19x115 >- text run at (0,0) width 115: "Final Cut Express" >- RenderText {#text} at (0,114) size 19x168 >- text run at (0,114) width 132: " for creating DVDs. " >- text run at (0,245) width 36: "$299." >+ RenderText {#text} at (1,0) size 19x115 >+ text run at (1,0) width 115: "Final Cut Express" >+ RenderText {#text} at (1,114) size 19x168 >+ text run at (1,114) width 132: " for creating DVDs. " >+ text run at (1,245) width 36: "$299." > RenderBlock {DIV} at (0,0) size 332x584 > RenderBlock {UL} at (0,0) size 160x584 > RenderListItem {LI} at (0,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x40 [color=#0000EE] >- RenderText {#text} at (0,504) size 19x40 >- text run at (0,504) width 40: "About" >+ RenderText {#text} at (1,504) size 19x40 >+ text run at (1,504) width 40: "About" > RenderListItem {LI} at (20,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x57 [color=#0000EE] >- RenderText {#text} at (0,487) size 19x57 >- text run at (0,487) width 57: "Site map" >+ RenderText {#text} at (1,487) size 19x57 >+ text run at (1,487) width 57: "Site map" > RenderListItem {LI} at (40,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x58 [color=#0000EE] >- RenderText {#text} at (0,486) size 19x58 >- text run at (0,486) width 58: "Archives" >+ RenderText {#text} at (1,486) size 19x58 >+ text run at (1,486) width 58: "Archives" > RenderListItem {LI} at (60,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x52 [color=#0000EE] >- RenderText {#text} at (0,492) size 19x52 >- text run at (0,492) width 52: "Projects" >+ RenderText {#text} at (1,492) size 19x52 >+ text run at (1,492) width 52: "Projects" > RenderListItem {LI} at (80,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x44 [color=#0000EE] >- RenderText {#text} at (0,500) size 19x44 >- text run at (0,500) width 44: "Photos" >+ RenderText {#text} at (1,500) size 19x44 >+ text run at (1,500) width 44: "Photos" > RenderListItem {LI} at (100,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x58 [color=#0000EE] >- RenderText {#text} at (0,486) size 19x58 >- text run at (0,486) width 58: "Statistics" >+ RenderText {#text} at (1,486) size 19x58 >+ text run at (1,486) width 58: "Statistics" > RenderListItem {LI} at (120,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x149 [color=#0000EE] >- RenderText {#text} at (0,395) size 19x149 >- text run at (0,395) width 149: "Accessibility statement" >+ RenderText {#text} at (1,395) size 19x149 >+ text run at (1,395) width 149: "Accessibility statement" > RenderListItem {LI} at (140,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x29 [color=#0000EE] >- RenderText {#text} at (0,430) size 19x29 >- text run at (0,430) width 29: "RSS" >- RenderText {#text} at (0,458) size 19x11 >- text run at (0,458) width 10: " (" >+ RenderText {#text} at (1,430) size 19x29 >+ text run at (1,430) width 29: "RSS" >+ RenderText {#text} at (1,458) size 19x11 >+ text run at (1,458) width 10: " (" > RenderInline {A} at (0,0) size 19x71 [color=#0000EE] >- RenderText {#text} at (0,468) size 19x71 >- text run at (0,468) width 71: "more feeds" >- RenderText {#text} at (0,538) size 19x6 >- text run at (0,538) width 6: ")" >+ RenderText {#text} at (1,468) size 19x71 >+ text run at (1,468) width 71: "more feeds" >+ RenderText {#text} at (1,538) size 19x6 >+ text run at (1,538) width 6: ")" > RenderBlock {UL} at (176,0) size 20x584 > RenderListItem {LI} at (0,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x89 [color=#0000EE] >- RenderText {#text} at (0,455) size 19x89 >- text run at (0,455) width 89: "What is RSS?" >+ RenderText {#text} at (1,455) size 19x89 >+ text run at (1,455) width 89: "What is RSS?" > RenderBlock {UL} at (212,0) size 120x584 > RenderListItem {LI} at (0,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x92 [color=#0000EE] >- RenderText {#text} at (0,452) size 19x92 >- text run at (0,452) width 92: "RSS Validator" >+ RenderText {#text} at (1,452) size 19x92 >+ text run at (1,452) width 92: "RSS Validator" > RenderListItem {LI} at (20,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x149 [color=#0000EE] >- RenderText {#text} at (0,395) size 19x149 >- text run at (0,395) width 149: "Dive Into Accessibility" >+ RenderText {#text} at (1,395) size 19x149 >+ text run at (1,395) width 149: "Dive Into Accessibility" > RenderListItem {LI} at (40,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x101 [color=#0000EE] >- RenderText {#text} at (0,443) size 19x101 >- text run at (0,443) width 101: "Dive Into OS X" >+ RenderText {#text} at (1,443) size 19x101 >+ text run at (1,443) width 101: "Dive Into OS X" > RenderListItem {LI} at (60,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x99 [color=#0000EE] >- RenderText {#text} at (0,445) size 19x99 >- text run at (0,445) width 99: "Dive Into J2EE" >+ RenderText {#text} at (1,445) size 19x99 >+ text run at (1,445) width 99: "Dive Into J2EE" > RenderListItem {LI} at (80,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x111 [color=#0000EE] >- RenderText {#text} at (0,433) size 19x111 >- text run at (0,433) width 111: "Dive Into Python" >+ RenderText {#text} at (1,433) size 19x111 >+ text run at (1,433) width 111: "Dive Into Python" > RenderListItem {LI} at (100,40) size 20x544 >- RenderListMarker at (0,292) size 19x8: bullet >+ RenderListMarker at (1,292) size 19x7: bullet > RenderInline {A} at (0,0) size 19x47 [color=#0000EE] >- RenderText {#text} at (0,497) size 19x47 >- text run at (0,497) width 47: "r\x{E9}sum\x{E9}" >+ RenderText {#text} at (1,497) size 19x47 >+ text run at (1,497) width 47: "r\x{E9}sum\x{E9}" >diff --git a/LayoutTests/platform/ios/fast/lists/008-vertical-expected.txt b/LayoutTests/platform/ios/fast/lists/008-vertical-expected.txt >index 4b7866d282c7..c16ecbf7c04d 100644 >--- a/LayoutTests/platform/ios/fast/lists/008-vertical-expected.txt >+++ b/LayoutTests/platform/ios/fast/lists/008-vertical-expected.txt >@@ -5,171 +5,171 @@ layer at (0,0) size 1944x600 > RenderBody {BODY} at (8,8) size 1920x584 > RenderBlock {UL} at (0,0) size 142x186 [border: (1px solid #0000FF)] > RenderListItem {LI} at (1,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,-18) size 19x7: bullet >- RenderText {#text} at (10,10) size 19x62 >- text run at (10,10) width 62: "First item" >+ RenderListMarker at (11,-18) size 19x7: bullet >+ RenderText {#text} at (11,10) size 19x62 >+ text run at (11,10) width 62: "First item" > RenderListItem {LI} at (41,41) size 60x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,-18) size 19x7: bullet >- RenderText {#text} at (10,10) size 39x107 >- text run at (10,10) width 107: "Second and very" >- text run at (30,10) width 94: "very long item" >+ RenderListMarker at (11,-18) size 19x7: bullet >+ RenderText {#text} at (11,10) size 39x107 >+ text run at (11,10) width 107: "Second and very" >+ text run at (31,10) width 94: "very long item" > RenderListItem {LI} at (101,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,-18) size 19x7: bullet >- RenderText {#text} at (10,10) size 19x68 >- text run at (10,10) width 68: "Third item" >+ RenderListMarker at (11,-18) size 19x7: bullet >+ RenderText {#text} at (11,10) size 19x68 >+ text run at (11,10) width 68: "Third item" > RenderBlock {UL} at (158,0) size 142x186 [border: (1px solid #FF0000)] > RenderListItem {LI} at (1,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,154) size 19x8: bullet >- RenderText {#text} at (10,71) size 19x63 >- text run at (10,71) width 62: "First item" >+ RenderListMarker at (11,154) size 19x8: bullet >+ RenderText {#text} at (11,71) size 19x63 >+ text run at (11,71) width 62: "First item" > RenderListItem {LI} at (41,1) size 60x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,154) size 19x8: bullet >- RenderText {#text} at (10,26) size 39x108 >- text run at (10,26) width 107: "Second and very" >- text run at (30,39) width 94: "very long item" >+ RenderListMarker at (11,154) size 19x8: bullet >+ RenderText {#text} at (11,26) size 39x108 >+ text run at (11,26) width 107: "Second and very" >+ text run at (31,39) width 94: "very long item" > RenderListItem {LI} at (101,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,154) size 19x8: bullet >- RenderText {#text} at (10,65) size 19x69 >- text run at (10,65) width 68: "Third item" >+ RenderListMarker at (11,154) size 19x8: bullet >+ RenderText {#text} at (11,65) size 19x69 >+ text run at (11,65) width 68: "Third item" > RenderBlock {UL} at (316,0) size 142x186 [border: (1px solid #0000FF)] > RenderListItem {LI} at (1,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,9) size 19x7: bullet >- RenderText {#text} at (10,25) size 19x62 >- text run at (10,25) width 62: "First item" >+ RenderListMarker at (11,9) size 19x7: bullet >+ RenderText {#text} at (11,25) size 19x62 >+ text run at (11,25) width 62: "First item" > RenderListItem {LI} at (41,41) size 60x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,9) size 19x7: bullet >- RenderText {#text} at (10,25) size 39x122 >- text run at (10,25) width 107: "Second and very" >- text run at (30,10) width 94: "very long item" >+ RenderListMarker at (11,9) size 19x7: bullet >+ RenderText {#text} at (11,25) size 39x122 >+ text run at (11,25) width 107: "Second and very" >+ text run at (31,10) width 94: "very long item" > RenderListItem {LI} at (101,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,9) size 19x7: bullet >- RenderText {#text} at (10,25) size 19x68 >- text run at (10,25) width 68: "Third item" >+ RenderListMarker at (11,9) size 19x7: bullet >+ RenderText {#text} at (11,25) size 19x68 >+ text run at (11,25) width 68: "Third item" > RenderBlock {UL} at (474,0) size 142x186 [border: (1px solid #FF0000)] > RenderListItem {LI} at (1,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,127) size 19x8: bullet >- RenderText {#text} at (10,56) size 19x63 >- text run at (10,56) width 62: "First item" >+ RenderListMarker at (11,127) size 19x8: bullet >+ RenderText {#text} at (11,56) size 19x63 >+ text run at (11,56) width 62: "First item" > RenderListItem {LI} at (41,1) size 60x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,127) size 19x8: bullet >- RenderText {#text} at (10,11) size 39x123 >- text run at (10,11) width 107: "Second and very" >- text run at (30,39) width 94: "very long item" >+ RenderListMarker at (11,127) size 19x8: bullet >+ RenderText {#text} at (11,11) size 39x123 >+ text run at (11,11) width 107: "Second and very" >+ text run at (31,39) width 94: "very long item" > RenderListItem {LI} at (101,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,127) size 19x8: bullet >- RenderText {#text} at (10,50) size 19x69 >- text run at (10,50) width 68: "Third item" >+ RenderListMarker at (11,127) size 19x8: bullet >+ RenderText {#text} at (11,50) size 19x69 >+ text run at (11,50) width 68: "Third item" > RenderBlock {UL} at (632,0) size 142x186 [border: (1px solid #0000FF)] > RenderListItem {LI} at (1,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,-17) size 10x10 >- RenderText {#text} at (10,10) size 19x62 >- text run at (10,10) width 62: "First item" >+ RenderListMarker at (15,-17) size 10x10 >+ RenderText {#text} at (11,10) size 19x62 >+ text run at (11,10) width 62: "First item" > RenderListItem {LI} at (41,41) size 60x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,-17) size 10x10 >- RenderText {#text} at (10,10) size 39x107 >- text run at (10,10) width 107: "Second and very" >- text run at (30,10) width 94: "very long item" >+ RenderListMarker at (15,-17) size 10x10 >+ RenderText {#text} at (11,10) size 39x107 >+ text run at (11,10) width 107: "Second and very" >+ text run at (31,10) width 94: "very long item" > RenderListItem {LI} at (101,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,-17) size 10x10 >- RenderText {#text} at (10,10) size 19x68 >- text run at (10,10) width 68: "Third item" >+ RenderListMarker at (15,-17) size 10x10 >+ RenderText {#text} at (11,10) size 19x68 >+ text run at (11,10) width 68: "Third item" > RenderBlock {UL} at (790,0) size 142x186 [border: (1px solid #FF0000)] > RenderListItem {LI} at (1,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,150) size 10x11 >- RenderText {#text} at (10,71) size 19x63 >- text run at (10,71) width 62: "First item" >+ RenderListMarker at (15,150) size 10x11 >+ RenderText {#text} at (11,71) size 19x63 >+ text run at (11,71) width 62: "First item" > RenderListItem {LI} at (41,1) size 60x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,150) size 10x11 >- RenderText {#text} at (10,26) size 39x108 >- text run at (10,26) width 107: "Second and very" >- text run at (30,39) width 94: "very long item" >+ RenderListMarker at (15,150) size 10x11 >+ RenderText {#text} at (11,26) size 39x108 >+ text run at (11,26) width 107: "Second and very" >+ text run at (31,39) width 94: "very long item" > RenderListItem {LI} at (101,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,150) size 10x11 >- RenderText {#text} at (10,65) size 19x69 >- text run at (10,65) width 68: "Third item" >+ RenderListMarker at (15,150) size 10x11 >+ RenderText {#text} at (11,65) size 19x69 >+ text run at (11,65) width 68: "Third item" > RenderBlock {UL} at (948,0) size 162x186 [border: (1px solid #0000FF)] > RenderListItem {LI} at (1,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,10) size 10x10 >- RenderText {#text} at (10,27) size 19x62 >- text run at (10,27) width 62: "First item" >+ RenderListMarker at (15,10) size 10x10 >+ RenderText {#text} at (11,27) size 19x62 >+ text run at (11,27) width 62: "First item" > RenderListItem {LI} at (41,41) size 80x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,10) size 10x10 >- RenderText {#text} at (10,27) size 59x94 >- text run at (10,27) width 75: "Second and" >- text run at (30,10) width 94: "very very long" >- text run at (50,10) width 29: "item" >+ RenderListMarker at (15,10) size 10x10 >+ RenderText {#text} at (11,27) size 59x94 >+ text run at (11,27) width 75: "Second and" >+ text run at (31,10) width 94: "very very long" >+ text run at (51,10) width 29: "item" > RenderListItem {LI} at (121,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,10) size 10x10 >- RenderText {#text} at (10,27) size 19x68 >- text run at (10,27) width 68: "Third item" >+ RenderListMarker at (15,10) size 10x10 >+ RenderText {#text} at (11,27) size 19x68 >+ text run at (11,27) width 68: "Third item" > RenderBlock {UL} at (1126,0) size 162x186 [border: (1px solid #FF0000)] > RenderListItem {LI} at (1,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,123) size 10x11 >- RenderText {#text} at (10,54) size 19x63 >- text run at (10,54) width 62: "First item" >+ RenderListMarker at (15,123) size 10x11 >+ RenderText {#text} at (11,54) size 19x63 >+ text run at (11,54) width 62: "First item" > RenderListItem {LI} at (41,1) size 80x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,123) size 10x11 >- RenderText {#text} at (10,41) size 59x95 >- text run at (10,41) width 75: "Second and" >- text run at (30,39) width 94: "very very long" >- text run at (50,104) width 29: "item" >+ RenderListMarker at (15,123) size 10x11 >+ RenderText {#text} at (11,41) size 59x95 >+ text run at (11,41) width 75: "Second and" >+ text run at (31,39) width 94: "very very long" >+ text run at (51,104) width 29: "item" > RenderListItem {LI} at (121,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (14,123) size 10x11 >- RenderText {#text} at (10,48) size 19x69 >- text run at (10,48) width 68: "Third item" >+ RenderListMarker at (15,123) size 10x11 >+ RenderText {#text} at (11,48) size 19x69 >+ text run at (11,48) width 68: "Third item" > RenderBlock {OL} at (1304,0) size 142x186 [border: (1px solid #0000FF)] > RenderListItem {LI} at (1,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,-21) size 19x16: "1" >- RenderText {#text} at (10,10) size 19x62 >- text run at (10,10) width 62: "First item" >+ RenderListMarker at (11,-21) size 19x16: "1" >+ RenderText {#text} at (11,10) size 19x62 >+ text run at (11,10) width 62: "First item" > RenderListItem {LI} at (41,41) size 60x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,-21) size 19x16: "2" >- RenderText {#text} at (10,10) size 39x107 >- text run at (10,10) width 107: "Second and very" >- text run at (30,10) width 94: "very long item" >+ RenderListMarker at (11,-21) size 19x16: "2" >+ RenderText {#text} at (11,10) size 39x107 >+ text run at (11,10) width 107: "Second and very" >+ text run at (31,10) width 94: "very long item" > RenderListItem {LI} at (101,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,-21) size 19x16: "3" >- RenderText {#text} at (10,10) size 19x68 >- text run at (10,10) width 68: "Third item" >+ RenderListMarker at (11,-21) size 19x16: "3" >+ RenderText {#text} at (11,10) size 19x68 >+ text run at (11,10) width 68: "Third item" > RenderBlock {OL} at (1462,0) size 142x186 [border: (1px solid #FF0000)] > RenderListItem {LI} at (1,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,148) size 19x17: "1" >- RenderText {#text} at (10,71) size 19x63 >- text run at (10,71) width 62: "First item" >+ RenderListMarker at (11,148) size 19x17: "1" >+ RenderText {#text} at (11,71) size 19x63 >+ text run at (11,71) width 62: "First item" > RenderListItem {LI} at (41,1) size 60x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,148) size 19x17: "2" >- RenderText {#text} at (10,26) size 39x108 >- text run at (10,26) width 107: "Second and very" >- text run at (30,39) width 94: "very long item" >+ RenderListMarker at (11,148) size 19x17: "2" >+ RenderText {#text} at (11,26) size 39x108 >+ text run at (11,26) width 107: "Second and very" >+ text run at (31,39) width 94: "very long item" > RenderListItem {LI} at (101,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,148) size 19x17: "3" >- RenderText {#text} at (10,65) size 19x69 >- text run at (10,65) width 68: "Third item" >+ RenderListMarker at (11,148) size 19x17: "3" >+ RenderText {#text} at (11,65) size 19x69 >+ text run at (11,65) width 68: "Third item" > RenderBlock {OL} at (1620,0) size 142x186 [border: (1px solid #0000FF)] > RenderListItem {LI} at (1,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,10) size 19x16: "1" >- RenderText {#text} at (10,26) size 19x62 >- text run at (10,26) width 62: "First item" >+ RenderListMarker at (11,10) size 19x16: "1" >+ RenderText {#text} at (11,26) size 19x62 >+ text run at (11,26) width 62: "First item" > RenderListItem {LI} at (41,41) size 60x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,10) size 19x16: "2" >- RenderText {#text} at (10,26) size 39x123 >- text run at (10,26) width 107: "Second and very" >- text run at (30,10) width 94: "very long item" >+ RenderListMarker at (11,10) size 19x16: "2" >+ RenderText {#text} at (11,26) size 39x123 >+ text run at (11,26) width 107: "Second and very" >+ text run at (31,10) width 94: "very long item" > RenderListItem {LI} at (101,41) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,10) size 19x16: "3" >- RenderText {#text} at (10,26) size 19x68 >- text run at (10,26) width 68: "Third item" >+ RenderListMarker at (11,10) size 19x16: "3" >+ RenderText {#text} at (11,26) size 19x68 >+ text run at (11,26) width 68: "Third item" > RenderBlock {OL} at (1778,0) size 142x186 [border: (1px solid #FF0000)] > RenderListItem {LI} at (1,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,117) size 19x17: "1" >- RenderText {#text} at (10,55) size 19x63 >- text run at (10,55) width 62: "First item" >+ RenderListMarker at (11,117) size 19x17: "1" >+ RenderText {#text} at (11,55) size 19x63 >+ text run at (11,55) width 62: "First item" > RenderListItem {LI} at (41,1) size 60x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,117) size 19x17: "2" >- RenderText {#text} at (10,10) size 39x124 >- text run at (10,10) width 107: "Second and very" >- text run at (30,39) width 94: "very long item" >+ RenderListMarker at (11,117) size 19x17: "2" >+ RenderText {#text} at (11,10) size 39x124 >+ text run at (11,10) width 107: "Second and very" >+ text run at (31,39) width 94: "very long item" > RenderListItem {LI} at (101,1) size 40x144 [border: (5px solid #FFA500)] >- RenderListMarker at (10,117) size 19x17: "3" >- RenderText {#text} at (10,49) size 19x69 >- text run at (10,49) width 68: "Third item" >+ RenderListMarker at (11,117) size 19x17: "3" >+ RenderText {#text} at (11,49) size 19x69 >+ text run at (11,49) width 68: "Third item" >diff --git a/LayoutTests/platform/ios/fast/overflow/overflow-rtl-vertical-expected.txt b/LayoutTests/platform/ios/fast/overflow/overflow-rtl-vertical-expected.txt >index d2043ea78383..ee8649309330 100644 >--- a/LayoutTests/platform/ios/fast/overflow/overflow-rtl-vertical-expected.txt >+++ b/LayoutTests/platform/ios/fast/overflow/overflow-rtl-vertical-expected.txt >@@ -17,17 +17,17 @@ layer at (0,0) size 343x600 > text run at (1,0) width 469: "The right column should be a mirror-image of the left column in terms of" > RenderBlock {UL} at (92,0) size 60x584 > RenderListItem {LI} at (0,40) size 20x544 >- RenderListMarker at (0,-18) size 19x7: bullet >- RenderText {#text} at (0,0) size 19x168 >- text run at (0,0) width 168: "the presence of a scrollbar" >+ RenderListMarker at (1,-18) size 19x7: bullet >+ RenderText {#text} at (1,0) size 19x168 >+ text run at (1,0) width 168: "the presence of a scrollbar" > RenderListItem {LI} at (20,40) size 20x544 >- RenderListMarker at (0,-18) size 19x7: bullet >- RenderText {#text} at (0,0) size 19x242 >- text run at (0,0) width 242: "the initial position of the scroll thumb" >+ RenderListMarker at (1,-18) size 19x7: bullet >+ RenderText {#text} at (1,0) size 19x242 >+ text run at (1,0) width 242: "the initial position of the scroll thumb" > RenderListItem {LI} at (40,40) size 20x544 >- RenderListMarker at (0,-18) size 19x7: bullet >- RenderText {#text} at (0,0) size 19x340 >- text run at (0,0) width 340: "which letters are visible initially and when you scroll" >+ RenderListMarker at (1,-18) size 19x7: bullet >+ RenderText {#text} at (1,0) size 19x340 >+ text run at (1,0) width 340: "which letters are visible initially and when you scroll" > RenderTable {TABLE} at (168,0) size 151x256 > RenderTableSection {TBODY} at (0,0) size 151x256 > RenderTableRow {TR} at (0,2) size 147x256 >diff --git a/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt b/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt >index 465c4ca65341..54cd1a4db1f6 100644 >--- a/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt >+++ b/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt >@@ -39,19 +39,19 @@ layer at (0,0) size 785x1023 > text run at (396,18) width 181: "width of the parent element." > RenderBlock {UL} at (0,343) size 744x108 [bgcolor=#808080] > RenderListItem {LI} at (40,0) size 704x36 >- RenderListMarker at (10,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderText {#text} at (27,0) size 677x36 > text run at (27,0) width 677: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to" > text run at (672,18) width 32: "gray." > RenderListItem {LI} at (40,36) size 679x54 [bgcolor=#FFFFFF] >- RenderListMarker at (-7,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderText {#text} at (10,0) size 669x54 > text run at (10,0) width 669: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" > text run at (34,18) width 62: "checked. " > text run at (95,18) width 584: "This list item has its right margin also set to 25 pixels, which should combine with the list's" > text run at (141,36) width 538: "margin to make 50 pixels of margin, and its background-color has been set to white." > RenderListItem {LI} at (40,90) size 704x18 >- RenderListMarker at (502,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderText {#text} at (519,0) size 185x18 > text run at (519,0) width 185: "This is an unclassed list item" > RenderBlock {P} at (0,467) size 769x18 [bgcolor=#C0C0C0] >@@ -94,19 +94,19 @@ layer at (0,0) size 785x1023 > text run at (356,18) width 205: "the width of the parent element." > RenderBlock {UL} at (4,192) size 722x108 [bgcolor=#808080] > RenderListItem {LI} at (40,0) size 682x36 >- RenderListMarker at (-12,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderText {#text} at (5,0) size 677x36 > text run at (5,0) width 677: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to" > text run at (650,18) width 32: "gray." > RenderListItem {LI} at (40,36) size 657x54 [bgcolor=#FFFFFF] >- RenderListMarker at (23,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderText {#text} at (40,0) size 637x54 > text run at (40,0) width 617: "Another list item might not be such a bad idea, either, considering that such things do need to be" > text run at (20,18) width 110: "double-checked. " > text run at (129,18) width 528: "This list item has its right margin also set to 25 pixels, which should combine with" > text run at (62,36) width 595: "the list's margin to make 50 pixels of margin, and its background-color has been set to white." > RenderListItem {LI} at (40,90) size 682x18 >- RenderListMarker at (480,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderText {#text} at (497,0) size 185x18 > text run at (497,0) width 185: "This is an unclassed list item" > RenderBlock {P} at (4,316) size 747x18 [bgcolor=#C0C0C0] >diff --git a/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt b/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt >index 6f531535891f..a93de833ade5 100644 >--- a/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt >+++ b/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt >@@ -55,12 +55,12 @@ layer at (0,0) size 785x1171 > text run at (552,54) width 25: "see." > RenderBlock {UL} at (0,487) size 769x72 [bgcolor=#808080] > RenderListItem {LI} at (40,0) size 704x36 >- RenderListMarker at (-9,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderText {#text} at (8,0) size 696x36 > text run at (8,0) width 696: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order" > text run at (661,18) width 43: "to test." > RenderListItem {LI} at (40,36) size 704x36 [bgcolor=#FFFFFF] >- RenderListMarker at (-11,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderText {#text} at (6,0) size 673x36 > text run at (6,0) width 673: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL" > text run at (624,18) width 55: "element." >@@ -117,12 +117,12 @@ layer at (0,0) size 785x1171 > text run at (478,54) width 83: "easier to see." > RenderBlock {UL} at (4,336) size 747x72 [bgcolor=#808080] > RenderListItem {LI} at (40,0) size 682x36 >- RenderListMarker at (7,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderText {#text} at (24,0) size 658x36 > text run at (24,0) width 658: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in" > text run at (601,18) width 81: "order to test." > RenderListItem {LI} at (40,36) size 682x36 [bgcolor=#FFFFFF] >- RenderListMarker at (-8,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderText {#text} at (9,0) size 648x36 > text run at (9,0) width 648: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the" > text run at (577,18) width 80: "UL element." >diff --git a/LayoutTests/platform/mac/fast/lists/002-expected.txt b/LayoutTests/platform/mac/fast/lists/002-expected.txt >index 8ec706fc6f72..ba6c304a1a8e 100644 >--- a/LayoutTests/platform/mac/fast/lists/002-expected.txt >+++ b/LayoutTests/platform/mac/fast/lists/002-expected.txt >@@ -6,12 +6,12 @@ layer at (0,0) size 800x600 > RenderBlock {DIV} at (0,0) size 784x36 > RenderBlock {UL} at (0,0) size 784x36 > RenderListItem {LI} at (40,0) size 744x18 >- RenderListMarker at (687,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderInline {A} at (0,0) size 40x18 [color=#0000EE] > RenderText {#text} at (704,0) size 40x18 > text run at (704,0) width 40: "Home" > RenderListItem {LI} at (40,18) size 744x18 >- RenderListMarker at (669,0) size 8x18: bullet >+ RenderListMarker at (-17,0) size 7x18: bullet > RenderInline {A} at (0,0) size 58x18 [color=#0000EE] > RenderText {#text} at (686,0) size 58x18 > text run at (686,0) width 58: "Archives" >diff --git a/LayoutTests/platform/mac/fast/lists/003-expected.txt b/LayoutTests/platform/mac/fast/lists/003-expected.txt >index 391f34b1c1be..930c7fe9c14c 100644 >--- a/LayoutTests/platform/mac/fast/lists/003-expected.txt >+++ b/LayoutTests/platform/mac/fast/lists/003-expected.txt >@@ -119,42 +119,42 @@ layer at (0,0) size 800x368 > RenderBlock {DIV} at (0,0) size 784x302 > RenderBlock {UL} at (0,0) size 784x144 > RenderListItem {LI} at (40,0) size 744x18 >- RenderListMarker at (687,0) size 7x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 40x18 [color=#0000EE] > RenderText {#text} at (704,0) size 40x18 > text run at (704,0) width 40: "About" > RenderListItem {LI} at (40,18) size 744x18 >- RenderListMarker at (670,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 57x18 [color=#0000EE] > RenderText {#text} at (687,0) size 57x18 > text run at (687,0) width 57: "Site map" > RenderListItem {LI} at (40,36) size 744x18 >- RenderListMarker at (669,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 58x18 [color=#0000EE] > RenderText {#text} at (686,0) size 58x18 > text run at (686,0) width 58: "Archives" > RenderListItem {LI} at (40,54) size 744x18 >- RenderListMarker at (675,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 52x18 [color=#0000EE] > RenderText {#text} at (692,0) size 52x18 > text run at (692,0) width 52: "Projects" > RenderListItem {LI} at (40,72) size 744x18 >- RenderListMarker at (683,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 44x18 [color=#0000EE] > RenderText {#text} at (700,0) size 44x18 > text run at (700,0) width 44: "Photos" > RenderListItem {LI} at (40,90) size 744x18 >- RenderListMarker at (669,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 58x18 [color=#0000EE] > RenderText {#text} at (686,0) size 58x18 > text run at (686,0) width 58: "Statistics" > RenderListItem {LI} at (40,108) size 744x18 >- RenderListMarker at (578,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 149x18 [color=#0000EE] > RenderText {#text} at (595,0) size 149x18 > text run at (595,0) width 149: "Accessibility statement" > RenderListItem {LI} at (40,126) size 744x18 >- RenderListMarker at (613,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 29x18 [color=#0000EE] > RenderText {#text} at (630,0) size 29x18 > text run at (630,0) width 29: "RSS" >@@ -167,38 +167,38 @@ layer at (0,0) size 800x368 > text run at (738,0) width 6: ")" > RenderBlock {UL} at (0,160) size 784x18 > RenderListItem {LI} at (40,0) size 744x18 >- RenderListMarker at (638,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 89x18 [color=#0000EE] > RenderText {#text} at (655,0) size 89x18 > text run at (655,0) width 89: "What is RSS?" > RenderBlock {UL} at (0,194) size 784x108 > RenderListItem {LI} at (40,0) size 744x18 >- RenderListMarker at (635,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 92x18 [color=#0000EE] > RenderText {#text} at (652,0) size 92x18 > text run at (652,0) width 92: "RSS Validator" > RenderListItem {LI} at (40,18) size 744x18 >- RenderListMarker at (578,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 149x18 [color=#0000EE] > RenderText {#text} at (595,0) size 149x18 > text run at (595,0) width 149: "Dive Into Accessibility" > RenderListItem {LI} at (40,36) size 744x18 >- RenderListMarker at (626,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 101x18 [color=#0000EE] > RenderText {#text} at (643,0) size 101x18 > text run at (643,0) width 101: "Dive Into OS X" > RenderListItem {LI} at (40,54) size 744x18 >- RenderListMarker at (628,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 99x18 [color=#0000EE] > RenderText {#text} at (645,0) size 99x18 > text run at (645,0) width 99: "Dive Into J2EE" > RenderListItem {LI} at (40,72) size 744x18 >- RenderListMarker at (616,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 111x18 [color=#0000EE] > RenderText {#text} at (633,0) size 111x18 > text run at (633,0) width 111: "Dive Into Python" > RenderListItem {LI} at (40,90) size 744x18 >- RenderListMarker at (680,0) size 8x18: bullet >+ RenderListMarker at (413,0) size 8x18: bullet > RenderInline {A} at (0,0) size 47x18 [color=#0000EE] > RenderText {#text} at (697,0) size 47x18 > text run at (697,0) width 47: "r\x{E9}sum\x{E9}" >diff --git a/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt b/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt >index be9bb7eb5400..8265a70f5ca0 100644 >--- a/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt >+++ b/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt >@@ -124,42 +124,42 @@ layer at (0,0) size 458x600 > RenderBlock {DIV} at (0,0) size 302x584 > RenderBlock {UL} at (0,0) size 144x584 > RenderListItem {LI} at (0,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x40 [color=#0000EE] > RenderText {#text} at (0,504) size 18x40 > text run at (0,504) width 40: "About" > RenderListItem {LI} at (18,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x57 [color=#0000EE] > RenderText {#text} at (0,487) size 18x57 > text run at (0,487) width 57: "Site map" > RenderListItem {LI} at (36,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x58 [color=#0000EE] > RenderText {#text} at (0,486) size 18x58 > text run at (0,486) width 58: "Archives" > RenderListItem {LI} at (54,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x52 [color=#0000EE] > RenderText {#text} at (0,492) size 18x52 > text run at (0,492) width 52: "Projects" > RenderListItem {LI} at (72,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x44 [color=#0000EE] > RenderText {#text} at (0,500) size 18x44 > text run at (0,500) width 44: "Photos" > RenderListItem {LI} at (90,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x58 [color=#0000EE] > RenderText {#text} at (0,486) size 18x58 > text run at (0,486) width 58: "Statistics" > RenderListItem {LI} at (108,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x149 [color=#0000EE] > RenderText {#text} at (0,395) size 18x149 > text run at (0,395) width 149: "Accessibility statement" > RenderListItem {LI} at (126,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x29 [color=#0000EE] > RenderText {#text} at (0,430) size 18x29 > text run at (0,430) width 29: "RSS" >@@ -172,38 +172,38 @@ layer at (0,0) size 458x600 > text run at (0,538) width 6: ")" > RenderBlock {UL} at (160,0) size 18x584 > RenderListItem {LI} at (0,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x89 [color=#0000EE] > RenderText {#text} at (0,455) size 18x89 > text run at (0,455) width 89: "What is RSS?" > RenderBlock {UL} at (194,0) size 108x584 > RenderListItem {LI} at (0,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x92 [color=#0000EE] > RenderText {#text} at (0,452) size 18x92 > text run at (0,452) width 92: "RSS Validator" > RenderListItem {LI} at (18,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x149 [color=#0000EE] > RenderText {#text} at (0,395) size 18x149 > text run at (0,395) width 149: "Dive Into Accessibility" > RenderListItem {LI} at (36,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x101 [color=#0000EE] > RenderText {#text} at (0,443) size 18x101 > text run at (0,443) width 101: "Dive Into OS X" > RenderListItem {LI} at (54,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x99 [color=#0000EE] > RenderText {#text} at (0,445) size 18x99 > text run at (0,445) width 99: "Dive Into J2EE" > RenderListItem {LI} at (72,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x111 [color=#0000EE] > RenderText {#text} at (0,433) size 18x111 > text run at (0,433) width 111: "Dive Into Python" > RenderListItem {LI} at (90,40) size 18x544 >- RenderListMarker at (0,293) size 18x8: bullet >+ RenderListMarker at (0,293) size 18x7: bullet > RenderInline {A} at (0,0) size 18x47 [color=#0000EE] > RenderText {#text} at (0,497) size 18x47 > text run at (0,497) width 47: "r\x{E9}sum\x{E9}"
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=461311">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 243303
:
461294
|
461300
|
461306
|
461310
|
461311
|
461313
|
461325