Changeset 61548 in webkit

Timestamp:

Jun 21, 2010, 9:54:52 AM (15 years ago)

Author:

mitz@apple.com

Message:

WebCore: CSS3: Implement the 'hyphens' and 'hyphenate-character' properties
​https://bugs.webkit.org/show_bug.cgi?id=10228

Reviewed by Darin Adler.

Tests: fast/text/hyphenate-character.html

fast/text/hyphens.html

Added -webkit-hyphens and -webkit-hyphenate-character as specified in
<​http://www.w3.org/TR/2010/WD-css3-gcpm-20100608/#hyphenation>.

• Android.mk: Added Hyphenation.cpp.
• CMakeLists.txt: Ditto.
• GNUmakefile.am: Added Hyphenation.{cpp,h}.
• WebCore.base.exp: Exported wkGetHyphenationLocationBeforeIndex().
• WebCore.gypi: Added Hyphenation.{cpp,h}.
• WebCore.pro: Added Hyphenation.{cpp,h}.
• WebCore.vcproj/WebCore.vcproj: Added Hyphenation.{cpp,h}.
• WebCore.xcodeproj/project.pbxproj: Added Hyphenation.{cpp,h}.
• css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): Added the -webkit-hyphenate-character
and -webkit-hyphens cases.

• css/CSSParser.cpp:

(WebCore::CSSParser::parseValue): Validate values for the new properties.

• css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Added. Maps from a Hyphens value to an identifier.
(WebCore::CSSPrimitiveValue::operator Hyphens): Added. Maps from an identifier to a Hyphens value.

• css/CSSPropertyNames.in: Added -webkit-hyphenate-character and -webkit-hyphens.
• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty): Apply the new properties to the RenderStyle.

• css/CSSValueKeywords.in:
• platform/mac/WebCoreSystemInterface.h: Added wkGetHyphenationLocationBeforeIndex.
• platform/mac/WebCoreSystemInterface.mm: Ditto.
• platform/text/CharacterNames.h: Added the hyphen character.
• platform/text/Hyphenation.cpp: Added.

(WebCore::lastHyphenLocation): Added this default implementation for platforms that do not implement
hyphenation yet. It calls notImplemented() and returns 0.

• platform/text/Hyphenation.h: Added.
• platform/text/cf/HyphenationCF.cpp: Added.

(WebCore::lastHyphenLocation): Returns the last hyphenation location occurring in the given string before
the given index. Uses the current search locale (which is based on the top language preference of the user)
for hyphenation.

• platform/text/mac/HyphenationMac.mm: Added.

(WebCore::lastHyphenLocation): Returns the last hyphenation location occurring in the given string before
the given index. Returns 0 if the current search locale is not "en", because the platform only knows how to
hyphenate English.

• rendering/BidiRun.h:

(WebCore::BidiRun::BidiRun): Added a boolean member, m_hasHyphen, and initialized it to false in the constructor.

• rendering/InlineBox.h:

(WebCore::InlineBox::InlineBox): Renamed m_hasEllipsisBox to m_hasEllipsisBoxOrHyphen, because this bit is now
shared by two subclass: RootInlineBox uses it for hasEllipsisBox(), while InlineTextBox uses it for hasHyphen().

• rendering/InlineTextBox.cpp:

(WebCore::adjustCharactersAndLengthForHyphen): Added this helper function to get the hyphen string from the style
and return a UChar* and length for the concatenation of the given text with the hyphen string.
(WebCore::InlineTextBox::selectionRect): If the selected range touches the end and the box has a hyphen,
compute the width of the text with the hyphen string concatenated to it.
(WebCore::InlineTextBox::paint): If the box has a hyphen, draw the text with the hyphen string concatenated to it.
(WebCore::InlineTextBox::paintSelection): Similarly concatenate the hyphen string.

• rendering/InlineTextBox.h:

(WebCore::InlineTextBox::hasHyphen): Added this accessor.
(WebCore::InlineTextBox::setHasHyphen): Ditto.

• rendering/RenderBlock.h:
• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::constructLine): Copy the m_hasHyphen flag from the run to its text box.
(WebCore::RenderBlock::computeHorizontalPositionsForLine): Add the width of the hyphen string when computing the
width of a box that has a hyphen.
(WebCore::RenderBlock::layoutInlineChildren): If the line was hyphenated, set the m_hasHyphen flag on the
logically last run.
(WebCore::tryHyphenating): Added this helper function which checks if a piece of text that does not fit on the
line could be hyphenated such that the part before the hyphen, including the hyphen, would fit. Given the amount
of space remaining on the line, it finds the longest prefix that can fit in the remaining space (which leaving room for
the hyphen), and then checks for a hyphenation location within that prefix.
(WebCore::RenderBlock::findNextLineBreak): In the 'hyphens: none' case, prevent line breaks at soft hyphens.
In the 'hyphens: auto' case, try hyphenating when a word will not fit in the remaining space on the line.

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::detachEllipsisBox): Changed to use hasEllipsisBox() and setHasEllipsisBox().
(WebCore::RootInlineBox::clearTruncation): Ditto.
(WebCore::RootInlineBox::placeEllipsis): Ditto.
(WebCore::RootInlineBox::paintEllipsisBox): Ditto.
(WebCore::RootInlineBox::nodeAtPoint): Ditto.
(WebCore::RootInlineBox::ellipsisBox): Ditto.

• rendering/RootInlineBox.h:

(WebCore::RootInlineBox::hasEllipsisBox): Added this accessor.
(WebCore::RootInlineBox::setHasEllipsisBox): Ditto.

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff): Return a layout hint if the hyphens setting or hyphenate-character differs.
(WebCore::RenderStyle::hyphenString): Added. For hyphenate-character: auto, returns the hyphen character.

• rendering/style/RenderStyle.h:

(WebCore::InheritedFlags::hyphens): Added this accessor.
(WebCore::InheritedFlags::hyphenateCharacter): Ditto.
(WebCore::InheritedFlags::setHyphens): Ditto.
(WebCore::InheritedFlags::setHyphenateCharacter): Ditto.
(WebCore::InheritedFlags::initialHyphens): Added. Returns HyphensManual.
(WebCore::InheritedFlags::initialHyphenateCharacter): Added. Returns the null string, corresponding to
a value of 'auto'.

• rendering/style/RenderStyleConstants.h:

Added a Hyphens enum.

• rendering/style/StyleRareInheritedData.cpp:

(WebCore::StyleRareInheritedData::StyleRareInheritedData): Initialize and copy the new members.
(WebCore::StyleRareInheritedData::operator==): Compare the new members.

• rendering/style/StyleRareInheritedData.h: Added two new members: hyphens and hyphenateCharacter.

WebKit/mac: WebKit part of implementing the 'hyphens' and 'hyphenate-character' properties
​https://bugs.webkit.org/show_bug.cgi?id=10228

Reviewed by Darin Adler.

• WebCoreSupport/WebSystemInterface.mm:

(InitWebCoreSystemInterface): Initialize wkGetHyphenationLocationBeforeIndex.

WebKitLibraries: WebKitSystemInterface part of CSS3: Implement the 'hyphens' and 'hyphenate-character' properties
​https://bugs.webkit.org/show_bug.cgi?id=10228

