Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (103429 => 103430)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2011-12-21 20:27:37 UTC (rev 103429)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2011-12-21 20:31:53 UTC (rev 103430)
@@ -1,5 +1,21 @@
2011-12-21 Lucas Forschler <lforsch...@apple.com>
+ Merge 93943
+
+ 2011-08-27 Anders Carlsson <ander...@apple.com>
+
+ 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-12-21 Lucas Forschler <lforsch...@apple.com>
+
Merge 93794
2011-08-25 Abhishek Arya <infe...@chromium.org>
Copied: branches/safari-534.54-branch/LayoutTests/fast/borders/border-fit-2.html (from rev 93943, trunk/LayoutTests/fast/borders/border-fit-2.html) (0 => 103430)
--- branches/safari-534.54-branch/LayoutTests/fast/borders/border-fit-2.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/borders/border-fit-2.html 2011-12-21 20:31:53 UTC (rev 103430)
@@ -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>
Copied: branches/safari-534.54-branch/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.png (from rev 93943, trunk/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.png)
(Binary files differ)
Copied: branches/safari-534.54-branch/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.txt (from rev 93943, trunk/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.txt) (0 => 103430)
--- branches/safari-534.54-branch/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/platform/mac/fast/borders/border-fit-2-expected.txt 2011-12-21 20:31:53 UTC (rev 103430)
@@ -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: branches/safari-534.54-branch/Source/WebCore/ChangeLog (103429 => 103430)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2011-12-21 20:27:37 UTC (rev 103429)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2011-12-21 20:31:53 UTC (rev 103430)
@@ -1,5 +1,26 @@
2011-12-21 Lucas Forschler <lforsch...@apple.com>
+ Merge 93943
+
+ 2011-08-27 Anders Carlsson <ander...@apple.com>
+
+ 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-12-21 Lucas Forschler <lforsch...@apple.com>
+
Merge 93794
2011-08-25 Abhishek Arya <infe...@chromium.org>
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderBlock.cpp (103429 => 103430)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderBlock.cpp 2011-12-21 20:27:37 UTC (rev 103429)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderBlock.cpp 2011-12-21 20:31:53 UTC (rev 103430)
@@ -5650,6 +5650,8 @@
int oldWidth = rect.width();
adjustForBorderFit(0, left, right);
if (left != INT_MAX) {
+ left = min(left, oldWidth - (borderRight() + paddingRight()));
+
left -= (borderLeft() + paddingLeft());
if (left > 0) {
rect.move(left, 0);
@@ -5657,6 +5659,8 @@
}
}
if (right != INT_MIN) {
+ right = max(right, borderLeft() + paddingLeft());
+
right += (borderRight() + paddingRight());
if (right < oldWidth)
rect.expand(-(oldWidth - right), 0);
@@ -5670,11 +5674,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();
+ }
+ }
}
}
