Changeset 53200 in webkit

Timestamp:

Jan 13, 2010 1:23:38 PM (14 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=32495

Reviewed by Dan Bernstein.

font-size:small with background-color causes text to get clipped. Make sure to only paint within the lineTop/lineBottom of
a line for quirky inline flow boxes that didn't contribute to the overall height of the line.

Added fast/backgrounds/quirks-mode-line-boxes-backgrounds.html

• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::computeVerticalOverflow):
(WebCore::InlineFlowBox::paintBoxDecorations):
(WebCore::InlineFlowBox::paintMask):

Location:

trunk

Files:

• LayoutTests/fast/backgrounds/quirks-mode-line-box-backgrounds.html (added)
• LayoutTests/platform/mac/fast/backgrounds/quirks-mode-line-box-backgrounds-expected.checksum (added)
• LayoutTests/platform/mac/fast/backgrounds/quirks-mode-line-box-backgrounds-expected.png (added)
• LayoutTests/platform/mac/fast/backgrounds/quirks-mode-line-box-backgrounds-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/InlineFlowBox.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-13  Dave Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32495
+
+        font-size:small with background-color causes text to get clipped.  Make sure to only paint within the lineTop/lineBottom of
+        a line for quirky inline flow boxes that didn't contribute to the overall height of the line. 
+        
+        Added fast/backgrounds/quirks-mode-line-boxes-backgrounds.html
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::computeVerticalOverflow):
+        (WebCore::InlineFlowBox::paintBoxDecorations):
+        (WebCore::InlineFlowBox::paintMask):
+
 2010-01-13  Dumitru Daniliuc  <dumi@chromium.org>
 

trunk/WebCore/rendering/InlineFlowBox.cpp

@@ -533 +533 @@
     // Any spillage outside of the line top and bottom is not considered overflow.  We just ignore this, since it only happens
     // from the "your ascent/descent don't affect the line" quirk.
-    // FIXME: Technically this means there can be repaint errors in the case where a line box has a shadow or background that spills
-    // outside of the block. We should consider making any line box that has anything to render just stop respecting the quirk or making
-    // boxes that render something set visual overflow.
     int topOverflow = max(y(), lineTop);
     int bottomOverflow = min(y() + boxHeight, lineBottom);
@@ -736 +733 @@
         return;
 
-    // Move x/y to our coordinates.
-    tx += m_x;
-    ty += m_y;
-    
+    int x = m_x;
+    int y = m_y;
     int w = width();
     int h = height();
 
+    // Constrain our background/border painting to the line top and bottom if necessary.
+    bool strictMode = renderer()->document()->inStrictMode();
+    if (!hasTextChildren() && !strictMode) {
+        RootInlineBox* rootBox = root();
+        int bottom = min(rootBox->lineBottom(), y + h);
+        y = max(rootBox->lineTop(), y);
+        h = bottom - y;
+    }
+    
+    // Move x/y to our coordinates.
+    tx += x;
+    ty += y;
+    
     GraphicsContext* context = paintInfo.context;
     
@@ -801 +809 @@
         return;
 
-    // Move x/y to our coordinates.
-    tx += m_x;
-    ty += m_y;
-    
+    int x = m_x;
+    int y = m_y;
     int w = width();
     int h = height();
+
+    // Constrain our background/border painting to the line top and bottom if necessary.
+    bool strictMode = renderer()->document()->inStrictMode();
+    if (!hasTextChildren() && !strictMode) {
+        RootInlineBox* rootBox = root();
+        int bottom = min(rootBox->lineBottom(), y + h);
+        y = max(rootBox->lineTop(), y);
+        h = bottom - y;
+    }
+    
+    // Move x/y to our coordinates.
+    tx += x;
+    ty += y;
 
     const NinePieceImage& maskNinePieceImage = renderer()->style()->maskBoxImage();