Reviewed by Darin Adler.

• WebKitSystemInterface.h: Added WKGetHyphenationLocationBeforeIndex().
• libWebKitSystemInterfaceLeopard.a:
• libWebKitSystemInterfaceSnowLeopard.a:
• libWebKitSystemInterfaceTiger.a:

LayoutTests: Added tests for the 'hyphens' and 'hyphenate-character' properties
​https://bugs.webkit.org/show_bug.cgi?id=10228

Reviewed by Darin Adler.

• fast/text/hyphenate-character.html: Added.
• fast/text/hyphens.html: Added.
• platform/gtk/Skipped:
• platform/mac/fast/text/hyphenate-character-expected.checksum: Added.
• platform/mac/fast/text/hyphenate-character-expected.png: Added.
• platform/mac/fast/text/hyphenate-character-expected.txt: Added.
• platform/mac/fast/text/hyphens-expected.checksum: Added.
• platform/mac/fast/text/hyphens-expected.png: Added.
• platform/mac/fast/text/hyphens-expected.txt: Added.
• platform/qt/Skipped:
• platform/win/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/hyphenate-character.html (added)
• LayoutTests/fast/text/hyphens.html (added)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/hyphenate-character-expected.checksum (added)
• LayoutTests/platform/mac/fast/text/hyphenate-character-expected.png (added)
• LayoutTests/platform/mac/fast/text/hyphenate-character-expected.txt (added)
• LayoutTests/platform/mac/fast/text/hyphens-expected.checksum (added)
• LayoutTests/platform/mac/fast/text/hyphens-expected.png (added)
• LayoutTests/platform/mac/fast/text/hyphens-expected.txt (added)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebCore/Android.mk (modified) (1 diff)
• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/WebCore.base.exp (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/WebCore.pro (modified) (2 diffs)
• WebCore/WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (12 diffs)
• WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)
• WebCore/css/CSSParser.cpp (modified) (2 diffs)
• WebCore/css/CSSPrimitiveValueMappings.h (modified) (2 diffs)
• WebCore/css/CSSPropertyNames.in (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)
• WebCore/css/CSSValueKeywords.in (modified) (1 diff)
• WebCore/platform/mac/WebCoreSystemInterface.h (modified) (2 diffs)
• WebCore/platform/mac/WebCoreSystemInterface.mm (modified) (2 diffs)
• WebCore/platform/text/CharacterNames.h (modified) (1 diff)
• WebCore/platform/text/Hyphenation.cpp (added)
• WebCore/platform/text/Hyphenation.h (added)
• WebCore/platform/text/cf/HyphenationCF.cpp (added)
• WebCore/platform/text/mac/HyphenationMac.mm (added)
• WebCore/rendering/BidiRun.h (modified) (2 diffs)
• WebCore/rendering/InlineBox.h (modified) (3 diffs)
• WebCore/rendering/InlineTextBox.cpp (modified) (6 diffs)
• WebCore/rendering/InlineTextBox.h (modified) (1 diff)
• WebCore/rendering/RenderBlock.h (modified) (1 diff)
• WebCore/rendering/RenderBlockLineLayout.cpp (modified) (11 diffs)
• WebCore/rendering/RootInlineBox.cpp (modified) (6 diffs)
• WebCore/rendering/RootInlineBox.h (modified) (1 diff)
• WebCore/rendering/style/RenderStyle.cpp (modified) (3 diffs)
• WebCore/rendering/style/RenderStyle.h (modified) (5 diffs)
• WebCore/rendering/style/RenderStyleConstants.h (modified) (1 diff)
• WebCore/rendering/style/StyleRareInheritedData.cpp (modified) (4 diffs)
• WebCore/rendering/style/StyleRareInheritedData.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebSystemInterface.mm (modified) (2 diffs)
• WebKitLibraries/ChangeLog (modified) (1 diff)
• WebKitLibraries/WebKitSystemInterface.h (modified) (1 diff)
• WebKitLibraries/libWebKitSystemInterfaceLeopard.a (modified) ( previous)
• WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a (modified) ( previous)
• WebKitLibraries/libWebKitSystemInterfaceTiger.a (modified) ( previous)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2010-06-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Added tests for the 'hyphens' and 'hyphenate-character' properties
+        https://bugs.webkit.org/show_bug.cgi?id=10228
+
+        * fast/text/hyphenate-character.html: Added.
+        * fast/text/hyphens.html: Added.
+        * platform/gtk/Skipped:
+        * platform/mac/fast/text/hyphenate-character-expected.checksum: Added.
+        * platform/mac/fast/text/hyphenate-character-expected.png: Added.
+        * platform/mac/fast/text/hyphenate-character-expected.txt: Added.
+        * platform/mac/fast/text/hyphens-expected.checksum: Added.
+        * platform/mac/fast/text/hyphens-expected.png: Added.
+        * platform/mac/fast/text/hyphens-expected.txt: Added.
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+
 2010-06-21  Dumitru Daniliuc  <dumi@chromium.org>
 

trunk/LayoutTests/platform/gtk/Skipped ¶

@@ -3125 +3125 @@
 fast/text/firstline/002.html
 fast/text/firstline/003.html
+# Hyphenation is not implemented yet.
+fast/text/hyphenate-character.html
+fast/text/hyphens.html
+
 fast/text/international/001.html
 fast/text/international/002.html

trunk/LayoutTests/platform/qt/Skipped ¶

@@ -103 +103 @@
 fast/loader/subframe-navigate-during-main-frame-load.html
 
+# Hyphenation is not implemented yet.
+fast/text/hyphenate-character.html
+fast/text/hyphens.html
 
 # =========================================================================== #

trunk/LayoutTests/platform/win/Skipped ¶

@@ -899 +899 @@
 # LayoutTestController::pageProperty is not implemented for WIN yet.
 printing/page-rule-selection.html
+
+# Hyphenation is not implemented yet.
+fast/text/hyphenate-character.html
+fast/text/hyphens.html

trunk/WebCore/Android.mk ¶

@@ -528 +528 @@
         platform/text/Base64.cpp \
         platform/text/BidiContext.cpp \
+        platform/text/Hyphenation.cpp \
         platform/text/RegularExpression.cpp \
         platform/text/SegmentedString.cpp \

trunk/WebCore/CMakeLists.txt ¶

@@ -1247 +1247 @@
     platform/text/Base64.cpp
     platform/text/BidiContext.cpp
+    platform/text/Hyphenation.cpp
     platform/text/RegularExpression.cpp
     platform/text/SegmentedString.cpp

trunk/WebCore/ChangeLog ¶

