Title: [163258] trunk/Source
- Revision
- 163258
- Author
- [email protected]
- Date
- 2014-02-01 22:38:18 -0800 (Sat, 01 Feb 2014)
Log Message
More characters -> deprecatedCharacters (based on more EWS complaints)
https://bugs.webkit.org/show_bug.cgi?id=128063
Reviewed by Anders Carlsson.
Source/WebCore:
* editing/SmartReplace.cpp:
(WebCore::addAllCodePoints):
(WebCore::getSmartSet):
* platform/win/WebCoreTextRenderer.cpp:
(WebCore::doDrawTextAtPoint):
Use deprecatedCharacters.
Source/WebKit2:
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
(WebKit::truncateToSingleLine): Use deprecatedCharacters.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163257 => 163258)
--- trunk/Source/WebCore/ChangeLog 2014-02-02 04:59:36 UTC (rev 163257)
+++ trunk/Source/WebCore/ChangeLog 2014-02-02 06:38:18 UTC (rev 163258)
@@ -1,5 +1,19 @@
2014-02-01 Darin Adler <[email protected]>
+ More characters -> deprecatedCharacters (based on more EWS complaints)
+ https://bugs.webkit.org/show_bug.cgi?id=128063
+
+ Reviewed by Anders Carlsson.
+
+ * editing/SmartReplace.cpp:
+ (WebCore::addAllCodePoints):
+ (WebCore::getSmartSet):
+ * platform/win/WebCoreTextRenderer.cpp:
+ (WebCore::doDrawTextAtPoint):
+ Use deprecatedCharacters.
+
+2014-02-01 Darin Adler <[email protected]>
+
Use deprecatedCharacters in a few more places (non-Mac-build sites found by EWS)
https://bugs.webkit.org/show_bug.cgi?id=128042
Modified: trunk/Source/WebCore/editing/SmartReplace.cpp (163257 => 163258)
--- trunk/Source/WebCore/editing/SmartReplace.cpp 2014-02-02 04:59:36 UTC (rev 163257)
+++ trunk/Source/WebCore/editing/SmartReplace.cpp 2014-02-02 06:38:18 UTC (rev 163258)
@@ -40,7 +40,7 @@
static void addAllCodePoints(USet* smartSet, const String& string)
{
- const UChar* characters = string.characters();
+ const UChar* characters = string.deprecatedCharacters();
for (size_t i = 0; i < string.length(); i++)
uset_add(smartSet, characters[i]);
}
@@ -56,7 +56,7 @@
// Whitespace and newline (kCFCharacterSetWhitespaceAndNewline)
UErrorCode ec = U_ZERO_ERROR;
String whitespaceAndNewline = ASCIILiteral("[[:WSpace:] [\\u000A\\u000B\\u000C\\u000D\\u0085]]");
- smartSet = uset_openPattern(whitespaceAndNewline.characters(), whitespaceAndNewline.length(), &ec);
+ smartSet = uset_openPattern(whitespaceAndNewline.deprecatedCharacters(), whitespaceAndNewline.length(), &ec);
ASSERT(U_SUCCESS(ec));
// CJK ranges
@@ -83,7 +83,7 @@
// Punctuation (kCFCharacterSetPunctuation)
UErrorCode ec = U_ZERO_ERROR;
String punctuationClass = ASCIILiteral("[:P:]");
- USet* icuPunct = uset_openPattern(punctuationClass.characters(), punctuationClass.length(), &ec);
+ USet* icuPunct = uset_openPattern(punctuationClass.deprecatedCharacters(), punctuationClass.length(), &ec);
ASSERT(U_SUCCESS(ec));
uset_addAll(smartSet, icuPunct);
uset_close(icuPunct);
Modified: trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp (163257 => 163258)
--- trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp 2014-02-02 04:59:36 UTC (rev 163257)
+++ trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp 2014-02-02 06:38:18 UTC (rev 163258)
@@ -51,7 +51,7 @@
{
FontCachePurgePreventer fontCachePurgePreventer;
- TextRun run(text.characters(), text.length());
+ TextRun run(text.deprecatedCharacters(), text.length());
context.setFillColor(color, ColorSpaceDeviceRGB);
if (isOneLeftToRightRun(run))
@@ -64,12 +64,12 @@
int beforeWidth;
if (underlinedIndex > 0) {
- TextRun beforeRun(text.characters(), underlinedIndex);
+ TextRun beforeRun(text.deprecatedCharacters(), underlinedIndex);
beforeWidth = font.width(beforeRun);
} else
beforeWidth = 0;
- TextRun underlinedRun(text.characters() + underlinedIndex, 1);
+ TextRun underlinedRun(text.deprecatedCharacters() + underlinedIndex, 1);
int underlinedWidth = font.width(underlinedRun);
IntPoint underlinePoint(point);
Modified: trunk/Source/WebKit2/ChangeLog (163257 => 163258)
--- trunk/Source/WebKit2/ChangeLog 2014-02-02 04:59:36 UTC (rev 163257)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-02 06:38:18 UTC (rev 163258)
@@ -1,3 +1,13 @@
+2014-02-01 Darin Adler <[email protected]>
+
+ More characters -> deprecatedCharacters (based on more EWS complaints)
+ https://bugs.webkit.org/show_bug.cgi?id=128063
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+ (WebKit::truncateToSingleLine): Use deprecatedCharacters.
+
2014-02-01 Enrica Casucci <[email protected]>
Speculative OSX build fix.
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (163257 => 163258)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2014-02-02 04:59:36 UTC (rev 163257)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2014-02-02 06:38:18 UTC (rev 163258)
@@ -165,7 +165,7 @@
String stringBuffer(StringImpl::createUninitialized(oldLength + 1, buffer));
unsigned newLength = 0;
- const UChar* start = string.characters();
+ const UChar* start = string.deprecatedCharacters();
for (const UChar* c = start; c < start + oldLength; ++c) {
if (*c != UChar('\n'))
buffer[newLength++] = *c;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
