Changeset 177219 in webkit

Timestamp:

Dec 12, 2014 3:49:51 AM (9 years ago)

Author:

Alan Bujtas

Message:

Simple line layout: Add 16bit support.
​https://bugs.webkit.org/show_bug.cgi?id=139469

Reviewed by Antti Koivisto.

This patch adds the 16bit support to simple line layout.

Source/WebCore:

Test: fast/inline/simple-line-layout-16bit-content.html

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseFor):

• rendering/SimpleLineLayoutFlowContents.cpp:

(WebCore::SimpleLineLayout::nextBreakablePosition):
(WebCore::SimpleLineLayout::FlowContents::findNextBreakablePosition):
(WebCore::SimpleLineLayout::findNextNonWhitespace):
(WebCore::SimpleLineLayout::FlowContents::findNextNonWhitespacePosition):
(WebCore::SimpleLineLayout::FlowContents::textWidth):
(WebCore::SimpleLineLayout::FlowContents::runWidth):

• rendering/SimpleLineLayoutFlowContents.h:
• rendering/SimpleLineLayoutResolver.cpp:

(WebCore::SimpleLineLayout::RunResolver::Run::text):

LayoutTests:

• fast/inline/simple-line-layout-16bit-content-expected.html: Added.
• fast/inline/simple-line-layout-16bit-content.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/simple-line-layout-16bit-content-expected.html (added)
• LayoutTests/fast/inline/simple-line-layout-16bit-content.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayout.cpp (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp (modified) (7 diffs)
• Source/WebCore/rendering/SimpleLineLayoutFlowContents.h (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayoutResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-12-12  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Add 16bit support.
+        https://bugs.webkit.org/show_bug.cgi?id=139469
+
+        Reviewed by Antti Koivisto.
+
+        This patch adds the 16bit support to simple line layout.
+
+        * fast/inline/simple-line-layout-16bit-content-expected.html: Added.
+        * fast/inline/simple-line-layout-16bit-content.html: Added.
+
 2014-12-11  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-12-12  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Add 16bit support.
+        https://bugs.webkit.org/show_bug.cgi?id=139469
+
+        Reviewed by Antti Koivisto.
+
+        This patch adds the 16bit support to simple line layout.
+
+        Test: fast/inline/simple-line-layout-16bit-content.html
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor):
+        * rendering/SimpleLineLayoutFlowContents.cpp:
+        (WebCore::SimpleLineLayout::nextBreakablePosition):
+        (WebCore::SimpleLineLayout::FlowContents::findNextBreakablePosition):
+        (WebCore::SimpleLineLayout::findNextNonWhitespace):
+        (WebCore::SimpleLineLayout::FlowContents::findNextNonWhitespacePosition):
+        (WebCore::SimpleLineLayout::FlowContents::textWidth):
+        (WebCore::SimpleLineLayout::FlowContents::runWidth):
+        * rendering/SimpleLineLayoutFlowContents.h:
+        * rendering/SimpleLineLayoutResolver.cpp:
+        (WebCore::SimpleLineLayout::RunResolver::Run::text):
+
 2014-12-12  ChangSeok Oh  <changseok.oh@collabora.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -98 +98 @@
     // The <blockflow><inline>#text</inline></blockflow> case is also popular and should be relatively easy to cover.
     for (const auto& renderer : childrenOfType<RenderObject>(flow)) {
-        if (!is<RenderText>(renderer) || !downcast<RenderText>(renderer).text()->is8Bit())
+        if (!is<RenderText>(renderer))
             return false;
     }

trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp

@@ -67 +67 @@
 }
 
+template <typename CharacterType>
+static unsigned nextBreakablePosition(LazyLineBreakIterator& lineBreakItearator, const FlowContents::Segment& segment, unsigned position)
+{
+    const auto* characters = segment.text.characters<CharacterType>();
+    unsigned segmentLength = segment.end - segment.start;
+    unsigned segmentPosition = position - segment.start;
+    return nextBreakablePositionNonLoosely<CharacterType, NBSPBehavior::IgnoreNBSP>(lineBreakItearator, characters, segmentLength, segmentPosition);
+}
+
 unsigned FlowContents::findNextBreakablePosition(unsigned position) const
 {
@@ -78 +87 @@
         }
 
