[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hamaji at chromium.org
hamaji at chromium.org
Wed Apr 7 23:58:27 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 46d70cfab74d9cf7be8e64f4f817bb44f198a5b5
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 27 06:11:25 2009 +0000
2009-11-26 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Dan Bernstein.
Assertion failure in RenderBlock::positionForPointWithInlineChildren when running fast/inline/relative-positioned-overflow.html
https://bugs.webkit.org/show_bug.cgi?id=29966
A test case where a user drags the mouse from an empty inline
element to above texts.
* editing/selection/last-empty-inline-expected.txt: Added.
* editing/selection/last-empty-inline.html: Added.
* platform/win/Skipped:
2009-11-26 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Dan Bernstein.
Assertion failure in RenderBlock::positionForPointWithInlineChildren when running fast/inline/relative-positioned-overflow.html
https://bugs.webkit.org/show_bug.cgi?id=29966
When an empty inline element is clicked, the root inline box has
no leaf children. Use the renderer of a normal child instead.
This change resolves Windows port's assertion failure in a layout test.
Also, this fixes the behavior when a user drags the mouse from an
empty inline element to above texts.
Test: editing/selection/last-empty-inline.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::positionForPointWithInlineChildren):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51429 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cba1f58..b237731 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-26 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Dan Bernstein.
+
+ Assertion failure in RenderBlock::positionForPointWithInlineChildren when running fast/inline/relative-positioned-overflow.html
+ https://bugs.webkit.org/show_bug.cgi?id=29966
+
+ A test case where a user drags the mouse from an empty inline
+ element to above texts.
+
+ * editing/selection/last-empty-inline-expected.txt: Added.
+ * editing/selection/last-empty-inline.html: Added.
+ * platform/win/Skipped:
+
2009-11-26 Kinuko Yasuda <kinuko at chromium.com>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/editing/selection/last-empty-inline-expected.txt b/LayoutTests/editing/selection/last-empty-inline-expected.txt
new file mode 100644
index 0000000..44464d1
--- /dev/null
+++ b/LayoutTests/editing/selection/last-empty-inline-expected.txt
@@ -0,0 +1,2 @@
+To test this manually, press mouse button below the comma between "Hello" and "world!" and drag the mouse to the comma. It's OK if "world!" is selected.
+PASS
diff --git a/LayoutTests/editing/selection/last-empty-inline.html b/LayoutTests/editing/selection/last-empty-inline.html
new file mode 100644
index 0000000..2332981
--- /dev/null
+++ b/LayoutTests/editing/selection/last-empty-inline.html
@@ -0,0 +1,30 @@
+<div>
+To test this manually, press mouse button below the comma between "Hello" and "world!" and drag the mouse to the comma. It's OK if "world!" is selected.
+</div>
+
+<div id="result" style="width: 200px;">
+<span>Hello,</span><span id="world">world!</span><span style="padding-left: 200px; padding-bottom: 200px; background-color: blue; height: 200px;"></span>
+</div>
+
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+
+ var world = document.getElementById("world");
+ var x = world.offsetLeft;
+ var y = world.offsetTop;
+
+ eventSender.mouseMoveTo(x, y + 50);
+ eventSender.mouseDown();
+ eventSender.mouseMoveTo(x, y + 50);
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseUp();
+
+ var result = document.getElementById("result");
+ if (window.getSelection() == "world!") {
+ result.style.backgroundColor = "green";
+ result.innerHTML = "PASS";
+ } else
+ result.innerHTML = "FAILED: the selection was " + window.getSelection();
+}
+</script>
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index a4d5ba2..4135f6a 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -669,9 +669,6 @@ http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception.html
# This port doesn't support detecting slow unload handlers.
fast/dom/Window/slow_unload_handler.html
-# <https://bugs.webkit.org/show_bug.cgi?id=29966>
-fast/inline/relative-positioned-overflow.html
-
# <https://bugs.webkit.org/show_bug.cgi?id=30348>
plugins/private-browsing-mode.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7005c37..0c39872 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2009-11-26 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Dan Bernstein.
+
+ Assertion failure in RenderBlock::positionForPointWithInlineChildren when running fast/inline/relative-positioned-overflow.html
+ https://bugs.webkit.org/show_bug.cgi?id=29966
+
+ When an empty inline element is clicked, the root inline box has
+ no leaf children. Use the renderer of a normal child instead.
+
+ This change resolves Windows port's assertion failure in a layout test.
+ Also, this fixes the behavior when a user drags the mouse from an
+ empty inline element to above texts.
+
+ Test: editing/selection/last-empty-inline.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::positionForPointWithInlineChildren):
+
2009-11-26 Kent Tamura <tkent at chromium.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 9d9b70c..2655150 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -3406,7 +3406,7 @@ VisiblePosition RenderBlock::positionForPointWithInlineChildren(const IntPoint&
RootInlineBox* firstRootBoxWithChildren = 0;
RootInlineBox* lastRootBoxWithChildren = 0;
for (RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox()) {
- if (!root->firstChild())
+ if (!root->firstLeafChild())
continue;
if (!firstRootBoxWithChildren)
firstRootBoxWithChildren = root;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list