Changeset 163258 in webkit

Timestamp:

Feb 1, 2014 10:38:18 PM (10 years ago)

Author:

Darin Adler

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.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/SmartReplace.cpp (modified) (3 diffs)
• WebCore/platform/win/WebCoreTextRenderer.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-01  Darin Adler  <darin@apple.com>
+
+        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  <darin@apple.com>
 

trunk/Source/WebCore/editing/SmartReplace.cpp

@@ -41 +41 @@
 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]);
@@ -57 +57 @@
         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));
 
@@ -84 +84 @@
             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);

trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp

@@ -52 +52 @@
     FontCachePurgePreventer fontCachePurgePreventer;
 
-    TextRun run(text.characters(), text.length());
+    TextRun run(text.deprecatedCharacters(), text.length());
 
     context.setFillColor(color, ColorSpaceDeviceRGB);
@@ -65 +65 @@
         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);
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-01  Darin Adler  <darin@apple.com>
+
+        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  <enrica@apple.com>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp

@@ -166 +166 @@
 
     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'))