Title: [171266] branches/safari-537.78-branch/Source/WebCore
- Revision
- 171266
- Author
- [email protected]
- Date
- 2014-07-19 15:48:42 -0700 (Sat, 19 Jul 2014)
Log Message
Merged r169726. <rdar://problem/17684616>
Modified Paths
Diff
Modified: branches/safari-537.78-branch/Source/WebCore/ChangeLog (171265 => 171266)
--- branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-19 20:15:14 UTC (rev 171265)
+++ branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-19 22:48:42 UTC (rev 171266)
@@ -1,3 +1,17 @@
+2014-07-19 Lucas Forschler <[email protected]>
+
+ Merge r169726
+
+ 2014-06-09 Alexey Proskuryakov <[email protected]>
+
+ Properly reset UStringSearch object in SearchBuffer constructor.
+ https://bugs.webkit.org/show_bug.cgi?id=133662
+ <rdar://problem/17240136>
+
+ Reviewed by Tim Horton.
+
+ * editing/TextIterator.cpp: (WebCore::SearchBuffer::~SearchBuffer):
+
2014-07-18 Dana Burkart <[email protected]>
Merge r169318
Modified: branches/safari-537.78-branch/Source/WebCore/editing/TextIterator.cpp (171265 => 171266)
--- branches/safari-537.78-branch/Source/WebCore/editing/TextIterator.cpp 2014-07-19 20:15:14 UTC (rev 171265)
+++ branches/safari-537.78-branch/Source/WebCore/editing/TextIterator.cpp 2014-07-19 22:48:42 UTC (rev 171266)
@@ -2016,6 +2016,8 @@
UErrorCode status = U_ZERO_ERROR;
usearch_setPattern(WebCore::searcher(), &newlineCharacter, 1, &status);
ASSERT(status == U_ZERO_ERROR);
+ usearch_setText(WebCore::searcher(), &newlineCharacter, 1, &status);
+ ASSERT(status == U_ZERO_ERROR);
unlockSearcher();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
