Changeset 194418 in webkit

Timestamp:

Dec 24, 2015 11:25:29 PM (8 years ago)

Author:

Alan Bujtas

Message:

ASSERTION FAILED: x2 >= x1 in WebCore::RenderElement::drawLineForBoxSide
​https://bugs.webkit.org/show_bug.cgi?id=151210

Reviewed by Simon Fraser.

Source/WebCore:

"IntRect outer = snappedIntRect(inner)" explicitly converts inner to LayoutRect first and
returns a snapped IntRect. When inner (after the inflate) overflows LayoutUnit,
the snapped rect might become smaller than the inner rect.

This patch also enables outline painting on subpixel positions.

Tests: fast/borders/hidpi-outline-on-subpixel-position.html

fast/borders/outline-offset-overflow.html

• rendering/RenderElement.cpp:

(WebCore::RenderElement::paintOutline):

LayoutTests:

"IntRect outer = snappedIntRect(inner)" explicitly converts inner to LayoutRect and
returns a snapped IntRect. When inner (after the inflate) overflows LayoutUnit,
the snapped outer rect becomes smaller than the inner rect.

This patch also enables outline painting on subpixel positions.

• fast/borders/hidpi-outline-on-subpixel-position-expected.html: Added.
• fast/borders/hidpi-outline-on-subpixel-position.html: Added.
• fast/borders/outline-offset-overflow-expected.txt: Added.
• fast/borders/outline-offset-overflow.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/borders/hidpi-outline-on-subpixel-position-expected.html (added)
• LayoutTests/fast/borders/hidpi-outline-on-subpixel-position.html (added)
• LayoutTests/fast/borders/outline-offset-overflow-expected.txt (added)
• LayoutTests/fast/borders/outline-offset-overflow.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-24  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: x2 >= x1 in WebCore::RenderElement::drawLineForBoxSide
+        https://bugs.webkit.org/show_bug.cgi?id=151210
+
+        Reviewed by Simon Fraser.
+
+        "IntRect outer = snappedIntRect(inner)" explicitly converts inner to LayoutRect and
+        returns a snapped IntRect. When inner (after the inflate) overflows LayoutUnit,
+        the snapped outer rect becomes smaller than the inner rect.
+
+        This patch also enables outline painting on subpixel positions.
+
+        * fast/borders/hidpi-outline-on-subpixel-position-expected.html: Added.
+        * fast/borders/hidpi-outline-on-subpixel-position.html: Added.
+        * fast/borders/outline-offset-overflow-expected.txt: Added.
+        * fast/borders/outline-offset-overflow.html: Added.
+
 2015-12-23  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-24  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: x2 >= x1 in WebCore::RenderElement::drawLineForBoxSide
+        https://bugs.webkit.org/show_bug.cgi?id=151210
+
+        Reviewed by Simon Fraser.
+
+        "IntRect outer = snappedIntRect(inner)" explicitly converts inner to LayoutRect first and
+        returns a snapped IntRect. When inner (after the inflate) overflows LayoutUnit,
+        the snapped rect might become smaller than the inner rect.
+
+        This patch also enables outline painting on subpixel positions.
+
+        Tests: fast/borders/hidpi-outline-on-subpixel-position.html
+               fast/borders/outline-offset-overflow.html
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::paintOutline):
+
 2015-12-24  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -2122 +2122 @@
         return;
 
-    IntRect inner = snappedIntRect(paintRect);
-    inner.inflate(outlineOffset);
-
-    IntRect outer = snappedIntRect(inner);
-    outer.inflate(outlineWidth);
+    FloatRect outer = paintRect;
+    outer.inflate(outlineOffset + outlineWidth);
+    FloatRect inner = outer;
+    inner.inflate(-outlineWidth);
 
     // FIXME: This prevents outlines from painting inside the object. See bug 12042
@@ -2150 +2149 @@
     }
 
-    int leftOuter = outer.x();
-    int leftInner = inner.x();
-    int rightOuter = outer.maxX();
-    int rightInner = inner.maxX();
-    int topOuter = outer.y();
-    int topInner = inner.y();
-    int bottomOuter = outer.maxY();
-    int bottomInner = inner.maxY();
+    float leftOuter = outer.x();
+    float leftInner = inner.x();
+    float rightOuter = outer.maxX();
+    float rightInner = std::min(inner.maxX(), rightOuter);
+    float topOuter = outer.y();
+    float topInner = inner.y();
+    float bottomOuter = outer.maxY();
+    float bottomInner = std::min(inner.maxY(), bottomOuter);
 
     drawLineForBoxSide(graphicsContext, FloatRect(FloatPoint(leftOuter, topOuter), FloatPoint(leftInner, bottomOuter)), BSLeft, outlineColor, outlineStyle, outlineWidth, outlineWidth);