WebKit Bugzilla
Attachment 371395 Details for
Bug 179022
: Implement tab-size with units
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Add TabSize header to Source/WebCore/Headers.cmake
bug-179022-20190605235536.patch (text/plain), 36.74 KB, created by
Joonghun Park
on 2019-06-05 07:55:37 PDT
(
hide
)
Description:
Add TabSize header to Source/WebCore/Headers.cmake
Filename:
MIME Type:
Creator:
Joonghun Park
Created:
2019-06-05 07:55:37 PDT
Size:
36.74 KB
patch
obsolete
>Subversion Revision: 246062 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 2bfe903637aa6d7a2797f465c653b7a828f6d8cd..5d05aae5798f1f25ef727700ccd109b526b5c01c 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,52 @@ >+2019-06-05 Joonghun Park <pjh0718@gmail.com> >+ >+ Implement tab-size with units >+ https://bugs.webkit.org/show_bug.cgi?id=179022 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ This change is ported from Blink. >+ The committed revision is https://src.chromium.org/viewvc/blink?revision=189430&view=revision. >+ >+ Additionally, this patch lets css "number" value be allowed as tab-size's property value, >+ not css "integer" value, >+ according to https://drafts.csswg.org/css-text-3/#tab-size-property. >+ >+ Tests: css3/tab-size.html >+ imported/w3c/web-platform-tests/css/css-values/calc-numbers.html >+ >+ * Headers.cmake: >+ * WebCore.xcodeproj/project.pbxproj: >+ * css/CSSComputedStyleDeclaration.cpp: >+ (WebCore::ComputedStyleExtractor::valueForPropertyInStyle): >+ * css/CSSProperties.json: >+ * css/StyleBuilderConverter.h: >+ (WebCore::StyleBuilderConverter::convertLengthOrTabSpaces): >+ * css/parser/CSSPropertyParser.cpp: >+ (WebCore::consumeTabSize): >+ * layout/inlineformatting/text/TextUtil.cpp: >+ (WebCore::Layout::TextUtil::width): >+ * platform/graphics/FontCascade.h: >+ (WebCore::FontCascade::tabWidth const): >+ * platform/graphics/TabSize.h: Added. >+ (WebCore::TabSize::TabSize): >+ (WebCore::TabSize::isSpaces const): >+ (WebCore::TabSize::getPixelSize const): >+ (WebCore::operator==): >+ (WebCore::operator!=): >+ * platform/graphics/TextRun.cpp: >+ * platform/graphics/TextRun.h: >+ (WebCore::TextRun::tabSize const): >+ (WebCore::TextRun::setTabSize): >+ * rendering/SimpleLineLayoutTextFragmentIterator.cpp: >+ (WebCore::SimpleLineLayout::TextFragmentIterator::Style::Style): >+ * rendering/style/RenderStyle.h: >+ (WebCore::RenderStyle::tabSize const): >+ (WebCore::RenderStyle::setTabSize): >+ (WebCore::RenderStyle::initialTabSize): >+ * rendering/style/StyleRareInheritedData.cpp: >+ * rendering/style/StyleRareInheritedData.h: >+ > 2019-06-04 Zalan Bujtas <zalan@apple.com> > > [LFC][IFC] Remove redundant InlineItem::width() calls. >diff --git a/Source/WebCore/Headers.cmake b/Source/WebCore/Headers.cmake >index f46e1be6947c7311616fad65b5f788bcf6e1e8a1..66dc90f908d24e66f9b24be6b9b091ea39c18ec1 100644 >--- a/Source/WebCore/Headers.cmake >+++ b/Source/WebCore/Headers.cmake >@@ -1086,6 +1086,7 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS > platform/graphics/RemoteVideoSample.h > platform/graphics/RoundedRect.h > platform/graphics/StringTruncator.h >+ platform/graphics/TabSize.h > platform/graphics/TextRun.h > platform/graphics/TiledBacking.h > platform/graphics/TrackPrivateBase.h >diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >index a1f3d0af640a0927d6f99c479abb6bfb14227a3c..b030bb3901305b9f9e7eb920d2619575592b8e4d 100644 >--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj >+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >@@ -1021,6 +1021,7 @@ > 38F23AB31E8E83D000CE46F5 /* JSWebGPUComputeCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F23AB01E8E83D000CE46F5 /* JSWebGPUComputeCommandEncoder.h */; }; > 38F23AB51E8E83D000CE46F5 /* JSWebGPUComputePipelineState.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F23AB21E8E83D000CE46F5 /* JSWebGPUComputePipelineState.h */; }; > 3AC648B2129E146500C3EB25 /* EditingBoundary.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC648B1129E146500C3EB25 /* EditingBoundary.h */; settings = {ATTRIBUTES = (Private, ); }; }; >+ 3BB6B81122A7D313003A2A69 /* TabSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BB6B80F22A7D311003A2A69 /* TabSize.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 3C244FEAA375AC633F88BE6F /* RenderLayerModelObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C244FE4A375AC633F88BE6F /* RenderLayerModelObject.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 3F2B33EF165AF15600E3987C /* JSWebKitCSSViewportRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F2B33EA165AF15500E3987C /* JSWebKitCSSViewportRule.h */; }; > 3F42B31D1881191B00278AAC /* WebVideoFullscreenControllerAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F42B31B1881191B00278AAC /* WebVideoFullscreenControllerAVKit.h */; settings = {ATTRIBUTES = (Private, ); }; }; >@@ -7165,6 +7166,7 @@ > 38F23AB11E8E83D000CE46F5 /* JSWebGPUComputePipelineState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGPUComputePipelineState.cpp; sourceTree = "<group>"; }; > 38F23AB21E8E83D000CE46F5 /* JSWebGPUComputePipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGPUComputePipelineState.h; sourceTree = "<group>"; }; > 3AC648B1129E146500C3EB25 /* EditingBoundary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBoundary.h; sourceTree = "<group>"; }; >+ 3BB6B80F22A7D311003A2A69 /* TabSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabSize.h; sourceTree = "<group>"; }; > 3C244FE4A375AC633F88BE6F /* RenderLayerModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderLayerModelObject.h; sourceTree = "<group>"; }; > 3C244FE5A375AC633F88BE6F /* RenderLayerModelObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerModelObject.cpp; sourceTree = "<group>"; }; > 3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitCSSViewportRule.idl; sourceTree = "<group>"; }; >@@ -24548,6 +24550,7 @@ > 849F77750EFEC6200090849D /* StrokeStyleApplier.h */, > 087558C313B4A57D00F49307 /* SurrogatePairAwareTextIterator.cpp */, > 087558C413B4A57D00F49307 /* SurrogatePairAwareTextIterator.h */, >+ 3BB6B80F22A7D311003A2A69 /* TabSize.h */, > 376DCCE013B4F966002EBEFC /* TextRun.cpp */, > A824B4640E2EF2EA0081A7B7 /* TextRun.h */, > CD1E7346167BC78E009A885D /* TextTrackRepresentation.cpp */, >@@ -31797,6 +31800,7 @@ > 0F03C0741884695E00A5F8CA /* SystemMemory.h in Headers */, > 5D5975B319635F1100D00878 /* SystemVersion.h in Headers */, > A8CFF0510A154F09000A4234 /* TableLayout.h in Headers */, >+ 3BB6B81122A7D313003A2A69 /* TabSize.h in Headers */, > 463EB6231B8789E00096ED51 /* TagCollection.h in Headers */, > F55B3DD61251F12D003EF269 /* TelephoneInputType.h in Headers */, > 7CC564B818BABEA6001B9652 /* TelephoneNumberDetector.h in Headers */, >diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp >index d9ccb4beb33aeb35ad771c53d7af70629cc1d66c..7c978595d6414ff5d837b54e0f33aa4602ebbe76 100644 >--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp >+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp >@@ -3026,7 +3026,8 @@ RefPtr<CSSValue> ComputedStyleExtractor::valueForPropertyInStyle(const RenderSty > return cssValuePool.createIdentifierValue(CSSValueAuto); > return zoomAdjustedPixelValue(style.columnWidth(), style); > case CSSPropertyTabSize: >- return cssValuePool.createValue(style.tabSize(), CSSPrimitiveValue::CSS_NUMBER); >+ return cssValuePool.createValue( >+ style.tabSize().getPixelSize(1.0), style.tabSize().isSpaces() ? CSSPrimitiveValue::CSS_NUMBER : CSSPrimitiveValue::CSS_PX); > case CSSPropertyCursor: { > RefPtr<CSSValueList> list; > auto* cursors = style.cursors(); >diff --git a/Source/WebCore/css/CSSProperties.json b/Source/WebCore/css/CSSProperties.json >index 153615995dcf7c75b58f90fcb5f42c5df737737b..150c5d89400b8cfd63dbb8201a1712035ef12e70 100644 >--- a/Source/WebCore/css/CSSProperties.json >+++ b/Source/WebCore/css/CSSProperties.json >@@ -3763,9 +3763,12 @@ > }, > "tab-size": { > "inherited": true, >+ "codegen-properties": { >+ "converter": "LengthOrTabSpaces" >+ }, > "specification": { > "category": "css-text", >- "url": "https://www.w3.org/TR/css-text-3/#tab-size" >+ "url": "https://drafts.csswg.org/css-text-3/#tab-size-property" > } > }, > "text-align": { >diff --git a/Source/WebCore/css/StyleBuilderConverter.h b/Source/WebCore/css/StyleBuilderConverter.h >index e5dd3fd535cdda92fcd10fc354dfb510473ff065..30815f75c72892b515b069fb93fdc53bf77abc95 100644 >--- a/Source/WebCore/css/StyleBuilderConverter.h >+++ b/Source/WebCore/css/StyleBuilderConverter.h >@@ -53,6 +53,7 @@ > #include "Settings.h" > #include "StyleResolver.h" > #include "StyleScrollSnapPoints.h" >+#include "TabSize.h" > #include "TouchAction.h" > #include "TransformFunctions.h" > #include <wtf/Optional.h> >@@ -66,6 +67,7 @@ public: > static Length convertLengthOrAuto(const StyleResolver&, const CSSValue&); > static Length convertLengthSizing(const StyleResolver&, const CSSValue&); > static Length convertLengthMaxSizing(const StyleResolver&, const CSSValue&); >+ static TabSize convertLengthOrTabSpaces(const StyleResolver&, const CSSValue&); > template<typename T> static T convertComputedLength(StyleResolver&, const CSSValue&); > template<typename T> static T convertLineWidth(StyleResolver&, const CSSValue&); > static float convertSpacing(StyleResolver&, const CSSValue&); >@@ -255,6 +257,14 @@ inline Length StyleBuilderConverter::convertLengthMaxSizing(const StyleResolver& > return convertLengthSizing(styleResolver, value); > } > >+inline TabSize StyleBuilderConverter::convertLengthOrTabSpaces(const StyleResolver& styleResolver, const CSSValue& value) >+{ >+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value); >+ if (primitiveValue.isNumber()) >+ return TabSize(primitiveValue.floatValue(), true); >+ return TabSize(primitiveValue.computeLength<float>(styleResolver.state().cssToLengthConversionData()), false); >+} >+ > template<typename T> > inline T StyleBuilderConverter::convertComputedLength(StyleResolver& styleResolver, const CSSValue& value) > { >diff --git a/Source/WebCore/css/parser/CSSPropertyParser.cpp b/Source/WebCore/css/parser/CSSPropertyParser.cpp >index 84075046d9072709f329416329072fc4cb57031e..11384f9133f27b9cd60e487852b6fe001f0ac05e 100644 >--- a/Source/WebCore/css/parser/CSSPropertyParser.cpp >+++ b/Source/WebCore/css/parser/CSSPropertyParser.cpp >@@ -1121,9 +1121,12 @@ static RefPtr<CSSValue> consumeWordSpacing(CSSParserTokenRange& range, CSSParser > return consumeLengthOrPercent(range, cssParserMode, ValueRangeAll, UnitlessQuirk::Allow); > } > >-static RefPtr<CSSValue> consumeTabSize(CSSParserTokenRange& range, CSSParserMode) >+static RefPtr<CSSValue> consumeTabSize(CSSParserTokenRange& range, CSSParserMode cssParserMode) > { >- return consumeInteger(range, 0); >+ RefPtr<CSSPrimitiveValue> tabSize = consumeNumber(range, ValueRangeNonNegative); >+ if (tabSize) >+ return tabSize; >+ return consumeLength(range, cssParserMode, ValueRangeNonNegative); > } > > #if ENABLE(TEXT_AUTOSIZING) >diff --git a/Source/WebCore/layout/inlineformatting/text/TextUtil.cpp b/Source/WebCore/layout/inlineformatting/text/TextUtil.cpp >index efe74b5a045d6ac5968469663b2a32d8e58d9299..ab353b9ea84ed945fc5c7cc98af813b23fe1e96e 100644 >--- a/Source/WebCore/layout/inlineformatting/text/TextUtil.cpp >+++ b/Source/WebCore/layout/inlineformatting/text/TextUtil.cpp >@@ -60,7 +60,7 @@ LayoutUnit TextUtil::width(const InlineBox& inlineBox, unsigned from, unsigned t > auto tabWidth = style.collapseWhiteSpace() ? 0 : style.tabSize(); > > WebCore::TextRun run(StringView(text).substring(from, to - from), contentLogicalLeft); >- if (tabWidth) >+ if (tabWidth.getPixelSize(1.0)) > run.setTabSize(true, tabWidth); > width = font.width(run); > >diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h >index e766f33fb4cf38d7e30abe17c5eb8156050abf6f..711b73ed74aaae8891d202e74511b2907abb3af3 100644 >--- a/Source/WebCore/platform/graphics/FontCascade.h >+++ b/Source/WebCore/platform/graphics/FontCascade.h >@@ -149,8 +149,8 @@ public: > > const FontMetrics& fontMetrics() const { return primaryFont().fontMetrics(); } > float spaceWidth() const { return primaryFont().spaceWidth() + m_letterSpacing; } >- float tabWidth(const Font&, unsigned tabSize, float position) const; >- float tabWidth(unsigned tabSize, float position) const { return tabWidth(primaryFont(), tabSize, position); } >+ float tabWidth(const Font&, const TabSize&, float) const; >+ float tabWidth(const TabSize& tabSize, float position) const { return tabWidth(primaryFont(), tabSize, position); } > bool hasValidAverageCharWidth() const; > bool fastAverageCharWidthIfAvailable(float &width) const; // returns true on success > >@@ -354,13 +354,13 @@ inline FontSelector* FontCascade::fontSelector() const > return m_fonts ? m_fonts->fontSelector() : nullptr; > } > >-inline float FontCascade::tabWidth(const Font& font, unsigned tabSize, float position) const >+inline float FontCascade::tabWidth(const Font& font, const TabSize& tabSize, float position) const > { >- if (!tabSize) >+ float baseTabWidth = tabSize.getPixelSize(font.spaceWidth()); >+ if (!baseTabWidth) > return letterSpacing(); >- float tabWidth = tabSize * font.spaceWidth() + letterSpacing(); >- float tabDeltaWidth = tabWidth - fmodf(position, tabWidth); >- return (tabDeltaWidth < font.spaceWidth() / 2) ? tabWidth : tabDeltaWidth; >+ float tabDeltaWidth = baseTabWidth - fmodf(position, baseTabWidth); >+ return (tabDeltaWidth < font.spaceWidth() / 2) ? baseTabWidth : tabDeltaWidth; > } > > } >diff --git a/Source/WebCore/platform/graphics/TabSize.h b/Source/WebCore/platform/graphics/TabSize.h >new file mode 100644 >index 0000000000000000000000000000000000000000..b86ed48ca888451b4978583bd92b33b42f5f405b >--- /dev/null >+++ b/Source/WebCore/platform/graphics/TabSize.h >@@ -0,0 +1,65 @@ >+// Copyright 2015 The Chromium Authors. All rights reserved. >+// Copyright (C) 2019 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: >+// >+// * Redistributions of source code must retain the above copyright >+// notice, this list of conditions and the following disclaimer. >+// * 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. >+// * Neither the name of Google Inc. nor the names of its >+// contributors may be used to endorse or promote products derived from >+// this software without specific prior written permission. >+// >+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT >+// OWNER OR 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 >+ >+namespace WebCore { >+ >+struct TabSize { >+ TabSize(float numOrLength, bool isSpaces = true) >+ : m_floatValue(numOrLength) >+ , m_isSpaces(isSpaces) >+ { >+ } >+ >+ bool isSpaces() const >+ { >+ return m_isSpaces; >+ } >+ >+ float getPixelSize(float spaceWidth) const >+ { >+ return m_isSpaces ? m_floatValue * spaceWidth : m_floatValue; >+ } >+ >+ float m_floatValue; >+ unsigned m_isSpaces : 1; >+}; >+ >+inline bool operator==(const TabSize& a, const TabSize& b) >+{ >+ return (a.m_floatValue == b.m_floatValue) && (a.m_isSpaces == b.m_isSpaces); >+} >+ >+inline bool operator!=(const TabSize& a, const TabSize& b) >+{ >+ return !(a == b); >+} >+ >+} // namespace WebCore >diff --git a/Source/WebCore/platform/graphics/TextRun.cpp b/Source/WebCore/platform/graphics/TextRun.cpp >index f9c65863b8b450a426b3c2d5a01be0369ca8ccf0..63e6638095d0bf4b10ec3f7e62a02e41f54f6e4c 100644 >--- a/Source/WebCore/platform/graphics/TextRun.cpp >+++ b/Source/WebCore/platform/graphics/TextRun.cpp >@@ -30,7 +30,7 @@ namespace WebCore { > > struct ExpectedTextRunSize { > String text; >- unsigned integer1; >+ TabSize tabSize; > float float1; > float float2; > float float3; >diff --git a/Source/WebCore/platform/graphics/TextRun.h b/Source/WebCore/platform/graphics/TextRun.h >index 80d28178370c24803352c49a50d3a583615f3eab..c20d823438cd688ba19179b51ac426c3c24ad3bd 100644 >--- a/Source/WebCore/platform/graphics/TextRun.h >+++ b/Source/WebCore/platform/graphics/TextRun.h >@@ -24,6 +24,7 @@ > #ifndef TextRun_h > #define TextRun_h > >+#include "TabSize.h" > #include "TextFlags.h" > #include "WritingMode.h" > #include <wtf/text/StringView.h> >@@ -95,8 +96,8 @@ public: > void setHorizontalGlyphStretch(float scale) { m_horizontalGlyphStretch = scale; } > > bool allowTabs() const { return m_allowTabs; } >- unsigned tabSize() const { return m_tabSize; } >- void setTabSize(bool, unsigned); >+ TabSize tabSize() const { return m_tabSize; } >+ void setTabSize(bool, TabSize); > > float xPos() const { return m_xpos; } > void setXPos(float xPos) { m_xpos = xPos; } >@@ -118,7 +119,7 @@ public: > private: > String m_text; > >- unsigned m_tabSize; >+ TabSize m_tabSize; > > // m_xpos is the x position relative to the left start of the text line, not relative to the left > // start of the containing block. In the case of right alignment or center alignment, left start of >@@ -136,7 +137,7 @@ private: > unsigned m_disableSpacing : 1; > }; > >-inline void TextRun::setTabSize(bool allow, unsigned size) >+inline void TextRun::setTabSize(bool allow, TabSize size) > { > m_allowTabs = allow; > m_tabSize = size; >diff --git a/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp b/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp >index b8e5d01f4503886fb5e813b4ccf9877cc6d7a03e..34808d60e92da0df5b8af1971085facd0a345285 100644 >--- a/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp >+++ b/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp >@@ -49,7 +49,7 @@ TextFragmentIterator::Style::Style(const RenderStyle& style) > , breakNBSP(wrapLines && style.nbspMode() == NBSPMode::Space) > , keepAllWordsForCJK(style.wordBreak() == WordBreak::KeepAll) > , wordSpacing(font.wordSpacing()) >- , tabWidth(collapseWhitespace ? 0 : style.tabSize()) >+ , tabWidth(collapseWhitespace ? 0 : style.tabSize().getPixelSize(font.spaceWidth())) > , shouldHyphenate(style.hyphens() == Hyphens::Auto && canHyphenate(style.locale())) > , hyphenStringWidth(shouldHyphenate ? font.width(TextRun(String(style.hyphenString()))) : 0) > , hyphenLimitBefore(style.hyphenationLimitBefore() < 0 ? 2 : style.hyphenationLimitBefore()) >diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h >index fcf069ce472281ef6cb8498da5542db833163a7c..ba163f1b9ca1fddcf2c16c309105ebdeb35758f9 100644 >--- a/Source/WebCore/rendering/style/RenderStyle.h >+++ b/Source/WebCore/rendering/style/RenderStyle.h >@@ -661,7 +661,7 @@ public: > TextCombine textCombine() const { return static_cast<TextCombine>(m_rareNonInheritedData->textCombine); } > bool hasTextCombine() const { return textCombine() != TextCombine::None; } > >- unsigned tabSize() const { return m_rareInheritedData->tabSize; } >+ TabSize tabSize() const { return m_rareInheritedData->tabSize; } > > // End CSS3 Getters > >@@ -1190,7 +1190,7 @@ public: > void setBackdropFilter(const FilterOperations& ops) { SET_NESTED_VAR(m_rareNonInheritedData, backdropFilter, operations, ops); } > #endif > >- void setTabSize(unsigned size) { SET_VAR(m_rareInheritedData, tabSize, size); } >+ void setTabSize(TabSize size) { SET_VAR(m_rareInheritedData, tabSize, size); } > > void setBreakBefore(BreakBetween breakBehavior) { SET_VAR(m_rareNonInheritedData, breakBefore, static_cast<unsigned>(breakBehavior)); } > void setBreakAfter(BreakBetween breakBehavior) { SET_VAR(m_rareNonInheritedData, breakAfter, static_cast<unsigned>(breakBehavior)); } >@@ -1672,7 +1672,7 @@ public: > static GridPosition initialGridItemRowStart() { return GridPosition(); } > static GridPosition initialGridItemRowEnd() { return GridPosition(); } > >- static unsigned initialTabSize() { return 8; } >+ static TabSize initialTabSize() { return 8; } > > static const AtomicString& initialLineGrid() { return nullAtom(); } > static LineSnap initialLineSnap() { return LineSnap::None; } >diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp >index 899873da3b32f316317313292ade8fdaed04a749..1f22a1a5a4a59e28f9d0178578dcd9663d0b28d5 100644 >--- a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp >+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp >@@ -50,7 +50,7 @@ struct GreaterThanOrSameSizeAsStyleRareInheritedData : public RefCounted<Greater > TextDecorationThickness thickness; > unsigned bitfields[4]; > short pagedMediaShorts[2]; >- unsigned unsigneds[1]; >+ TabSize tabSize; > short hyphenationShorts[3]; > > #if PLATFORM(IOS_FAMILY) >diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.h b/Source/WebCore/rendering/style/StyleRareInheritedData.h >index a0332d8d857280924941652269150f2813673ec7..e5c594384bd66d54820b4c641bbfaa6c35e13d4b 100644 >--- a/Source/WebCore/rendering/style/StyleRareInheritedData.h >+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.h >@@ -28,6 +28,7 @@ > #include "DataRef.h" > #include "Length.h" > #include "StyleCustomPropertyData.h" >+#include "TabSize.h" > #include "TextDecorationThickness.h" > #include "TextUnderlineOffset.h" > #include <wtf/RefCounted.h> >@@ -172,7 +173,7 @@ public: > DataRef<StyleFilterData> appleColorFilter; > > AtomicString lineGrid; >- unsigned tabSize; >+ TabSize tabSize; > > #if ENABLE(TEXT_AUTOSIZING) > TextSizeAdjustment textSizeAdjust; >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index cf836839960695af3ba0fd72003df86729080094..9aa897f81e64aefd8c02414902ce827c8fcc4e57 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,21 @@ >+2019-06-05 Joonghun Park <jh718.park@samsung.com> >+ >+ Implement tab-size with units >+ https://bugs.webkit.org/show_bug.cgi?id=179022 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ This change is ported from Blink. >+ The committed revision is https://src.chromium.org/viewvc/blink?revision=189430&view=revision. >+ >+ Additionally, this patch lets css "number" value be allowed as tab-size's property value, >+ not css "integer" value, >+ according to https://drafts.csswg.org/css-text-3/#tab-size-property. >+ >+ * TestExpectations: >+ * css3/tab-size-expected.txt: Added. >+ * css3/tab-size.html: Added. >+ > 2019-06-04 Antoine Quint <graouts@apple.com> > > The "mouseenter" and "pointerenter" events are fired from the bottom up >diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog >index 8f1b42aff84ccdceb514f664b8eb595aae989312..ca41ff158741b2e27e110a93477eb3a33e3ee99a 100644 >--- a/LayoutTests/imported/w3c/ChangeLog >+++ b/LayoutTests/imported/w3c/ChangeLog >@@ -1,3 +1,20 @@ >+2019-06-05 Joonghun Park <jh718.park@samsung.com> >+ >+ Implement tab-size with units >+ https://bugs.webkit.org/show_bug.cgi?id=179022 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ This change is ported from Blink. >+ The committed revision is https://src.chromium.org/viewvc/blink?revision=189430&view=revision. >+ >+ Additionally, this patch lets css "number" value be allowed as tab-size's property value, >+ not css "integer" value, >+ according to https://drafts.csswg.org/css-text-3/#tab-size-property. >+ >+ * web-platform-tests/css/css-values/calc-numbers-expected.txt: Added. >+ * web-platform-tests/css/css-values/calc-numbers.html: Added. >+ > 2019-06-03 Rob Buis <rbuis@igalia.com> > > Implement imagesrcset and imagesizes attributes on link rel=preload >diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations >index 9febe3dc3d495f2568fe5d711e603c2a7f623041..beb8488a7cbfa587f4c7874a1d7e5c828a1979c6 100644 >--- a/LayoutTests/TestExpectations >+++ b/LayoutTests/TestExpectations >@@ -1821,8 +1821,6 @@ webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/line-breaking/l > webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-011.html [ ImageOnlyFailure ] > webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-ic-002.html [ ImageOnlyFailure ] > webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-ic-003.html [ ImageOnlyFailure ] >-webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/tab-size/tab-size-length-001.html [ ImageOnlyFailure ] >-webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/tab-size/tab-size-length-002.html [ ImageOnlyFailure ] > webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-001.html [ ImageOnlyFailure ] > webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-002.html [ ImageOnlyFailure ] > webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-align/text-align-end-003.html [ ImageOnlyFailure ] >@@ -1917,7 +1915,6 @@ webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/line-break/line > webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-loose-015.xht [ ImageOnlyFailure ] > webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/tab-size/tab-size-spacing-001.html [ ImageOnlyFailure ] > webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/tab-size/tab-min-rendered-width-1.html [ ImageOnlyFailure ] >-webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/tab-size/tab-size-inheritance-001.html [ ImageOnlyFailure ] > webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/text-indent/text-indent-percentage-002.html [ ImageOnlyFailure ] > webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/text-indent/text-indent-percentage-004.html [ ImageOnlyFailure ] > webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/text-indent/text-indent-percentage-003.html [ ImageOnlyFailure ] >diff --git a/LayoutTests/css3/tab-size-expected.txt b/LayoutTests/css3/tab-size-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..a582f7fb1a6d7bafdda70697d541f3b180bd9fb8 >--- /dev/null >+++ b/LayoutTests/css3/tab-size-expected.txt >@@ -0,0 +1,22 @@ >+Test tab-size measurements. >+ >+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". >+ >+PASS pxTabLength is pxExpected >+PASS emTabLength is emExpected >+PASS intTabLength is intExpected >+PASS pxTabLength is pxExpected >+PASS emTabLength is emExpected >+PASS intTabLength is intExpected >+PASS successfullyParsed is true >+ >+TEST COMPLETE >+ >+ leading text, tab-size in px. >+ leading text, tab-size in em. >+ leading text, tab-size in spaces. >+leading text trailing text, tab-size in px. >+leading text trailing text, tab-size in em. >+leading text trailing text, tab-size in spaces. >+Some spaces... ' ' ... for size reference. >+'leading text', for size reference. >diff --git a/LayoutTests/css3/tab-size.html b/LayoutTests/css3/tab-size.html >new file mode 100644 >index 0000000000000000000000000000000000000000..e44ac20afe148ba9af0c9fceda7560ce6398bf53 >--- /dev/null >+++ b/LayoutTests/css3/tab-size.html >@@ -0,0 +1,84 @@ >+<!DOCTYPE html> >+<html> >+ <head> >+ <style> >+body { >+ font-size: 13px; >+} >+.px-tab-size { >+ tab-size: 60px; >+} >+.em-tab-size { >+ tab-size: 7em; >+} >+.int-tab-size { >+ tab-size: 9; >+} >+ </style> >+ <script src="../resources/js-test.js"></script> >+ </head> >+ <body> >+ <div style="background-repeat: repeat-x;"> >+ <div><pre id="leading-px" class="px-tab-size">	<span>leading text, tab-size in px.</span></pre></div> >+ <div><pre id="leading-em" class="em-tab-size">	<span>leading text, tab-size in em.</span></pre></div> >+ <div><pre id="leading-int" class="int-tab-size">	<span>leading text, tab-size in spaces.</span></pre></div> >+ <div><pre id="trailing-px" class="px-tab-size"><span>leading text</span>	<span>trailing text, tab-size in px.</span></pre></div> >+ <div><pre id="trailing-em" class="em-tab-size"><span>leading text</span>	<span>trailing text, tab-size in em.</span></pre></div> >+ <div><pre id="trailing-int" class="int-tab-size"><span>leading text</span>	<span>trailing text, tab-size in spaces.</span></pre></div> >+ <div><pre>Some spaces... '<span id="space-size-reference"> </span>' ... for size reference.</pre></div> >+ <div><pre>'<span id="leading-text-size-reference">leading text</span>', for size reference.</pre></div> >+ <script> >+ >+description('Test tab-size measurements.'); >+ >+// Tests with a tab character at the beginning of the line. >+ >+var pxPre = document.getElementById('leading-px'); >+var emPre = document.getElementById('leading-em'); >+var intPre = document.getElementById('leading-int'); >+ >+var pxLeadingSpan = pxPre.firstElementChild; >+var emLeadingSpan = emPre.firstElementChild; >+var intLeadingSpan = intPre.firstElementChild; >+ >+var pxExpected = 60; // tab size in px. >+var emExpected = 13 * 7; // (font size) * (tab size in em) >+var intExpected = document.getElementById('space-size-reference').getBoundingClientRect().width; >+ >+var pxTabLength = pxLeadingSpan.getBoundingClientRect().left - pxPre.getBoundingClientRect().left; >+var emTabLength = emLeadingSpan.getBoundingClientRect().left - emPre.getBoundingClientRect().left; >+var intTabLength = intLeadingSpan.getBoundingClientRect().left - intPre.getBoundingClientRect().left; >+ >+shouldBe("pxTabLength", "pxExpected", false, 0.02); >+shouldBe("emTabLength", "emExpected", false, 0.02); >+shouldBe("intTabLength", "intExpected", false, 0.02); >+ >+// Tests with a tab character after leading text. >+ >+var leadingTextSize = document.getElementById('leading-text-size-reference').getBoundingClientRect().width; >+pxExpected = pxExpected - (leadingTextSize % pxExpected); >+emExpected = emExpected - (leadingTextSize % emExpected); >+intExpected = intExpected - (leadingTextSize % intExpected); >+ >+pxPre = document.getElementById('trailing-px'); >+emPre = document.getElementById('trailing-em'); >+intPre = document.getElementById('trailing-int'); >+ >+pxLeadingSpan = pxPre.firstElementChild; >+emLeadingSpan = emPre.firstElementChild; >+intLeadingSpan = intPre.firstElementChild; >+ >+pxTrailingSpan = pxPre.lastElementChild; >+emTrailingSpan = emPre.lastElementChild; >+intTrailingSpan = intPre.lastElementChild; >+ >+pxTabLength = pxTrailingSpan.getBoundingClientRect().left - pxLeadingSpan.getBoundingClientRect().right; >+emTabLength = emTrailingSpan.getBoundingClientRect().left - emLeadingSpan.getBoundingClientRect().right; >+intTabLength = intTrailingSpan.getBoundingClientRect().left - intLeadingSpan.getBoundingClientRect().right; >+ >+shouldBe("pxTabLength", "pxExpected", false, 0.02); >+shouldBe("emTabLength", "emExpected", false, 0.02); >+shouldBe("intTabLength", "intExpected", false, 0.02); >+ </script> >+ </body> >+</html> >diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-values/calc-numbers-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-values/calc-numbers-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..406c668347d9b6b2fb77dbf4c8e1781b9099fc8a >--- /dev/null >+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-values/calc-numbers-expected.txt >@@ -0,0 +1,13 @@ >+ >+PASS testing tab-size: calc(2 * 3) >+FAIL testing tab-size: calc(2 * -4) assert_equals: calc(2 * -4) should compute to 0 expected "0" but got "12345" >+PASS testing opacity: calc(2 / 4) >+PASS testing tab-size: calc(2 / 4) >+FAIL testing opacity: calc(2 / 4) * 1px assert_equals: calc(2 / 4) * 1px should compute to 0.9 expected "0.9" but got "0.8999999761581421" >+PASS testing tab-size: calc(1 + 1px) >+PASS testing tab-size: calc(1 + 100%) >+PASS testing tab-size: calc(100%) >+PASS testing tab-size: calc(10px) bla >+PASS testing tab-size: calc(bla) 10px >+PASS testing tab-size: calc(10px) >+ >diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-values/calc-numbers.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-values/calc-numbers.html >new file mode 100644 >index 0000000000000000000000000000000000000000..995595b8a3e91ab3a72ec465d509030f082ea5bf >--- /dev/null >+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-values/calc-numbers.html >@@ -0,0 +1,98 @@ >+<!DOCTYPE html> >+ >+ <meta charset="UTF-8"> >+ >+ <title>CSS Values and Units Test: computed value of 'tab-size' and 'opacity' when specified with calc() function</title> >+ >+ <!-- >+ >+ Original test is: >+ >+https://chromium.googlesource.com/chromium/src/+/c825d655f6aaf73484f9d56e9012793f5b9668cc/third_party/WebKit/LayoutTests/css3/calc/calc-numbers.html >+ >+ --> >+ >+ <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> >+ <link rel="help" href="https://www.w3.org/TR/css-color-3/#transparency"> >+ <link rel="help" href="https://www.w3.org/TR/css-text-3/#tab-size-property"> >+ <link rel="help" href="https://www.w3.org/TR/css3-values/#calc-computed-value"> >+ <link rel="help" href="https://www.w3.org/TR/css3-values/#calc-range"> >+ >+ <meta name="flags" content="invalid"> >+ <meta content="This test verifies how 11 calc() functions are computed for 'opacity' and 'tab-size'." name="assert"> >+ >+ <script src="/resources/testharness.js"></script> >+ >+ <script src="/resources/testharnessreport.js"></script> >+ >+ <div id="target"></div> >+ >+ <script> >+ function startTesting() >+ { >+ >+ function verifyComputedStyle(property_name, initial_value, specified_value, expected_value, description) >+ { >+ >+ var elemTarget = document.getElementById("target"); >+ >+ test(function() >+ { >+ >+ elemTarget.style.setProperty(property_name, initial_value); >+ >+ /* >+ In exactly 6 out of the 11 sub-tests, the initial_value will >+ act as a fallback value because the specified value generates >+ an invalid value. Since we are running 11 consecutive tests >+ on the same element, then it is necessary to 'reset' its >+ property to an initial value. >+ */ >+ >+ elemTarget.style.setProperty(property_name, specified_value); >+ >+ assert_equals(getComputedStyle(elemTarget)[property_name], expected_value, specified_value + ' should compute to ' + expected_value); >+ >+ }, description); >+ } >+ >+ /* verifyComputedStyle(property_name, initial_value, specified_value, expected_value, description) */ >+ >+ verifyComputedStyle("tab-size", "initial", "calc(2 * 3)", "6", "testing tab-size: calc(2 * 3)"); >+ >+ verifyComputedStyle("tab-size", "12345", "calc(2 * -4)", "0", "testing tab-size: calc(2 * -4)"); >+ /* >+ an out-of-range value inside a calc() does not cause >+ the declaration to become invalid. The value resulting >+ from an expression must be clamped to the range >+ allowed in the target context. >+ https://www.w3.org/TR/css-values-3/#calc-range >+ */ >+ >+ verifyComputedStyle("opacity", "initial", "calc(2 / 4)", "0.5", "testing opacity: calc(2 / 4)"); >+ >+ verifyComputedStyle("tab-size", "12345", "calc(2 / 4)", "0.5", "testing tab-size: calc(2 / 4)"); >+ /* >+ 'tab-size' accepts <number> values. >+ */ >+ >+ verifyComputedStyle("opacity", "0.9", "calc(2 / 4) * 1px", "0.9", "testing opacity: calc(2 / 4) * 1px"); >+ >+ verifyComputedStyle("tab-size", "12345", "calc(1 + 1px)", "12345", "testing tab-size: calc(1 + 1px)"); >+ >+ verifyComputedStyle("tab-size", "12345", "calc(1 + 100%)", "12345", "testing tab-size: calc(1 + 100%)"); >+ >+ verifyComputedStyle("tab-size", "12345", "calc(100%)", "12345", "testing tab-size: calc(100%)"); >+ >+ verifyComputedStyle("tab-size", "12345", "calc(10px) bla", "12345", "testing tab-size: calc(10px) bla"); >+ >+ verifyComputedStyle("tab-size", "12345", "calc(bla) 10px", "12345", "testing tab-size: calc(bla) 10px"); >+ >+ verifyComputedStyle("tab-size", "initial", "calc(10px)", "10px", "testing tab-size: calc(10px)"); >+ >+ /* verifyComputedStyle(property_name, initial_value, specified_value, expected_value, description) */ >+ } >+ >+ startTesting(); >+ >+ </script>
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=371395">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 179022
:
371393
|
371395
|
371404
|
371405
|
371411
|
371415
|
371460
|
371477
|
371566