@@ +1 @@
+2010-06-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        CSS3: Implement the 'hyphens' and 'hyphenate-character' properties
+        https://bugs.webkit.org/show_bug.cgi?id=10228
+
+        Tests: fast/text/hyphenate-character.html
+               fast/text/hyphens.html
+
+        Added -webkit-hyphens and -webkit-hyphenate-character as specified in
+        <http://www.w3.org/TR/2010/WD-css3-gcpm-20100608/#hyphenation>.
+
+        * Android.mk: Added Hyphenation.cpp.
+        * CMakeLists.txt: Ditto.
+        * GNUmakefile.am: Added Hyphenation.{cpp,h}.
+        * WebCore.base.exp: Exported wkGetHyphenationLocationBeforeIndex().
+        * WebCore.gypi: Added Hyphenation.{cpp,h}.
+        * WebCore.pro: Added Hyphenation.{cpp,h}.
+        * WebCore.vcproj/WebCore.vcproj: Added Hyphenation.{cpp,h}.
+        * WebCore.xcodeproj/project.pbxproj: Added Hyphenation.{cpp,h}.
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): Added the -webkit-hyphenate-character
+        and -webkit-hyphens cases.
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue): Validate values for the new properties.
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Added. Maps from a Hyphens value to an identifier.
+        (WebCore::CSSPrimitiveValue::operator Hyphens): Added. Maps from an identifier to a Hyphens value.
+        * css/CSSPropertyNames.in: Added -webkit-hyphenate-character and -webkit-hyphens.
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty): Apply the new properties to the RenderStyle.
+        * css/CSSValueKeywords.in:
+        * platform/mac/WebCoreSystemInterface.h: Added wkGetHyphenationLocationBeforeIndex.
+        * platform/mac/WebCoreSystemInterface.mm: Ditto.
+        * platform/text/CharacterNames.h: Added the hyphen character.
+        * platform/text/Hyphenation.cpp: Added.
+        (WebCore::lastHyphenLocation): Added this default implementation for platforms that do not implement
+        hyphenation yet. It calls notImplemented() and returns 0.
+        * platform/text/Hyphenation.h: Added.
+        * platform/text/cf/HyphenationCF.cpp: Added.
+        (WebCore::lastHyphenLocation): Returns the last hyphenation location occurring in the given string before
+        the given index. Uses the current search locale (which is based on the top language preference of the user)
+        for hyphenation.
+        * platform/text/mac/HyphenationMac.mm: Added.
+        (WebCore::lastHyphenLocation): Returns the last hyphenation location occurring in the given string before
+        the given index. Returns 0 if the current search locale is not "en", because the platform only knows how to
+        hyphenate English.
+        * rendering/BidiRun.h:
+        (WebCore::BidiRun::BidiRun): Added a boolean member, m_hasHyphen, and initialized it to false in the constructor.
+        * rendering/InlineBox.h:
+        (WebCore::InlineBox::InlineBox): Renamed m_hasEllipsisBox to m_hasEllipsisBoxOrHyphen, because this bit is now
+        shared by two subclass: RootInlineBox uses it for hasEllipsisBox(), while InlineTextBox uses it for hasHyphen().
+        * rendering/InlineTextBox.cpp:
+        (WebCore::adjustCharactersAndLengthForHyphen): Added this helper function to get the hyphen string from the style
+        and return a UChar* and length for the concatenation of the given text with the hyphen string.
+        (WebCore::InlineTextBox::selectionRect): If the selected range touches the end and the box has a hyphen,
+        compute the width of the text with the hyphen string concatenated to it.
+        (WebCore::InlineTextBox::paint): If the box has a hyphen, draw the text with the hyphen string concatenated to it.
+        (WebCore::InlineTextBox::paintSelection): Similarly concatenate the hyphen string.
+        * rendering/InlineTextBox.h:
+        (WebCore::InlineTextBox::hasHyphen): Added this accessor.
+        (WebCore::InlineTextBox::setHasHyphen): Ditto.
+        * rendering/RenderBlock.h:
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::constructLine): Copy the m_hasHyphen flag from the run to its text box.
+        (WebCore::RenderBlock::computeHorizontalPositionsForLine): Add the width of the hyphen string when computing the
+        width of a box that has a hyphen.
+        (WebCore::RenderBlock::layoutInlineChildren): If the line was hyphenated, set the m_hasHyphen flag on the
+        logically last run.
+        (WebCore::tryHyphenating): Added this helper function which checks if a piece of text that does not fit on the
+        line could be hyphenated such that the part before the hyphen, including the hyphen, would fit. Given the amount
+        of space remaining on the line, it finds the longest prefix that can fit in the remaining space (which leaving room for
+        the hyphen), and then checks for a hyphenation location within that prefix.
+        (WebCore::RenderBlock::findNextLineBreak): In the 'hyphens: none' case, prevent line breaks at soft hyphens.
+        In the 'hyphens: auto' case, try hyphenating when a word will not fit in the remaining space on the line.
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::detachEllipsisBox): Changed to use hasEllipsisBox() and setHasEllipsisBox().
+        (WebCore::RootInlineBox::clearTruncation): Ditto.
+        (WebCore::RootInlineBox::placeEllipsis): Ditto.
+        (WebCore::RootInlineBox::paintEllipsisBox): Ditto.
+        (WebCore::RootInlineBox::nodeAtPoint): Ditto.
+        (WebCore::RootInlineBox::ellipsisBox): Ditto.
+        * rendering/RootInlineBox.h:
+        (WebCore::RootInlineBox::hasEllipsisBox): Added this accessor.
+        (WebCore::RootInlineBox::setHasEllipsisBox): Ditto.
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff): Return a layout hint if the hyphens setting or hyphenate-character differs.
+        (WebCore::RenderStyle::hyphenString): Added. For hyphenate-character: auto, returns the hyphen character.
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::hyphens): Added this accessor.
+        (WebCore::InheritedFlags::hyphenateCharacter): Ditto.
+        (WebCore::InheritedFlags::setHyphens): Ditto.
+        (WebCore::InheritedFlags::setHyphenateCharacter): Ditto.
+        (WebCore::InheritedFlags::initialHyphens): Added. Returns HyphensManual.
+        (WebCore::InheritedFlags::initialHyphenateCharacter): Added. Returns the null string, corresponding to
+        a value of 'auto'.
+        * rendering/style/RenderStyleConstants.h:
+        Added a Hyphens enum.
+        * rendering/style/StyleRareInheritedData.cpp:
+        (WebCore::StyleRareInheritedData::StyleRareInheritedData): Initialize and copy the new members.
+        (WebCore::StyleRareInheritedData::operator==): Compare the new members.
+        * rendering/style/StyleRareInheritedData.h: Added two new members: hyphens and hyphenateCharacter.
+
 2010-06-03  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/WebCore/GNUmakefile.am ¶

@@ -1808 +1808 @@
         WebCore/platform/text/BidiResolver.h \
         WebCore/platform/text/CharacterNames.h \
+        WebCore/platform/text/Hyphenation.cpp \
+        WebCore/platform/text/Hyphenation.h \
         WebCore/platform/text/ParserUtilities.h \
         WebCore/platform/text/PlatformString.h \

trunk/WebCore/WebCore.base.exp ¶

@@ -1022 +1022 @@
 _wkGetGlyphTransformedAdvances
 _wkGetGlyphsForCharacters
+_wkGetHyphenationLocationBeforeIndex
 _wkGetMIMETypeForExtension
 _wkGetNSURLResponseCalculatedExpiration

trunk/WebCore/WebCore.gypi ¶

@@ -2763 +2763 @@
             'platform/text/BidiResolver.h',
             'platform/text/CharacterNames.h',
