Changeset 109267 in webkit

Timestamp:

Feb 29, 2012 2:44:33 PM (12 years ago)

Author:

hyatt@apple.com

Message:

Source/WebCore: ​https://bugs.webkit.org/show_bug.cgi?id=79940
<rdar://problem/10080189>

Add support in WebKit for an intra-line character grid for Japanese text layout.

Patch logicalLeftOffsetForLine and logicalRightOffsetForLine in order to get the
basic edge snapping grid functionality up and running. See all the FIXMEs in the function for
some of the issues that still have to be dealt with for it to really work well.

Reviewed by Dan Bernstein.

Added new tests in fast/line-grid.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::logicalLeftOffsetForLine):
(WebCore::RenderBlock::logicalRightOffsetForLine):

LayoutTests: ​https://bugs.webkit.org/show_bug.cgi?id=79940
<rdar://problem/10080189>

Add support in WebKit for an intra-line character grid for Japanese text layout.

New tests for basic left and right alignment of lines in the presence of
floating and positioned objects as well as objects with margins and borders.

Reviewed by Dan Bernstein.

• fast/line-grid/line-align-left-edges.html: Added.
• fast/line-grid/line-align-right-edges.html: Added.
• platform/mac/fast/line-grid/line-align-left-edges-expected.png: Added.
• platform/mac/fast/line-grid/line-align-left-edges-expected.txt: Added.
• platform/mac/fast/line-grid/line-align-right-edges-expected.png: Added.
• platform/mac/fast/line-grid/line-align-right-edges-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/line-grid/line-align-left-edges.html (added)
• LayoutTests/fast/line-grid/line-align-right-edges.html (added)
• LayoutTests/platform/mac/fast/line-grid/line-align-left-edges-expected.png (added)
• LayoutTests/platform/mac/fast/line-grid/line-align-left-edges-expected.txt (added)
• LayoutTests/platform/mac/fast/line-grid/line-align-right-edges-expected.png (added)
• LayoutTests/platform/mac/fast/line-grid/line-align-right-edges-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-29  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=79940
+        <rdar://problem/10080189>
+        
+        Add support in WebKit for an intra-line character grid for Japanese text layout.
+        
+        New tests for basic left and right alignment of lines in the presence of
+        floating and positioned objects as well as objects with margins and borders.
+
+        Reviewed by Dan Bernstein.
+
+        * fast/line-grid/line-align-left-edges.html: Added.
+        * fast/line-grid/line-align-right-edges.html: Added.
+        * platform/mac/fast/line-grid/line-align-left-edges-expected.png: Added.
+        * platform/mac/fast/line-grid/line-align-left-edges-expected.txt: Added.
+        * platform/mac/fast/line-grid/line-align-right-edges-expected.png: Added.
+        * platform/mac/fast/line-grid/line-align-right-edges-expected.txt: Added.
+
 2012-02-29  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-29  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=79940
+        <rdar://problem/10080189>
+        
+        Add support in WebKit for an intra-line character grid for Japanese text layout.
+        
+        Patch logicalLeftOffsetForLine and logicalRightOffsetForLine in order to get the
+        basic edge snapping grid functionality up and running. See all the FIXMEs in the function for
+        some of the issues that still have to be dealt with for it to really work well.
+
+        Reviewed by Dan Bernstein.
+
+        Added new tests in fast/line-grid.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::logicalLeftOffsetForLine):
+        (WebCore::RenderBlock::logicalRightOffsetForLine):
+
 2012-02-29  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3867 +3867 @@
         left += textIndentOffset();
 
+    if (style()->lineAlign() == LineAlignNone)
+        return left;
+    
+    // Push in our left offset so that it is aligned with the character grid.
+    LayoutState* layoutState = view()->layoutState();
+    if (!layoutState)
+        return left;
+
+    RenderBlock* lineGrid = layoutState->lineGrid();
+    if (!lineGrid || lineGrid->style()->writingMode() != style()->writingMode())
+        return left;
+
+    // FIXME: Should letter-spacing apply? This is complicated since it doesn't apply at the edge?
+    float maxCharWidth = lineGrid->style()->font().primaryFont()->maxCharWidth();
+    if (!maxCharWidth)
+        return left;
+
+    LayoutUnit lineGridOffset = lineGrid->isHorizontalWritingMode() ? layoutState->lineGridOffset().width(): layoutState->lineGridOffset().height();
+    LayoutUnit layoutOffset = lineGrid->isHorizontalWritingMode() ? layoutState->layoutOffset().width() : layoutState->layoutOffset().height();
+    
+    // Push in to the nearest character width (truncated so that we pixel snap left).
+    // FIXME: Should be patched when subpixel layout lands, since this calculation doesn't have to pixel snap
+    // any more (https://bugs.webkit.org/show_bug.cgi?id=79946).
+    // FIXME: This is wrong for RTL (https://bugs.webkit.org/show_bug.cgi?id=79945).
+    // FIXME: This doesn't work with columns or regions (https://bugs.webkit.org/show_bug.cgi?id=79942).
+    // FIXME: This doesn't work when the inline position of the object isn't set ahead of time.
+    // FIXME: Dynamic changes to the font or to the inline position need to result in a deep relayout.
+    // (https://bugs.webkit.org/show_bug.cgi?id=79944)
+    float remainder = fmodf(maxCharWidth - fmodf(left + layoutOffset - lineGridOffset, maxCharWidth), maxCharWidth);
+    left += remainder;
     return left;
 }
@@ -3886 +3916 @@
         right -= textIndentOffset();
     
+    if (style()->lineAlign() == LineAlignNone)
+        return right;
+    
+    // Push in our right offset so that it is aligned with the character grid.
+    LayoutState* layoutState = view()->layoutState();
+    if (!layoutState)
+        return right;
+
+    RenderBlock* lineGrid = layoutState->lineGrid();
+    if (!lineGrid || lineGrid->style()->writingMode() != style()->writingMode())
+        return right;
+
+    // FIXME: Should letter-spacing apply? This is complicated since it doesn't apply at the edge?
+    float maxCharWidth = lineGrid->style()->font().primaryFont()->maxCharWidth();
+    if (!maxCharWidth)
+        return right;
+
+    LayoutUnit lineGridOffset = lineGrid->isHorizontalWritingMode() ? layoutState->lineGridOffset().width(): layoutState->lineGridOffset().height();
+    LayoutUnit layoutOffset = lineGrid->isHorizontalWritingMode() ? layoutState->layoutOffset().width() : layoutState->layoutOffset().height();
+    
+    // Push in to the nearest character width (truncated so that we pixel snap right).
+    // FIXME: Should be patched when subpixel layout lands, since this calculation doesn't have to pixel snap
+    // any more (https://bugs.webkit.org/show_bug.cgi?id=79946).
+    // FIXME: This is wrong for RTL (https://bugs.webkit.org/show_bug.cgi?id=79945).
+    // FIXME: This doesn't work with columns or regions (https://bugs.webkit.org/show_bug.cgi?id=79942).
+    // FIXME: This doesn't work when the inline position of the object isn't set ahead of time.
+    // FIXME: Dynamic changes to the font or to the inline position need to result in a deep relayout.
+    // (https://bugs.webkit.org/show_bug.cgi?id=79944)
+    float remainder = fmodf(fmodf(right + layoutOffset - lineGridOffset, maxCharWidth), maxCharWidth);
+    right -= ceilf(remainder);
     return right;
 }