[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
tkent at chromium.org
tkent at chromium.org
Mon Feb 21 00:29:55 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 72db5ab91c06cf03449b24f6c8976274ceae4813
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 1 08:05:08 2011 +0000
REGRESSION (r65062): Safari loops forever under WebCore::plainTextToMallocAllocatedBuffer()
https://bugs.webkit.org/show_bug.cgi?id=53272
Reviewed by Dan Bernstein.
Source/WebCore:
* editing/TextIterator.cpp:
(WebCore::TextIterator::handleTextBox): Pass the appropriate renderer to emitText().
LayoutTests:
* fast/dom/inner-text-first-letter.html:
- Add a new test case reproducing the bug.
- Remove unnecessary text output.
* fast/dom/inner-text-first-letter-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77224 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2b4d387..37d58ab 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by Dan Bernstein.
+
+ REGRESSION (r65062): Safari loops forever under WebCore::plainTextToMallocAllocatedBuffer()
+ https://bugs.webkit.org/show_bug.cgi?id=53272
+
+ * fast/dom/inner-text-first-letter.html:
+ - Add a new test case reproducing the bug.
+ - Remove unnecessary text output.
+ * fast/dom/inner-text-first-letter-expected.txt:
+
2011-01-31 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed Chromium test expectation updates.
diff --git a/LayoutTests/fast/dom/inner-text-first-letter-expected.txt b/LayoutTests/fast/dom/inner-text-first-letter-expected.txt
index b7db292..1e7aceb 100644
--- a/LayoutTests/fast/dom/inner-text-first-letter-expected.txt
+++ b/LayoutTests/fast/dom/inner-text-first-letter-expected.txt
@@ -20,50 +20,8 @@ PASS document.getElementById('divSpanFirst').innerText is document.getElementByI
PASS document.getElementById('invisiblePre').innerText is ''
PASS document.getElementById('invisiblePreFirst').innerText is 't\n'
PASS document.getElementById('invisible').innerText is 'test\n'
+PASS document.getElementById('floatDt').innerText is 'Ab Cd E'
PASS successfullyParsed is true
TEST COMPLETE
-div
-div
-pre
-pre
-abc
-abc
- abc
- abc
-test
- abc
-test
- abc
-test
-abc
-test
-abc
-test
-test
-
-test
-
-test
-foo
-abc
-foo
-abc
-abc
-def
-abc
-def
-foo
-abc
-foo
-abc
-foo
-| abc
-foo
-| abc
-12
-12
-t
-test
-Results
diff --git a/LayoutTests/fast/dom/inner-text-first-letter.html b/LayoutTests/fast/dom/inner-text-first-letter.html
index 8689243..af38db5 100644
--- a/LayoutTests/fast/dom/inner-text-first-letter.html
+++ b/LayoutTests/fast/dom/inner-text-first-letter.html
@@ -19,11 +19,18 @@
.preWrap {
white-space: pre-wrap;
}
+.left {
+ float: left;
+}
+.left:first-letter {
+ text-transform: capitalize;
+}
</style>
</head>
<body>
<p id="description"></p>
<div id="console"></div>
+<div id="tests">
<div id="divFirst" class="first">div</div>
<div id="divNormal">div</div>
<pre id="pFirst" class="first">pre</pre>
@@ -63,7 +70,9 @@ abc</div></div>
<pre>
Results
</pre>
+<div id="floatDt"><dl><dt class=left> ab<dt class=left> cd<dt class=left> e</dl></div>
</div>
+
<script>
description("This tests a letter with :first-letter applied is present in innerText.");
shouldBe("document.getElementById('divFirst').innerText", "document.getElementById('divNormal').innerText");
@@ -83,6 +92,9 @@ shouldBe("document.getElementById('divSpanFirst').innerText", "document.getEleme
shouldBe("document.getElementById('invisiblePre').innerText", "''");
shouldBe("document.getElementById('invisiblePreFirst').innerText", "'t\\n'");
shouldBe("document.getElementById('invisible').innerText", "'test\\n'");
+shouldBe("document.getElementById('floatDt').innerText", "'Ab Cd E'");
+document.getElementById('tests').innerHTML = "";
+
var successfullyParsed = true;
</script>
<script src="../js/resources/js-test-post.js"></script>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e6eafcf..4ef2de8 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-01 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by Dan Bernstein.
+
+ REGRESSION (r65062): Safari loops forever under WebCore::plainTextToMallocAllocatedBuffer()
+ https://bugs.webkit.org/show_bug.cgi?id=53272
+
+ * editing/TextIterator.cpp:
+ (WebCore::TextIterator::handleTextBox): Pass the appropriate renderer to emitText().
+
2011-01-31 Alexey Proskuryakov <ap at apple.com>
Reviewed by Maciej Stachowiak.
diff --git a/Source/WebCore/editing/TextIterator.cpp b/Source/WebCore/editing/TextIterator.cpp
index 433fa19..1d2219a 100644
--- a/Source/WebCore/editing/TextIterator.cpp
+++ b/Source/WebCore/editing/TextIterator.cpp
@@ -551,7 +551,7 @@ void TextIterator::handleTextBox()
unsigned spaceRunStart = runStart - 1;
while (spaceRunStart > 0 && str[spaceRunStart - 1] == ' ')
--spaceRunStart;
- emitText(m_node, spaceRunStart, spaceRunStart + 1);
+ emitText(m_node, renderer, spaceRunStart, spaceRunStart + 1);
} else
emitCharacter(' ', m_node, 0, runStart, runStart);
return;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list