+            'platform/text/Hyphenation.cpp',
+            'platform/text/Hyphenation.h',
             'platform/text/ParserUtilities.h',
             'platform/text/PlatformString.h',

trunk/WebCore/WebCore.pro ¶

@@ -826 +826 @@
     platform/text/Base64.cpp \
     platform/text/BidiContext.cpp \
+    platform/text/Hyphenation.cpp \
     platform/ContentType.cpp \
     platform/ContextMenu.cpp \
@@ -1673 +1674 @@
     platform/text/Base64.h \
     platform/text/BidiContext.h \
+    platform/text/Hyphenation.h \
     platform/text/qt/TextCodecQt.h \
     platform/text/RegularExpression.h \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj ¶

@@ -26241 +26241 @@
                                 </File>
                                 <File
+                                        RelativePath="..\platform\text\Hyphentation.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\platform\text\Hyphenation.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\platform\text\ParserUtilities.h"
                                         >

trunk/WebCore/WebCore.xcodeproj/project.pbxproj ¶

@@ -737 +737 @@
                 33C0CCD4112C5E6200CE057D /* SecureTextInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33C0CCD2112C5E6200CE057D /* SecureTextInput.cpp */; };
                 33C0CCD5112C5E6200CE057D /* SecureTextInput.h in Headers */ = {isa = PBXBuildFile; fileRef = 33C0CCD3112C5E6200CE057D /* SecureTextInput.h */; };
+                371A67CB11C6C7DB00047B8B /* HyphenationCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 371A67CA11C6C7DB00047B8B /* HyphenationCF.cpp */; };
                 371F4F400D25B9AF00ECE0D5 /* FontData.h in Headers */ = {isa = PBXBuildFile; fileRef = 371F4F3E0D25B9AF00ECE0D5 /* FontData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 371F4F410D25B9AF00ECE0D5 /* FontData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 371F4F3F0D25B9AF00ECE0D5 /* FontData.cpp */; };
@@ -747 +748 @@
                 37202199106213C600F25C4B /* FontSmoothingMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 37202198106213C600F25C4B /* FontSmoothingMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 3744570F0DB05FA500AE0992 /* SVGGlyphMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 3744570E0DB05FA500AE0992 /* SVGGlyphMap.h */; };
+                375CD232119D43C800A2A859 /* Hyphenation.h in Headers */ = {isa = PBXBuildFile; fileRef = 375CD231119D43C800A2A859 /* Hyphenation.h */; };
+                375CD23B119D44EA00A2A859 /* HyphenationMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 375CD239119D44EA00A2A859 /* HyphenationMac.mm */; };
                 3774ABA50FA21EB400AD7DE9 /* OverlapTestRequestClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3774ABA30FA21EB400AD7DE9 /* OverlapTestRequestClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 377C4CDF1014E9F600B9AE42 /* PlaceholderDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 377C4CDD1014E9F600B9AE42 /* PlaceholderDocument.h */; };
@@ -6316 +6319 @@
                 33C0CCD2112C5E6200CE057D /* SecureTextInput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecureTextInput.cpp; sourceTree = "<group>"; };
                 33C0CCD3112C5E6200CE057D /* SecureTextInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecureTextInput.h; sourceTree = "<group>"; };
+                371A67CA11C6C7DB00047B8B /* HyphenationCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HyphenationCF.cpp; sourceTree = "<group>"; };
                 371F4F3E0D25B9AF00ECE0D5 /* FontData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontData.h; sourceTree = "<group>"; };
                 371F4F3F0D25B9AF00ECE0D5 /* FontData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontData.cpp; sourceTree = "<group>"; };
@@ -6326 +6330 @@
                 37202198106213C600F25C4B /* FontSmoothingMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSmoothingMode.h; sourceTree = "<group>"; };
                 3744570E0DB05FA500AE0992 /* SVGGlyphMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGGlyphMap.h; sourceTree = "<group>"; };
+                375CD231119D43C800A2A859 /* Hyphenation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Hyphenation.h; sourceTree = "<group>"; };
+                375CD239119D44EA00A2A859 /* HyphenationMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HyphenationMac.mm; sourceTree = "<group>"; };
                 3774ABA30FA21EB400AD7DE9 /* OverlapTestRequestClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlapTestRequestClient.h; sourceTree = "<group>"; };
                 377C4CDD1014E9F600B9AE42 /* PlaceholderDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaceholderDocument.h; sourceTree = "<group>"; };
@@ -10778 +10784 @@
                                 1C81B94D0E9732D900266E07 /* inspector */,
                                 BCB16BFB0979C38700467741 /* loader */,
-                                FABE72EC1059C1EB00D999DD /* mathml */,
                                 333F703D0FB49C16008E12A6 /* notifications */,
                                 65BF02180974806300C43196 /* page */,
@@ -15235 +15240 @@
                         isa = PBXGroup;
                         children = (
+                                371A67CA11C6C7DB00047B8B /* HyphenationCF.cpp */,
                                 B2B2645A0D00A77E000ACC1D /* StringCF.cpp */,
                                 B2B2645B0D00A77E000ACC1D /* StringImplCF.cpp */,
@@ -15256 +15262 @@
                                 B2C3D9F40D006C1D00EF6F26 /* BidiResolver.h */,
                                 B2C3D9F50D006C1D00EF6F26 /* CharacterNames.h */,
+                                375CD231119D43C800A2A859 /* Hyphenation.h */,
                                 BC76AC110DD7AD5C00415F34 /* ParserUtilities.h */,
                                 B2C3D9FB0D006C1D00EF6F26 /* PlatformString.h */,
@@ -15303 +15310 @@
                                 B2AFFC850D00A5DF0030074D /* character-sets.txt */,
                                 B2C3D9FA0D006C1D00EF6F26 /* CharsetData.h */,
+                                375CD239119D44EA00A2A859 /* HyphenationMac.mm */,
                                 B2AFFC860D00A5DF0030074D /* mac-encodings.txt */,
                                 B2AFFC870D00A5DF0030074D /* make-charset-table.pl */,
@@ -15716 +15724 @@
                         isa = PBXGroup;
                         children = (
+                                FABE72EC1059C1EB00D999DD /* mathml */,
                                 1A8F6BB00DB55CDC001DB794 /* appcache */,
                                 512DD8E80D91E691000F89EE /* archive */,
@@ -16861 +16870 @@
                                 FA7EFB041120D25400CF79C7 /* RenderMathMLUnderOver.h */,
                         );
-                        path = mathml;
+                        name = mathml;
+                        path = ../mathml;
                         sourceTree = "<group>";
                 };
@@ -18105 +18115 @@
                                 514C76710CE923A1007EF3CD /* HTTPHeaderMap.h in Headers */,
                                 514C76730CE923A1007EF3CD /* HTTPParsers.h in Headers */,
+                                375CD232119D43C800A2A859 /* Hyphenation.h in Headers */,
                                 B275356E0B053814002CE64F /* Icon.h in Headers */,
                                 5126E6BC0A2E3B12005C29FA /* IconDatabase.h in Headers */,
@@ -20437 +20448 @@
                                 0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */,
                                 514C76720CE923A1007EF3CD /* HTTPParsers.cpp in Sources */,
