[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
mitz at apple.com
mitz at apple.com
Fri Feb 26 22:25:07 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 0703d20214fe10e576a0e5e25727b82843f65c62
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 18 20:55:49 2010 +0000
<rdar://problem/7650652> REGRESSION: Selection painting issue in bug review textbox
https://bugs.webkit.org/show_bug.cgi?id=34946
Reviewed by Simon Fraser.
WebCore:
Test: fast/repaint/selection-gap-overflow-scroll-2.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintSelection): localToContainerQuad() adjusts for
overflow scroll, but RenderLayer::addBlockSelectionGapsBounds() takes
non-scrolled coordinates, so account for that.
LayoutTests:
* fast/repaint/selection-gap-overflow-scroll-2.html: Copied from LayoutTests/fast/repaint/selection-gap-overflow-scroll.html.
* platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.checksum: Added.
* platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.png: Added.
* platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54982 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index aed00d5..48477d2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-18 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ <rdar://problem/7650652> REGRESSION: Selection painting issue in bug review textbox
+ https://bugs.webkit.org/show_bug.cgi?id=34946
+
+ * fast/repaint/selection-gap-overflow-scroll-2.html: Copied from LayoutTests/fast/repaint/selection-gap-overflow-scroll.html.
+ * platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.checksum: Added.
+ * platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.png: Added.
+ * platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.txt: Added.
+
2010-02-17 Dumitru Daniliuc <dumi at chromium.org>
Reviewed by NOBODY Darin Adler.
diff --git a/LayoutTests/fast/repaint/selection-gap-overflow-scroll-2.html b/LayoutTests/fast/repaint/selection-gap-overflow-scroll-2.html
new file mode 100644
index 0000000..c64a60e
--- /dev/null
+++ b/LayoutTests/fast/repaint/selection-gap-overflow-scroll-2.html
@@ -0,0 +1,33 @@
+<html>
+<head>
+ <title></title>
+ <style type="text/css">
+ div#overflow { margin: 5px; padding: 10px; border: medium solid; width: 100px; height: 100px; overflow: auto; }
+ ::selection { background-color: red; }
+ </style>
+ <script type="text/javascript" src="resources/repaint.js"></script>
+ <script type="text/javascript">
+ function repaintTest()
+ {
+ getSelection().empty();
+ }
+ </script>
+</head>
+<body onload="runRepaintTest()">
+ <p>
+ Test for <i><a href="https://bugs.webkit.org/show_bug.cgi?id=34946">https://bugs.webkit.org/show_bug.cgi?id=34946</a>
+ REGRESSION: Selection painting issue in bug review textbox</i>.
+ </p>
+ <div id="overflow">
+ <div style="height: 100px;"></div>
+ <div style="display: inline-block; width: 94px;"><span id="target">Lorem<br>ipsum</span></div>
+ </div>
+ <script type="text/javascript">
+ var overflow = document.getElementById("overflow");
+ overflow.scrollTop = overflow.scrollHeight;
+ var selection = getSelection();
+ var target = document.getElementById("target");
+ selection.setBaseAndExtent(target, 0, target, 3);
+ </script>
+</body>
+</html>
diff --git a/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.checksum b/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.checksum
new file mode 100644
index 0000000..8923216
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.checksum
@@ -0,0 +1 @@
+fd23a1b30fe9838dd8782282f4296c06
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.png b/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.png
new file mode 100644
index 0000000..90db0c4
Binary files /dev/null and b/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.txt b/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.txt
new file mode 100644
index 0000000..2f390d9
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-2-expected.txt
@@ -0,0 +1,29 @@
+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 784x18
+ RenderText {#text} at (0,0) size 53x18
+ text run at (0,0) width 53: "Test for "
+ RenderInline {I} at (0,0) size 703x18
+ RenderInline {A} at (0,0) size 307x18 [color=#0000EE]
+ RenderText {#text} at (53,0) size 307x18
+ text run at (53,0) width 307: "https://bugs.webkit.org/show_bug.cgi?id=34946"
+ RenderText {#text} at (360,0) size 396x18
+ text run at (360,0) width 4: " "
+ text run at (364,0) width 392: "REGRESSION: Selection painting issue in bug review textbox"
+ RenderText {#text} at (756,0) size 4x18
+ text run at (756,0) width 4: "."
+layer at (13,42) size 126x126 clip at (16,45) size 105x120 scrollY 36 scrollHeight 156
+ RenderBlock {DIV} at (5,34) size 126x126 [border: (3px solid #000000)]
+ RenderBlock {DIV} at (13,13) size 85x100
+ RenderBlock (anonymous) at (13,113) size 85x36
+ RenderBlock {DIV} at (0,0) size 94x36
+ RenderInline {SPAN} at (0,0) size 42x36
+ RenderText {#text} at (0,0) size 42x18
+ text run at (0,0) width 42: "Lorem"
+ RenderBR {BR} at (42,14) size 0x0
+ RenderText {#text} at (0,18) size 38x18
+ text run at (0,18) width 38: "ipsum"
+ RenderText {#text} at (0,0) size 0x0
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a61b246..d1a6d30 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-18 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ <rdar://problem/7650652> REGRESSION: Selection painting issue in bug review textbox
+ https://bugs.webkit.org/show_bug.cgi?id=34946
+
+ Test: fast/repaint/selection-gap-overflow-scroll-2.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintSelection): localToContainerQuad() adjusts for
+ overflow scroll, but RenderLayer::addBlockSelectionGapsBounds() takes
+ non-scrolled coordinates, so account for that.
+
2010-02-17 Dumitru Daniliuc <dumi at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 1bb8401..e9bd8ea 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -1971,6 +1971,7 @@ void RenderBlock::paintSelection(PaintInfo& paintInfo, int tx, int ty)
if (!hasLayer()) {
FloatRect localBounds(gapRectsBounds);
gapRectsBounds = localToContainerQuad(localBounds, layer->renderer()).enclosingBoundingBox();
+ gapRectsBounds.move(layer->scrolledContentOffset());
}
layer->addBlockSelectionGapsBounds(gapRectsBounds);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list