[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
aestes at apple.com
aestes at apple.com
Wed Dec 22 18:04:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9ab3c37411933be91c621af0617fb494c400c931
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 6 21:57:35 2010 +0000
2010-12-06 Andy Estes <aestes at apple.com>
Reviewed by Darin Adler.
Marquee elements do not stop animating when scrollAmount is set to 0.
https://bugs.webkit.org/show_bug.cgi?id=50434
Test: fast/html/marquee-scrollamount.html
* rendering/RenderMarquee.cpp:
(WebCore::RenderMarquee::timerFired): Allow increment to be 0.
2010-12-06 Andy Estes <aestes at apple.com>
Reviewed by Darin Adler.
Marquee elements do not stop animating when scrollAmount is set to 0.
https://bugs.webkit.org/show_bug.cgi?id=50434
* fast/html/marquee-scrollamount.html: Added.
* platform/mac/fast/html/marquee-scrollamount-expected.checksum: Added.
* platform/mac/fast/html/marquee-scrollamount-expected.png: Added.
* platform/mac/fast/html/marquee-scrollamount-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73398 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6eb0783..1b6754c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-06 Andy Estes <aestes at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Marquee elements do not stop animating when scrollAmount is set to 0.
+ https://bugs.webkit.org/show_bug.cgi?id=50434
+
+ * fast/html/marquee-scrollamount.html: Added.
+ * platform/mac/fast/html/marquee-scrollamount-expected.checksum: Added.
+ * platform/mac/fast/html/marquee-scrollamount-expected.png: Added.
+ * platform/mac/fast/html/marquee-scrollamount-expected.txt: Added.
+
2010-12-06 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/html/marquee-scrollamount.html b/LayoutTests/fast/html/marquee-scrollamount.html
new file mode 100644
index 0000000..d1a3b56
--- /dev/null
+++ b/LayoutTests/fast/html/marquee-scrollamount.html
@@ -0,0 +1,19 @@
+<body>
+<p>This is a regression test for https://bugs.webkit.org/show_bug.cgi?id=50434. It verifies that a marquee does not animate when scrollAmount is set to 0 by script.</p>
+<script>
+ if (window.layoutTestController)
+ layoutTestController.waitUntilDone();
+ var marquee = document.createElement("marquee");
+ marquee.innerHTML = "Test";
+ marquee.width = "100px";
+ marquee.scrollDelay = 0;
+ document.body.appendChild(marquee);
+ setTimeout(function() {
+ marquee.scrollAmount = 0;
+ if (window.layoutTestController) {
+ setTimeout(function() {
+ layoutTestController.notifyDone();
+ }, 55);
+ }
+ }, 0);
+</script>
diff --git a/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.checksum b/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.checksum
new file mode 100644
index 0000000..2aacbd1
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.checksum
@@ -0,0 +1 @@
+d9f7fd500bb32395593efa693824d78f
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.png b/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.png
new file mode 100644
index 0000000..d830bde
Binary files /dev/null and b/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.txt b/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.txt
new file mode 100644
index 0000000..3800926
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.txt
@@ -0,0 +1,15 @@
+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 {P} at (0,0) size 784x36
+ RenderText {#text} at (0,0) size 750x36
+ text run at (0,0) width 750: "This is a regression test for https://bugs.webkit.org/show_bug.cgi?id=50434. It verifies that a marquee does not animate"
+ text run at (0,18) width 250: "when scrollAmount is set to 0 by script."
+ RenderBlock (anonymous) at (0,52) size 784x18
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,60) size 100x18 scrollX -100
+ RenderBlock {MARQUEE} at (0,0) size 100x18
+ RenderText {#text} at (0,0) size 27x18
+ text run at (0,0) width 27: "Test"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fbba963..cff2011 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-06 Andy Estes <aestes at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Marquee elements do not stop animating when scrollAmount is set to 0.
+ https://bugs.webkit.org/show_bug.cgi?id=50434
+
+ Test: fast/html/marquee-scrollamount.html
+
+ * rendering/RenderMarquee.cpp:
+ (WebCore::RenderMarquee::timerFired): Allow increment to be 0.
+
2010-12-06 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed Leopard buildfix for r73380.
diff --git a/WebCore/rendering/RenderMarquee.cpp b/WebCore/rendering/RenderMarquee.cpp
index 8b8530b..1c08831 100644
--- a/WebCore/rendering/RenderMarquee.cpp
+++ b/WebCore/rendering/RenderMarquee.cpp
@@ -293,7 +293,7 @@ void RenderMarquee::timerFired(Timer<RenderMarquee>*)
}
bool positive = range > 0;
int clientSize = (isHorizontal() ? m_layer->renderBox()->clientWidth() : m_layer->renderBox()->clientHeight());
- int increment = max(1, abs(m_layer->renderer()->style()->marqueeIncrement().calcValue(clientSize)));
+ int increment = abs(m_layer->renderer()->style()->marqueeIncrement().calcValue(clientSize));
int currentPos = (isHorizontal() ? m_layer->scrollXOffset() : m_layer->scrollYOffset());
newPos = currentPos + (addIncrement ? increment : -increment);
if (positive)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list