+                                371A67CB11C6C7DB00047B8B /* HyphenationCF.cpp in Sources */,
+                                375CD23B119D44EA00A2A859 /* HyphenationMac.mm in Sources */,
                                 5126E6BB0A2E3B12005C29FA /* IconDatabase.cpp in Sources */,
                                 445C8DB710015FC90031531A /* IconDatabaseNone.cpp in Sources */,

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp ¶

@@ -1 +1 @@
 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
@@ -906 +906 @@
                 return CSSPrimitiveValue::createIdentifier(CSSValueNone);
             return CSSPrimitiveValue::create(style->highlight(), CSSPrimitiveValue::CSS_STRING);
+        case CSSPropertyWebkitHyphens:
+            return CSSPrimitiveValue::create(style->hyphens());
+        case CSSPropertyWebkitHyphenateCharacter:
+            if (style->hyphenateCharacter().isNull())
+                return CSSPrimitiveValue::createIdentifier(CSSValueAuto);
+            return CSSPrimitiveValue::create(style->hyphenateCharacter(), CSSPrimitiveValue::CSS_STRING);
         case CSSPropertyWebkitBorderFit:
             if (style->borderFit() == BorderFitBorder)

trunk/WebCore/css/CSSParser.cpp ¶

@@ -2 +2 @@
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
@@ -1555 +1555 @@
     case CSSPropertyWebkitHighlight:
         if (id == CSSValueNone || value->unit == CSSPrimitiveValue::CSS_STRING)
+            validPrimitive = true;
+        break;
+
+    case CSSPropertyWebkitHyphens:
+        if (id == CSSValueNone || id == CSSValueManual || id == CSSValueAuto)
+            validPrimitive = true;
+        break;
+
+    case CSSPropertyWebkitHyphenateCharacter:
+        if (id == CSSValueAuto || value->unit == CSSPrimitiveValue::CSS_STRING)
             validPrimitive = true;
         break;

trunk/WebCore/css/CSSPrimitiveValueMappings.h ¶

