[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
morrita at google.com
morrita at google.com
Fri Jan 21 14:42:42 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 7dfdc767953e5cec5726dbc4c476c5317c2c4982
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 27 04:42:01 2010 +0000
2010-12-26 MORITA Hajime <morrita at google.com>
Reviewed by Dan Bernstein.
For box-shadow, non-primary shadows should have specified radii.
https://bugs.webkit.org/show_bug.cgi?id=51386
* fast/box-shadow/spread-multiple-normal-expected.txt: Added.
* fast/box-shadow/spread-multiple-normal.html: Added.
* fast/box-shadow/spread-multiple-normal-expected.checksum: Added.
* fast/box-shadow/spread-multiple-normal-expected.png: Added.
2010-12-26 MORITA Hajime <morrita at google.com>
Reviewed by Dan Bernstein.
For box-shadow, non-primary shadows should have specified radii.
https://bugs.webkit.org/show_bug.cgi?id=51386
On paintBoxShadow(), the spread value accidentally accumulated accidentally
during the loop, which should be applied individually for radius of each shadow.
This change makes the radii for rects computed for each shadow.
Test: fast/box-shadow/spread-multiple-normal.html
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintBoxShadow):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74673 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7deb823..b961fb9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-26 MORITA Hajime <morrita at google.com>
+
+ Reviewed by Dan Bernstein.
+
+ For box-shadow, non-primary shadows should have specified radii.
+ https://bugs.webkit.org/show_bug.cgi?id=51386
+
+ * fast/box-shadow/spread-multiple-normal-expected.txt: Added.
+ * fast/box-shadow/spread-multiple-normal.html: Added.
+ * fast/box-shadow/spread-multiple-normal-expected.checksum: Added.
+ * fast/box-shadow/spread-multiple-normal-expected.png: Added.
+
2010-12-26 Kenneth Russell <kbr at google.com>
Unreviewed, Chromium expectations fix. Fix broken (duplicate)
diff --git a/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.checksum b/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.checksum
new file mode 100644
index 0000000..a74b73c
--- /dev/null
+++ b/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.checksum
@@ -0,0 +1 @@
+2ea7ff9272fd7ed62b75b8623c52f055
\ No newline at end of file
diff --git a/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.png b/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.png
new file mode 100644
index 0000000..113f8e6
Binary files /dev/null and b/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.png differ
diff --git a/JavaScriptCore/tests/mozilla/js1_6/Array/browser.js b/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.txt
similarity index 100%
copy from JavaScriptCore/tests/mozilla/js1_6/Array/browser.js
copy to LayoutTests/fast/box-shadow/spread-multiple-normal-expected.txt
diff --git a/LayoutTests/fast/box-shadow/spread-multiple-normal.html b/LayoutTests/fast/box-shadow/spread-multiple-normal.html
new file mode 100644
index 0000000..be2b5fa
--- /dev/null
+++ b/LayoutTests/fast/box-shadow/spread-multiple-normal.html
@@ -0,0 +1,45 @@
+<html>
+<head>
+<style>
+.square {
+ margin: 25px;
+ height: 60px;
+ width: 60px;
+ background-color: black;
+}
+
+.rounded {
+ margin: 25px;
+ height: 60px;
+ width: 60px;
+ background-color: black;
+ border-radius: 30px;
+}
+
+#negative {
+ -webkit-box-shadow: 110px 0px 0px -10px #00f,
+ 210px 0px 0px -15px #00d,
+ 310px 0px 0px -20px #00b,
+ 410px 0px 0px -25px #009;
+}
+
+#positive {
+ -webkit-box-shadow: 110px 0px 0px 10px #00f,
+ 210px 0px 0px 15px #00d,
+ 310px 0px 0px 20px #00b,
+ 410px 0px 0px 25px #009;
+}
+
+</style>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText(true);
+</script>
+</head>
+<body>
+<div class="square" id="negative"></div>
+<div class="square" id="positive"></div>
+<div class="rounded" id="negative"></div>
+<div class="rounded" id="positive"></div>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d702348..ebf23c5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-26 MORITA Hajime <morrita at google.com>
+
+ Reviewed by Dan Bernstein.
+
+ For box-shadow, non-primary shadows should have specified radii.
+ https://bugs.webkit.org/show_bug.cgi?id=51386
+
+ On paintBoxShadow(), the spread value accidentally accumulated accidentally
+ during the loop, which should be applied individually for radius of each shadow.
+ This change makes the radii for rects computed for each shadow.
+
+ Test: fast/box-shadow/spread-multiple-normal.html
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintBoxShadow):
+
2010-12-26 Patrick Gansterer <paroga at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/rendering/RenderBoxModelObject.cpp b/WebCore/rendering/RenderBoxModelObject.cpp
index f985a20..d5fb13e 100644
--- a/WebCore/rendering/RenderBoxModelObject.cpp
+++ b/WebCore/rendering/RenderBoxModelObject.cpp
@@ -1712,8 +1712,12 @@ void RenderBoxModelObject::paintBoxShadow(GraphicsContext* context, int tx, int
IntSize bottomLeftToClipOut = bottomLeft;
IntSize bottomRightToClipOut = bottomRight;
+ IntSize topLeftToFill = topLeft;
+ IntSize topRightToFill = topRight;
+ IntSize bottomLeftToFill = bottomLeft;
+ IntSize bottomRightToFill = bottomRight;
if (shadowSpread < 0)
- uniformlyExpandBorderRadii(shadowSpread, topLeft, topRight, bottomLeft, bottomRight);
+ uniformlyExpandBorderRadii(shadowSpread, topLeftToFill, topRightToFill, bottomLeftToFill, bottomRightToFill);
// If the box is opaque, it is unnecessary to clip it out. However, doing so saves time
// when painting the shadow. On the other hand, it introduces subpixel gaps along the
@@ -1725,7 +1729,7 @@ void RenderBoxModelObject::paintBoxShadow(GraphicsContext* context, int tx, int
if (!rectToClipOut.isEmpty())
context->clipOutRoundedRect(rectToClipOut, topLeftToClipOut, topRightToClipOut, bottomLeftToClipOut, bottomRightToClipOut);
- context->fillRoundedRect(fillRect, topLeft, topRight, bottomLeft, bottomRight, Color::black, s->colorSpace());
+ context->fillRoundedRect(fillRect, topLeftToFill, topRightToFill, bottomLeftToFill, bottomRightToFill, Color::black, s->colorSpace());
} else {
IntRect rectToClipOut = rect;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list