[webkit-changes] [93943] trunk

Sat, 27 Aug 2011 13:22:51 -0700

Title: [93943] trunk
Revision
93943
Author
[email protected]
Date
2011-08-27 13:22:35 -0700 (Sat, 27 Aug 2011)

Log Message

iChat: Receiving a message containing only a single-quote (') causes bubble to fail
https://bugs.webkit.org/show_bug.cgi?id=67076
<rdar://problem/10026089>

Reviewed by Dan Bernstein.

Source/WebCore: 

Test: fast/borders/border-fit-2.html

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::borderFitAdjust):
Make sure that the resulting rect isn't smaller than the border + padding.

(WebCore::RenderBlock::clearTruncation):
Fix blatant coding style violations.

LayoutTests: 

* fast/borders/border-fit-2.html: Added.
* platform/mac/fast/borders/border-fit-2-expected.png: Added.
* platform/mac/fast/borders/border-fit-2-expected.txt: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (93942 => 93943)


--- trunk/LayoutTests/ChangeLog	2011-08-27 19:05:14 UTC (rev 93942)
+++ trunk/LayoutTests/ChangeLog	2011-08-27 20:22:35 UTC (rev 93943)
@@ -1,3 +1,15 @@
+2011-08-27  Anders Carlsson  <[email protected]>
+
+        iChat: Receiving a message containing only a single-quote (') causes bubble to fail
+        https://bugs.webkit.org/show_bug.cgi?id=67076
+        <rdar://problem/10026089>
+
+        Reviewed by Dan Bernstein.
+
+        * fast/borders/border-fit-2.html: Added.
+        * platform/mac/fast/borders/border-fit-2-expected.png: Added.
+        * platform/mac/fast/borders/border-fit-2-expected.txt: Added.
+
 2011-08-27  Young Han Lee  <[email protected]>
 
         Reviewed by Dirk Schulze.

Added: trunk/LayoutTests/fast/borders/border-fit-2.html (0 => 93943)


--- trunk/LayoutTests/fast/borders/border-fit-2.html	                        (rev 0)
+++ trunk/LayoutTests/fast/borders/border-fit-2.html	2011-08-27 20:22:35 UTC (rev 93943)
@@ -0,0 +1,15 @@
+<html>
+<head>
+    <style>
+        div.test {
+            border-width: 21px 30px 30px 21px;
+            -webkit-border-fit: lines;
+            -webkit-border-image: url("resources/border-image.png") 21 30 30 21;
+        }
+    </style>
+</head>
+<body>
+    <div class="test"><div style="display:inline-block; margin-left:-20px;"></div></div>
+    <div class="test" style="text-align:right;"><div style="display:inline-block; margin-right:-20px;"></div></div>
+</body>
+</html>

Added: trunk/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.png


(Binary files differ)
Property changes on: trunk/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.png ___________________________________________________________________

Added: svn:mime-type

Added: trunk/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.txt (0 => 93943)


--- trunk/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.txt	2011-08-27 20:22:35 UTC (rev 93943)
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 784x51 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+        RenderBlock {DIV} at (1,21) size 0x0
+      RenderBlock {DIV} at (0,51) size 784x51 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+        RenderBlock {DIV} at (774,21) size 0x0

Modified: trunk/Source/WebCore/ChangeLog (93942 => 93943)


--- trunk/Source/WebCore/ChangeLog	2011-08-27 19:05:14 UTC (rev 93942)
+++ trunk/Source/WebCore/ChangeLog	2011-08-27 20:22:35 UTC (rev 93943)
@@ -1,3 +1,20 @@
+2011-08-27  Anders Carlsson  <[email protected]>
+
+        iChat: Receiving a message containing only a single-quote (') causes bubble to fail
+        https://bugs.webkit.org/show_bug.cgi?id=67076
+        <rdar://problem/10026089>
+
+        Reviewed by Dan Bernstein.
+
+        Test: fast/borders/border-fit-2.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::borderFitAdjust):
+        Make sure that the resulting rect isn't smaller than the border + padding.
+
+        (WebCore::RenderBlock::clearTruncation):
+        Fix blatant coding style violations.
+
 2011-08-27  Andreas Kling  <[email protected]>
 
         Shrink RenderLayer.

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (93942 => 93943)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2011-08-27 19:05:14 UTC (rev 93942)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2011-08-27 20:22:35 UTC (rev 93943)
@@ -5752,6 +5752,8 @@
     LayoutUnit oldWidth = rect.width();
     adjustForBorderFit(0, left, right);
     if (left != numeric_limits<LayoutUnit>::max()) {
+        left = min(left, oldWidth - (borderRight() + paddingRight()));
+
         left -= (borderLeft() + paddingLeft());
         if (left > 0) {
             rect.move(left, 0);
@@ -5759,6 +5761,8 @@
         }
     }
     if (right != numeric_limits<LayoutUnit>::min()) {
+        right = max(right, borderLeft() + paddingLeft());
+
         right += (borderRight() + paddingRight());
         if (right < oldWidth)
             rect.expand(-(oldWidth - right), 0);
@@ -5772,11 +5776,12 @@
             setHasMarkupTruncation(false);
             for (RootInlineBox* box = firstRootBox(); box; box = box->nextRootBox())
                 box->clearTruncation();
-        }
-        else
-            for (RenderObject* obj = firstChild(); obj; obj = obj->nextSibling())
+        } else {
+            for (RenderObject* obj = firstChild(); obj; obj = obj->nextSibling()) {
                 if (shouldCheckLines(obj))
                     toRenderBlock(obj)->clearTruncation();
+            }
+        }
     }
 }
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to