@@ -1 +1 @@
 /*
  * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>.
- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
@@ -2158 +2158 @@
 }
 
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Hyphens hyphens)
+    : m_type(CSS_IDENT)
+    , m_hasCachedCSSText(false)
+{
+    switch (hyphens) {
+    case HyphensNone:
+        m_value.ident = CSSValueNone;
+        break;
+    case HyphensManual:
+        m_value.ident = CSSValueManual;
+        break;
+    case HyphensAuto:
+        m_value.ident = CSSValueAuto;
+        break;
+    }
+}
+
+template<> inline CSSPrimitiveValue::operator Hyphens() const
+{
+    switch (m_value.ident) {
+    case CSSValueNone:
+        return HyphensNone;
+    case CSSValueManual:
+        return HyphensManual;
+    case CSSValueAuto:
+        return HyphensAuto;
+    default:
+        ASSERT_NOT_REACHED();
+        return HyphensAuto;
+    }
+}
+
 #if ENABLE(SVG)
 

trunk/WebCore/css/CSSPropertyNames.in ¶

@@ -210 +210 @@
 -webkit-font-smoothing
 -webkit-highlight
+-webkit-hyphenate-character
+-webkit-hyphens
 -webkit-line-break
 -webkit-line-clamp

trunk/WebCore/css/CSSStyleSelector.cpp ¶

@@ -5179 +5179 @@
         else
             m_style->setHighlight(primitiveValue->getStringValue());
+        return;
+    }
+    case CSSPropertyWebkitHyphens: {
+        HANDLE_INHERIT_AND_INITIAL(hyphens, Hyphens);
+        m_style->setHyphens(*primitiveValue);
+        return;
+    }
+    case CSSPropertyWebkitHyphenateCharacter: {
+        HANDLE_INHERIT_AND_INITIAL(hyphenateCharacter, HyphenateCharacter);
+        if (primitiveValue->getIdent() == CSSValueAuto)
+            m_style->setHyphenateCharacter(nullAtom);
+        else
+            m_style->setHyphenateCharacter(primitiveValue->getStringValue());
         return;
     }

trunk/WebCore/css/CSSValueKeywords.in ¶

@@ -731 +731 @@
 minimized
 windowed
+
+# -webkit-hyphens
+# none
+manual
+# auto

trunk/WebCore/platform/mac/WebCoreSystemInterface.h ¶

@@ -1 +1 @@
 /*
- * Copyright 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
+ * Copyright 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -171 +171 @@
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 extern NSMutableArray *(*wkNoteOpenPanelFiles)(NSArray *);
+extern void* wkGetHyphenationLocationBeforeIndex;
 #else
 extern void* wkNoteOpenPanelFiles;
+extern CFIndex (*wkGetHyphenationLocationBeforeIndex)(CFStringRef string, CFIndex index);
 #endif
 

trunk/WebCore/platform/mac/WebCoreSystemInterface.mm ¶

@@ -1 +1 @@
 /*
- * Copyright 2006, 2007, 2008, 2010 Apple Computer, Inc. All rights reserved.
+ * Copyright 2006, 2007, 2008, 2009, 2010 Apple Computer, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -113 +113 @@
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 NSMutableArray *(*wkNoteOpenPanelFiles)(NSArray *);
+void* wkGetHyphenationLocationBeforeIndex;
 #else
 void* wkNoteOpenPanelFiles;
+CFIndex (*wkGetHyphenationLocationBeforeIndex)(CFStringRef string, CFIndex index);
 #endif

trunk/WebCore/platform/text/CharacterNames.h ¶

@@ -43 +43 @@
 const UChar hebrewPunctuationGershayim = 0x05F4;
 const UChar horizontalEllipsis = 0x2026;
+const UChar hyphen = 0x2010;
 const UChar hyphenMinus = 0x002D;
 const UChar ideographicComma = 0x3001;

trunk/WebCore/rendering/BidiRun.h ¶

@@ -39 +39 @@
         , m_object(object)
         , m_box(0)
+        , m_hasHyphen(false)
     {
     }
@@ -59 +60 @@
     RenderObject* m_object;
     InlineBox* m_box;
+    bool m_hasHyphen;
 };
 

trunk/WebCore/rendering/InlineBox.h ¶

@@ -54 +54 @@
         , m_endsWithBreak(false)
         , m_hasSelectedChildren(false)
-        , m_hasEllipsisBox(false)
+        , m_hasEllipsisBoxOrHyphen(false)
         , m_dirOverride(false)
         , m_isText(false)
@@ -87 +87 @@
         , m_endsWithBreak(false)
         , m_hasSelectedChildren(false)   
-        , m_hasEllipsisBox(false)
+        , m_hasEllipsisBoxOrHyphen(false)
         , m_dirOverride(false)
         , m_isText(false)
@@ -285 +285 @@
     bool m_endsWithBreak : 1;  // Whether the line ends with a <br>.
     bool m_hasSelectedChildren : 1; // Whether we have any children selected (this bit will also be set if the <br> that terminates our line is selected).
-    bool m_hasEllipsisBox : 1; 
+    bool m_hasEllipsisBoxOrHyphen : 1; 
 
     // for InlineTextBox

trunk/WebCore/rendering/InlineTextBox.cpp ¶

@@ -2 +2 @@
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -104 +104 @@
 }
 
+typedef Vector<UChar, 256> BufferForAppendingHyphen;
+
+static void adjustCharactersAndLengthForHyphen(BufferForAppendingHyphen& charactersWithHyphen, RenderStyle* style, const UChar*& characters, int& length)
+{
+    const AtomicString& hyphenString = style->hyphenString();
+    charactersWithHyphen.reserveCapacity(length + hyphenString.length());
+    charactersWithHyphen.append(characters, length);
+    charactersWithHyphen.append(hyphenString.characters(), hyphenString.length());
+    characters = charactersWithHyphen.data();
+    length += hyphenString.length();
+}
+
 IntRect InlineTextBox::selectionRect(int tx, int ty, int startPos, int endPos)
 {
@@ -115 +127 @@
     int selTop = selectionTop();
     int selHeight = selectionHeight();
-    const Font& f = textObj->style(m_firstLine)->font();
-
-    IntRect r = enclosingIntRect(f.selectionRectForText(TextRun(textObj->text()->characters() + m_start, m_len, textObj->allowTabs(), textPos(), m_toAdd, direction() == RTL, m_dirOverride),
+    RenderStyle* styleToUse = textObj->style(m_firstLine);
+    const Font& f = styleToUse->font();
+
+    const UChar* characters = textObj->text()->characters() + m_start;
+    int len = m_len;
+    BufferForAppendingHyphen charactersWithHyphen;
+    if (ePos == len && hasHyphen()) {
+        adjustCharactersAndLengthForHyphen(charactersWithHyphen, styleToUse, characters, len);
+        ePos = len;
+    }
+
+    IntRect r = enclosingIntRect(f.selectionRectForText(TextRun(characters, len, textObj->allowTabs(), textPos(), m_toAdd, direction() == RTL, m_dirOverride),
                                                         IntPoint(tx + m_x, ty + selTop), selHeight, sPos, ePos));
     if (r.x() > tx + m_x + m_width)
@@ -465 +486 @@
     }
 
+    const UChar* characters = textRenderer()->text()->characters() + m_start;
+    int length = m_len;
+    BufferForAppendingHyphen charactersWithHyphen;
+    if (hasHyphen())
+        adjustCharactersAndLengthForHyphen(charactersWithHyphen, styleToUse, characters, length);
+
     int baseline = renderer()->style(m_firstLine)->font().ascent();
     IntPoint textOrigin(m_x + tx, m_y + ty + baseline);
-    TextRun textRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, direction() == RTL, m_dirOverride || styleToUse->visuallyOrdered());
+    TextRun textRun(characters, length, textRenderer()->allowTabs(), textPos(), m_toAdd, direction() == RTL, m_dirOverride || styleToUse->visuallyOrdered());
 
     int sPos = 0;
@@ -474 +501 @@
         selectionStartEnd(sPos, ePos);
 
-    int length = m_len;
     if (m_truncation != cNoTruncation) {
         sPos = min<int>(sPos, m_truncation);
@@ -589 +615 @@
     // draw its own highlight.
     int length = m_truncation != cNoTruncation ? m_truncation : m_len;
+    const UChar* characters = textRenderer()->text()->characters() + m_start;
+
+    BufferForAppendingHyphen charactersWithHyphen;
+    if (ePos == length && hasHyphen()) {
+        adjustCharactersAndLengthForHyphen(charactersWithHyphen, style, characters, length);
+        ePos = length;
+    }
+
     context->clip(IntRect(m_x + tx, y + ty, m_width, h));
-    context->drawHighlightForText(font, TextRun(textRenderer()->text()->characters() + m_start, length, textRenderer()->allowTabs(), textPos(), m_toAdd, 
+    context->drawHighlightForText(font, TextRun(characters, length, textRenderer()->allowTabs(), textPos(), m_toAdd, 
                                   direction() == RTL, m_dirOverride || style->visuallyOrdered()),
                                   IntPoint(m_x + tx, y + ty), h, c, style->colorSpace(), sPos, ePos);

trunk/WebCore/rendering/InlineTextBox.h ¶

@@ -65 +65 @@
 
     unsigned short truncation() { return m_truncation; }
+
+    bool hasHyphen() const { return m_hasEllipsisBoxOrHyphen; }
+    void setHasHyphen(bool hasHyphen) { m_hasEllipsisBoxOrHyphen = hasHyphen; }
 
 private:

trunk/WebCore/rendering/RenderBlock.h ¶

@@ -308 +308 @@
     int skipLeadingWhitespace(InlineBidiResolver&, bool firstLine, bool isLineEmpty, bool previousLineBrokeCleanly);
     void fitBelowFloats(int widthToFit, bool firstLine, int& availableWidth);
-    InlineIterator findNextLineBreak(InlineBidiResolver&, bool firstLine, bool& isLineEmpty, bool& previousLineBrokeCleanly, EClear* clear = 0);
+    InlineIterator findNextLineBreak(InlineBidiResolver&, bool firstLine, bool& isLineEmpty, bool& previousLineBrokeCleanly, bool& hyphenated, EClear* = 0);
     RootInlineBox* constructLine(unsigned runCount, BidiRun* firstRun, BidiRun* lastRun, bool firstLine, bool lastLine, RenderObject* endObject);
     InlineFlowBox* createLineBoxes(RenderObject*, bool firstLine);

trunk/WebCore/rendering/RenderBlockLineLayout.cpp ¶

@@ -25 +25 @@
 #include "BidiResolver.h"
 #include "CharacterNames.h"
+#include "Hyphenation.h"
 #include "InlineIterator.h"
 #include "InlineTextBox.h"
@@ -296 +297 @@
             text->setLen(r->m_stop - r->m_start);
             text->m_dirOverride = r->dirOverride(visuallyOrdered);
+            if (r->m_hasHyphen)
+                text->setHasHyphen(true);
         }
     }
@@ -350 +353 @@
             GlyphOverflow glyphOverflow;
             r->m_box->setWidth(rt->width(r->m_start, r->m_stop - r->m_start, totWidth, firstLine, &fallbackFonts, &glyphOverflow));
+            int hyphenWidth = 0;
+            if (static_cast<InlineTextBox*>(r->m_box)->hasHyphen()) {
+                const AtomicString& hyphenString = rt->style()->hyphenString();
+                hyphenWidth = rt->style(firstLine)->font().width(TextRun(hyphenString.characters(), hyphenString.length()));
+            }
+            r->m_box->setWidth(rt->width(r->m_start, r->m_stop - r->m_start, totWidth, firstLine, &fallbackFonts, &glyphOverflow) + hyphenWidth);
             if (!fallbackFonts.isEmpty()) {
                 ASSERT(r->m_box->isText());
@@ -669 +678 @@
             
             EClear clear = CNONE;
-            end = findNextLineBreak(resolver, firstLine, isLineEmpty, previousLineBrokeCleanly, &clear);
+            bool hyphenated;
+            end = findNextLineBreak(resolver, firstLine, isLineEmpty, previousLineBrokeCleanly, hyphenated, &clear);
             if (resolver.position().atEnd()) {
                 resolver.deleteRuns();
@@ -735 +745 @@
                 RootInlineBox* lineBox = 0;
                 if (resolver.runCount()) {
+                    if (hyphenated)
+                        resolver.logicallyLastRun()->m_hasHyphen = true;
                     lineBox = constructLine(resolver.runCount(), resolver.firstRun(), resolver.lastRun(), firstLine, !end.obj, end.obj && !end.pos ? end.obj : 0);
                     if (lineBox) {
@@ -1318 +1330 @@
 }
 
+static void tryHyphenating(RenderText* text, const Font& font, int lastSpace, int pos, int xPos, int availableWidth, bool isFixedPitch, bool collapseWhiteSpace, int lastSpaceWordSpacing, InlineIterator& lineBreak, int nextBreakable, bool& hyphenated)
+{
+    const AtomicString& hyphenString = text->style()->hyphenString();
+    int hyphenWidth = font.width(TextRun(hyphenString.characters(), hyphenString.length()));
+
+    unsigned prefixLength = font.offsetForPosition(TextRun(text->characters() + lastSpace, pos - lastSpace, !collapseWhiteSpace, xPos + lastSpaceWordSpacing), availableWidth - xPos - hyphenWidth - lastSpaceWordSpacing, false);
+    if (!prefixLength)
+        return;
+
+    prefixLength = 1 + lastHyphenLocation(text->characters() + lastSpace + 1, pos - lastSpace - 1, prefixLength - 1);
+    if (prefixLength <= 1)
+        return;
+
+#if !ASSERT_DISABLED
+    int prefixWidth = hyphenWidth + textWidth(text, lastSpace, prefixLength, font, xPos, isFixedPitch, collapseWhiteSpace) + lastSpaceWordSpacing;
+    ASSERT(xPos + prefixWidth <= availableWidth);
+#endif
+
+    lineBreak.obj = text;
+    lineBreak.pos = lastSpace + prefixLength;
+    lineBreak.nextBreakablePosition = nextBreakable;
+    hyphenated = true;
+}
+
 InlineIterator RenderBlock::findNextLineBreak(InlineBidiResolver& resolver, bool firstLine,  bool& isLineEmpty, bool& previousLineBrokeCleanly, 
-                                              EClear* clear)
+                                              bool& hyphenated, EClear* clear)
 {
     ASSERT(resolver.position().block == this);
@@ -1356 +1392 @@
     bool prevLineBrokeCleanly = previousLineBrokeCleanly;
     previousLineBrokeCleanly = false;
+
+    hyphenated = false;
 
     bool autoWrapWasEverTrueOnLine = false;
@@ -1530 +1568 @@
             const UChar* str = t->characters();
 
-            const Font& f = t->style(firstLine)->font();
+            RenderStyle* style = t->style(firstLine);
+            const Font& f = style->font();
             bool isFixedPitch = f.isFixedPitch();
+            bool canHyphenate = style->hyphens() == HyphensAuto;
 
             int lastSpace = pos;
@@ -1601 +1641 @@
                     lastSpaceWordSpacing = 0;
                     lastSpace = pos; // Cheesy hack to prevent adding in widths of the run twice.
+                    if (style->hyphens() == HyphensNone) {
+                        // Prevent a line break at the soft hyphen by ensuring that betweenWords is false
+                        // in the next iteration.
+                        atStart = true;
+                    }
                     continue;
                 }
@@ -1670 +1715 @@
                             }
                         }
+                        if (canHyphenate && w + tmpW > width) {
+                            tryHyphenating(t, f, lastSpace, pos, w + tmpW - additionalTmpW, width, isFixedPitch, collapseWhiteSpace, lastSpaceWordSpacing, lBreak, nextBreakable, hyphenated);
+                            if (hyphenated)
+                                goto end;
+                        }
                         if (lineWasTooWide || w + tmpW > width) {
                             if (lBreak.obj && shouldPreserveNewline(lBreak.obj) && lBreak.obj->isText() && toRenderText(lBreak.obj)->textLength() && !toRenderText(lBreak.obj)->isWordBreak() && toRenderText(lBreak.obj)->characters()[lBreak.pos] == '\n') {
@@ -1776 +1826 @@
 
             // IMPORTANT: pos is > length here!
-            if (!ignoringSpaces)
-                tmpW += textWidth(t, lastSpace, pos - lastSpace, f, w + tmpW, isFixedPitch, collapseWhiteSpace) + lastSpaceWordSpacing;
+            int additionalTmpW = ignoringSpaces ? 0 : textWidth(t, lastSpace, pos - lastSpace, f, w + tmpW, isFixedPitch, collapseWhiteSpace) + lastSpaceWordSpacing;
+            tmpW += additionalTmpW;
             tmpW += inlineWidth(o, !appliedStartWidth, true);
+
+            if (canHyphenate && w + tmpW > width) {
+                tryHyphenating(t, f, lastSpace, pos, w + tmpW - additionalTmpW, width, isFixedPitch, collapseWhiteSpace, lastSpaceWordSpacing, lBreak, nextBreakable, hyphenated);
+                if (hyphenated)
+                    goto end;
+            }
         } else
             ASSERT_NOT_REACHED();

trunk/WebCore/rendering/RootInlineBox.cpp ¶

@@ -48 +48 @@
 void RootInlineBox::detachEllipsisBox(RenderArena* arena)
 {
-    if (m_hasEllipsisBox) {
+    if (hasEllipsisBox()) {
         EllipsisBox* box = gEllipsisBoxMap->take(this);
         box->setParent(0);
         box->destroy(arena);
-        m_hasEllipsisBox = false;
+        setHasEllipsisBox(false);
     }
 }
@@ -63 +63 @@
 void RootInlineBox::clearTruncation()
 {
-    if (m_hasEllipsisBox) {
+    if (hasEllipsisBox()) {
         detachEllipsisBox(renderer()->renderArena());
         InlineFlowBox::clearTruncation();
@@ -93 +93 @@
         gEllipsisBoxMap = new EllipsisBoxMap();
     gEllipsisBoxMap->add(this, ellipsisBox);
-    m_hasEllipsisBox = true;
+    setHasEllipsisBox(true);
 
     // FIXME: Do we need an RTL version of this?
@@ -118 +118 @@
 void RootInlineBox::paintEllipsisBox(RenderObject::PaintInfo& paintInfo, int tx, int ty) const
 {
-    if (m_hasEllipsisBox && renderer()->shouldPaintWithinRoot(paintInfo) && renderer()->style()->visibility() == VISIBLE &&
-            paintInfo.phase == PaintPhaseForeground)
+    if (hasEllipsisBox() && renderer()->shouldPaintWithinRoot(paintInfo) && renderer()->style()->visibility() == VISIBLE
+            && paintInfo.phase == PaintPhaseForeground)
         ellipsisBox()->paint(paintInfo, tx, ty);
 }
@@ -175 +175 @@
 bool RootInlineBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, int x, int y, int tx, int ty)
 {
-    if (m_hasEllipsisBox && visibleToHitTesting()) {
+    if (hasEllipsisBox() && visibleToHitTesting()) {
         if (ellipsisBox()->nodeAtPoint(request, result, x, y, tx, ty)) {
             renderer()->updateHitTestResult(result, IntPoint(x - tx, y - ty));
@@ -417 +417 @@
 EllipsisBox* RootInlineBox::ellipsisBox() const
 {
-    if (!m_hasEllipsisBox)
+    if (!hasEllipsisBox())
         return 0;
     return gEllipsisBoxMap->get(this);

trunk/WebCore/rendering/RootInlineBox.h ¶

@@ -129 +129 @@
     virtual void removeLineBoxFromRenderObject();
 
-protected:
+private:
+    bool hasEllipsisBox() const { return m_hasEllipsisBoxOrHyphen; }
+    void setHasEllipsisBox(bool hasEllipsisBox) { m_hasEllipsisBoxOrHyphen = hasEllipsisBox; }
+
     // Where this line ended.  The exact object and the position within that object are stored so that
     // we can create an InlineIterator beginning just after the end of this line.

trunk/WebCore/rendering/style/RenderStyle.cpp ¶

@@ -1 +1 @@
 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -387 +387 @@
             rareInheritedData->nbspMode != other->rareInheritedData->nbspMode ||
             rareInheritedData->khtmlLineBreak != other->rareInheritedData->khtmlLineBreak ||
-            rareInheritedData->textSecurity != other->rareInheritedData->textSecurity)
+            rareInheritedData->textSecurity != other->rareInheritedData->textSecurity ||
+            rareInheritedData->hyphens != other->rareInheritedData->hyphens ||
+            rareInheritedData->hyphenateCharacter != other->rareInheritedData->hyphenateCharacter)
             return StyleDifferenceLayout;
 
@@ -803 +805 @@
 }
 
+const AtomicString& RenderStyle::hyphenString() const
+{
+    ASSERT(hyphens() == HyphensAuto);
+
+    const AtomicString& hyphenateCharacter = rareInheritedData.get()->hyphenateCharacter;
+    if (!hyphenateCharacter.isNull())
+        return hyphenateCharacter;
+
+    // FIXME: This should depend on locale.
+    DEFINE_STATIC_LOCAL(AtomicString, hyphenMinusString, (&hyphen, 1));
+    return hyphenMinusString;
+}
+
 #if ENABLE(DASHBOARD_SUPPORT)
 const Vector<StyleDashboardRegion>& RenderStyle::initialDashboardRegions()

trunk/WebCore/rendering/style/RenderStyle.h ¶

@@ -3 +3 @@
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
@@ -648 +648 @@
     EMatchNearestMailBlockquoteColor matchNearestMailBlockquoteColor() const { return static_cast<EMatchNearestMailBlockquoteColor>(rareNonInheritedData->matchNearestMailBlockquoteColor); }
     const AtomicString& highlight() const { return rareInheritedData->highlight; }
+    Hyphens hyphens() const { return static_cast<Hyphens>(rareInheritedData->hyphens); }
+    const AtomicString& hyphenateCharacter() const { return rareInheritedData->hyphenateCharacter; }
     EBorderFit borderFit() const { return static_cast<EBorderFit>(rareNonInheritedData->m_borderFit); }
     EResize resize() const { return static_cast<EResize>(rareInheritedData->resize); }
@@ -980 +982 @@
     void setMatchNearestMailBlockquoteColor(EMatchNearestMailBlockquoteColor c) { SET_VAR(rareNonInheritedData, matchNearestMailBlockquoteColor, c); }
     void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highlight, h); }
+    void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
+    void setHyphenateCharacter(const AtomicString& h) { SET_VAR(rareInheritedData, hyphenateCharacter, h); }
     void setBorderFit(EBorderFit b) { SET_VAR(rareNonInheritedData, m_borderFit, b); }
     void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); }
@@ -1058 +1062 @@
     const CounterDirectiveMap* counterDirectives() const;
     CounterDirectiveMap& accessCounterDirectives();
+
+    const AtomicString& hyphenString() const;
 
     bool inheritedNotEqual(const RenderStyle*) const;
@@ -1182 +1188 @@
     static EMatchNearestMailBlockquoteColor initialMatchNearestMailBlockquoteColor() { return BCNORMAL; }
     static const AtomicString& initialHighlight() { return nullAtom; }
+    static Hyphens initialHyphens() { return HyphensManual; }
+    static const AtomicString& initialHyphenateCharacter() { return nullAtom; }
     static EBorderFit initialBorderFit() { return BorderFitBorder; }
     static EResize initialResize() { return RESIZE_NONE; }

trunk/WebCore/rendering/style/RenderStyleConstants.h ¶

@@ -407 +407 @@
 enum ELineClampType { LineClampLineCount, LineClampPercentage };
 
+enum Hyphens { HyphensNone, HyphensManual, HyphensAuto };
+
 } // namespace WebCore
 

trunk/WebCore/rendering/style/StyleRareInheritedData.cpp ¶

@@ -1 +1 @@
 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -45 +45 @@
     , userSelect(RenderStyle::initialUserSelect())
     , colorSpace(DeviceColorSpace)
+    , hyphens(HyphensManual)
 {
 }
@@ -70 +71 @@
     , userSelect(o.userSelect)
     , colorSpace(o.colorSpace)
+    , hyphens(o.hyphens)
+    , hyphenateCharacter(o.hyphenateCharacter)
 {
 }
@@ -108 +111 @@
         && resize == o.resize
         && userSelect == o.userSelect
-        && colorSpace == o.colorSpace;
+        && colorSpace == o.colorSpace
+        && hyphens == o.hyphens
+        && hyphenateCharacter == o.hyphenateCharacter;
 }
 

trunk/WebCore/rendering/style/StyleRareInheritedData.h ¶

@@ -78 +78 @@
     unsigned userSelect : 1;  // EUserSelect
     unsigned colorSpace : 1; // ColorSpace
-    
+    unsigned hyphens : 2; // Hyphens
+
+    AtomicString hyphenateCharacter;
+
 private:
     StyleRareInheritedData();

trunk/WebKit/mac/ChangeLog ¶

@@ +1 @@
+2010-06-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        WebKit part of implementing the 'hyphens' and 'hyphenate-character' properties
+        https://bugs.webkit.org/show_bug.cgi?id=10228
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface): Initialize wkGetHyphenationLocationBeforeIndex.
+
 2010-06-21  Satish Sampath  <satish@chromium.org>
 

trunk/WebKit/mac/WebCoreSupport/WebSystemInterface.mm ¶

@@ -1 +1 @@
 /*
- * Copyright 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -116 +116 @@
 #endif
 
+    INIT(GetHyphenationLocationBeforeIndex);
+
     didInit = true;
 }

trunk/WebKitLibraries/ChangeLog ¶

@@ +1 @@
+2010-06-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        WebKitSystemInterface part of CSS3: Implement the 'hyphens' and 'hyphenate-character' properties
+        https://bugs.webkit.org/show_bug.cgi?id=10228
+
+        * WebKitSystemInterface.h: Added WKGetHyphenationLocationBeforeIndex().
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
 2010-06-21  Satish Sampath  <satish@chromium.org>
 

trunk/WebKitLibraries/WebKitSystemInterface.h ¶

@@ -301 +301 @@
 #endif
 
+CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index);
+
 #ifdef __cplusplus
 }