-        auto* characters = segment.text.characters8();
-        unsigned segmentLength = segment.end - segment.start;
-        unsigned segmentPosition = position - segment.start;
-        unsigned breakable = nextBreakablePositionNonLoosely<LChar, NBSPBehavior::IgnoreNBSP>(m_lineBreakIterator, characters, segmentLength, segmentPosition);
+        unsigned breakable = segment.text.is8Bit() ? nextBreakablePosition<LChar>(m_lineBreakIterator, segment, position) : nextBreakablePosition<UChar>(m_lineBreakIterator, segment, position);
         position = segment.start + breakable;
         if (position < segment.end)
@@ -89 +95 @@
 }
 
+template <typename CharacterType>
 static bool findNextNonWhitespace(const FlowContents::Segment& segment, const FlowContents::Style& style, unsigned& position, unsigned& spaceCount)
 {
-    const LChar* text = segment.text.characters8();
+    const auto* text = segment.text.characters<CharacterType>();
     for (; position < segment.end; ++position) {
         auto character = text[position - segment.start];
@@ -107 +114 @@
 {
     for (unsigned i = segmentIndexForPosition(position); i < m_segments.size(); ++i) {
-        if (findNextNonWhitespace(m_segments[i], m_style, position, spaceCount))
+        bool foundNonWhitespace = m_segments[i].text.is8Bit() ? findNextNonWhitespace<LChar>(m_segments[i], m_style, position, spaceCount) :
+            findNextNonWhitespace<UChar>(m_segments[i], m_style, position, spaceCount);
+        if (foundNonWhitespace)
             break;
     }
@@ -115 +124 @@
 float FlowContents::textWidth(unsigned from, unsigned to, float xPosition) const
 {
-    auto& fromSegment = segmentForPosition(from);
+    const auto& fromSegment = segmentForPosition(from);
 
     if ((m_style.font.isFixedPitch() && fromSegment.end >= to) || (from == fromSegment.start && to == fromSegment.end))
         return fromSegment.renderer.width(from - fromSegment.start, to - from, m_style.font, xPosition, nullptr, nullptr);
 
-    auto* segment = &fromSegment;
+    const auto* segment = &fromSegment;
     float textWidth = 0;
     unsigned fragmentEnd = 0;
     while (true) {
         fragmentEnd = std::min(to, segment->end);
-        textWidth += runWidth(segment->text, from - segment->start, fragmentEnd - segment->start, xPosition + textWidth);
+        textWidth += segment->text.is8Bit() ? runWidth<LChar>(segment->text, from - segment->start, fragmentEnd - segment->start, xPosition + textWidth) :
+            runWidth<UChar>(segment->text, from - segment->start, fragmentEnd - segment->start, xPosition + textWidth);
         if (fragmentEnd == to)
             break;
@@ -156 +166 @@
 }
 
+template <typename CharacterType>
 float FlowContents::runWidth(const String& text, unsigned from, unsigned to, float xPosition) const
 {
@@ -162 +173 @@
     if (measureWithEndSpace)
         ++to;
-    TextRun run(text.characters8() + from, to - from);
+    TextRun run(text.characters<CharacterType>() + from, to - from);
     run.setXPos(xPosition);
     run.setTabSize(!!m_style.tabWidth, m_style.tabWidth);

trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h

@@ -81 +81 @@
 
     UChar characterAt(unsigned position) const;
-    float runWidth(const String&, unsigned from, unsigned to, float xPosition) const;
+    template <typename CharacterType> float runWidth(const String&, unsigned from, unsigned to, float xPosition) const;
 
     const Style m_style;

trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp

@@ -78 +78 @@
     auto& run = m_iterator.simpleRun();
     auto& segment = resolver.m_flowContents.segmentForPosition(run.start);
-    ASSERT(segment.renderer.is8Bit());
     // We currently split runs on segment boundaries (different RenderText).
     ASSERT(run.end <= segment.end);
-    return StringView(segment.renderer.characters8(), segment.renderer.textLength()).substring(run.start - segment.start, run.end - run.start);
+    if (segment.renderer.is8Bit())
+        return StringView(segment.renderer.characters8(), segment.renderer.textLength()).substring(run.start - segment.start, run.end - run.start);
+    return StringView(segment.renderer.characters16(), segment.renderer.textLength()).substring(run.start - segment.start, run.end - run.start);
 }