Title: [92535] branches/chromium/835
- Revision
- 92535
- Author
- cev...@google.com
- Date
- 2011-08-05 18:33:44 -0700 (Fri, 05 Aug 2011)
Log Message
Merge 91908
BUG=90668
Modified Paths
Added Paths
Diff
Copied: branches/chromium/835/LayoutTests/editing/text-iterator/find-after-mutation-expected.txt (from rev 91908, trunk/LayoutTests/editing/text-iterator/find-after-mutation-expected.txt) (0 => 92535)
--- branches/chromium/835/LayoutTests/editing/text-iterator/find-after-mutation-expected.txt (rev 0)
+++ branches/chromium/835/LayoutTests/editing/text-iterator/find-after-mutation-expected.txt 2011-08-06 01:33:44 UTC (rev 92535)
@@ -0,0 +1 @@
+PASS - WebKit did not crash
Copied: branches/chromium/835/LayoutTests/editing/text-iterator/find-after-mutation.html (from rev 91908, trunk/LayoutTests/editing/text-iterator/find-after-mutation.html) (0 => 92535)
--- branches/chromium/835/LayoutTests/editing/text-iterator/find-after-mutation.html (rev 0)
+++ branches/chromium/835/LayoutTests/editing/text-iterator/find-after-mutation.html 2011-08-06 01:33:44 UTC (rev 92535)
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+
+function runTest() {
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+ document.body.offsetHeight;
+ document.body.innerHTML = " ";
+ window.find('a');
+
+ document.body.innerHTML = 'PASS - WebKit did not crash';
+}
+</script>
+</head>
+<body _onload_="runTest()">
+a
+</body>
+</html>
Modified: branches/chromium/835/Source/WebCore/editing/TextIterator.cpp (92534 => 92535)
--- branches/chromium/835/Source/WebCore/editing/TextIterator.cpp 2011-08-06 01:31:49 UTC (rev 92534)
+++ branches/chromium/835/Source/WebCore/editing/TextIterator.cpp 2011-08-06 01:33:44 UTC (rev 92535)
@@ -2571,6 +2571,9 @@
PassRefPtr<Range> findPlainText(const Range* range, const String& target, FindOptions options)
{
+ // CharacterIterator requires renderers to be up-to-date
+ range->ownerDocument()->updateLayout();
+
// First, find the text.
size_t matchStart;
size_t matchLength;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
