Changeset 205405 in webkit

Timestamp:

Sep 3, 2016 7:52:33 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Use ASCIILiteral in some more places
​https://bugs.webkit.org/show_bug.cgi?id=161557

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-09-03
Reviewed by Darin Adler.

Source/JavaScriptCore:

• runtime/TypeSet.h:

(JSC::StructureShape::setConstructorName):

Source/WebCore:

• Modules/indexeddb/IDBDatabaseException.cpp:

(WebCore::IDBDatabaseException::getErrorName):
(WebCore::IDBDatabaseException::getErrorDescription):

• Modules/websockets/WebSocket.cpp:

(WebCore::WebSocket::binaryType):

• css/FontFace.cpp:

(WebCore::FontFace::stretch):
(WebCore::FontFace::unicodeRange):
(WebCore::FontFace::featureSettings):

• html/canvas/WebGLRenderingContextBase.cpp:
• html/parser/HTMLPreloadScanner.cpp:

(WebCore::TokenPreloadScanner::initiatorFor):

• loader/FormSubmission.cpp:

(WebCore::FormSubmission::Attributes::parseEncodingType):

• page/SecurityOrigin.cpp:

(WebCore::SecurityOrigin::toRawString):

• platform/graphics/cg/ImageBufferCG.cpp:

(WebCore::CGImageToDataURL):
(WebCore::ImageBuffer::toDataURL):
(WebCore::ImageDataToDataURL):

• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::filenameExtension):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/TypeSet.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/indexeddb/IDBDatabaseException.cpp (modified) (2 diffs)
• WebCore/Modules/websockets/WebSocket.cpp (modified) (1 diff)
• WebCore/css/FontFace.cpp (modified) (3 diffs)
• WebCore/html/canvas/WebGLRenderingContextBase.cpp (modified) (1 diff)
• WebCore/html/parser/HTMLPreloadScanner.cpp (modified) (2 diffs)
• WebCore/loader/FormSubmission.cpp (modified) (1 diff)
• WebCore/page/SecurityOrigin.cpp (modified) (1 diff)
• WebCore/platform/graphics/cg/ImageBufferCG.cpp (modified) (4 diffs)
• WebCore/svg/graphics/SVGImage.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-09-03  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Use ASCIILiteral in some more places
+        https://bugs.webkit.org/show_bug.cgi?id=161557
+
+        Reviewed by Darin Adler.
+
+        * runtime/TypeSet.h:
+        (JSC::StructureShape::setConstructorName):
+
 2016-09-01  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/runtime/TypeSet.h

@@ -63 +63 @@
     String toJSONString() const;
     Ref<Inspector::Protocol::Runtime::StructureDescription> inspectorRepresentation();
-    void setConstructorName(String name) { m_constructorName = (name.isEmpty() ? "Object" : name); }
+    void setConstructorName(String name) { m_constructorName = (name.isEmpty() ? ASCIILiteral("Object") : name); }
     String constructorName() { return m_constructorName; }
     void setProto(PassRefPtr<StructureShape> shape) { m_proto = shape; }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-03  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Use ASCIILiteral in some more places
+        https://bugs.webkit.org/show_bug.cgi?id=161557
+
+        Reviewed by Darin Adler.
+
+        * Modules/indexeddb/IDBDatabaseException.cpp:
+        (WebCore::IDBDatabaseException::getErrorName):
+        (WebCore::IDBDatabaseException::getErrorDescription):
+        * Modules/websockets/WebSocket.cpp:
+        (WebCore::WebSocket::binaryType):
+        * css/FontFace.cpp:
+        (WebCore::FontFace::stretch):
+        (WebCore::FontFace::unicodeRange):
+        (WebCore::FontFace::featureSettings):
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::TokenPreloadScanner::initiatorFor):
+        * loader/FormSubmission.cpp:
+        (WebCore::FormSubmission::Attributes::parseEncodingType):
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::toRawString):
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::CGImageToDataURL):
+        (WebCore::ImageBuffer::toDataURL):
+        (WebCore::ImageDataToDataURL):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::filenameExtension):
+
 2016-09-03  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseException.cpp

@@ -92 +92 @@
     ASSERT(entry);
     if (!entry)
-        return "UnknownError";
+        return ASCIILiteral("UnknownError");
 
     return entry->name;
@@ -102 +102 @@
     ASSERT(entry);
     if (!entry)
-        return "Unknown error.";
+        return ASCIILiteral("Unknown error.");
 
     return entry->description;

trunk/Source/WebCore/Modules/websockets/WebSocket.cpp

@@ -454 +454 @@
     switch (m_binaryType) {
     case BinaryTypeBlob:
-        return "blob";
+        return ASCIILiteral("blob");
     case BinaryTypeArrayBuffer:
-        return "arraybuffer";
+        return ASCIILiteral("arraybuffer");
     }
     ASSERT_NOT_REACHED();

trunk/Source/WebCore/css/FontFace.cpp

@@ -317 +317 @@
 String FontFace::stretch() const
 {
-    return "normal";
+    return ASCIILiteral("normal");
 }
 
@@ -324 +324 @@
     const_cast<CSSFontFace&>(m_backing.get()).updateStyleIfNeeded();
     if (!m_backing->ranges().size())
-        return "U+0-10FFFF";
+        return ASCIILiteral("U+0-10FFFF");
     RefPtr<CSSValueList> values = CSSValueList::createCommaSeparated();
     for (auto& range : m_backing->ranges())
@@ -341 +341 @@
     const_cast<CSSFontFace&>(m_backing.get()).updateStyleIfNeeded();
     if (!m_backing->featureSettings().size())
-        return "normal";
+        return ASCIILiteral("normal");
     RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
     for (auto& feature : m_backing->featureSettings())

trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -4874 +4874 @@
         switch (error) {
         case GraphicsContext3D::INVALID_ENUM:
-            return "INVALID_ENUM";
+            return ASCIILiteral("INVALID_ENUM");
         case GraphicsContext3D::INVALID_VALUE:
-            return "INVALID_VALUE";
+            return ASCIILiteral("INVALID_VALUE");
         case GraphicsContext3D::INVALID_OPERATION:
-            return "INVALID_OPERATION";
+            return ASCIILiteral("INVALID_OPERATION");
         case GraphicsContext3D::OUT_OF_MEMORY:
-            return "OUT_OF_MEMORY";
+            return ASCIILiteral("OUT_OF_MEMORY");
         case GraphicsContext3D::INVALID_FRAMEBUFFER_OPERATION:
-            return "INVALID_FRAMEBUFFER_OPERATION";
+            return ASCIILiteral("INVALID_FRAMEBUFFER_OPERATION");
         case GraphicsContext3D::CONTEXT_LOST_WEBGL:
-            return "CONTEXT_LOST_WEBGL";
+            return ASCIILiteral("CONTEXT_LOST_WEBGL");
         default:
             return String::format("WebGL ERROR(%04x)", error);

trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp

@@ -75 +75 @@
     case TagId::Source:
     case TagId::Img:
-        return "img";
+        return ASCIILiteral("img");
     case TagId::Input:
-        return "input";
+        return ASCIILiteral("input");
     case TagId::Link:
-        return "link";
+        return ASCIILiteral("link");
     case TagId::Script:
-        return "script";
+        return ASCIILiteral("script");
     case TagId::Unknown:
     case TagId::Style:
@@ -89 +89 @@
     case TagId::Picture:
         ASSERT_NOT_REACHED();
-        return "unknown";
+        return ASCIILiteral("unknown");
     }
     ASSERT_NOT_REACHED();
-    return "unknown";
+    return ASCIILiteral("unknown");
 }
 

trunk/Source/WebCore/loader/FormSubmission.cpp

@@ -93 +93 @@
 {
     if (equalLettersIgnoringASCIICase(type, "multipart/form-data"))
-        return "multipart/form-data";
+        return ASCIILiteral("multipart/form-data");
     if (equalLettersIgnoringASCIICase(type, "text/plain"))
-        return "text/plain";
-    return "application/x-www-form-urlencoded";
+        return ASCIILiteral("text/plain");
+    return ASCIILiteral("application/x-www-form-urlencoded");
 }
 

trunk/Source/WebCore/page/SecurityOrigin.cpp

@@ -466 +466 @@
 {
     if (m_protocol == "file")
-        return "file://";
+        return ASCIILiteral("file://");
 
     StringBuilder result;

trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -491 +491 @@
     RetainPtr<CFMutableDataRef> data = adoptCF(CFDataCreateMutable(kCFAllocatorDefault, 0));
     if (!CGImageEncodeToData(image, uti.get(), quality, data.get()))
-        return "data:,";
+        return ASCIILiteral("data:,");
 
     Vector<char> base64Data;
@@ -516 +516 @@
         premultipliedData = getPremultipliedImageData(IntRect(IntPoint(0, 0), logicalSize()));
         if (!premultipliedData)
-            return "data:,";
+            return ASCIILiteral("data:,");
 
         RetainPtr<CGDataProviderRef> dataProvider;
         dataProvider = adoptCF(CGDataProviderCreateWithData(0, premultipliedData->data(), 4 * logicalSize().width() * logicalSize().height(), 0));
         if (!dataProvider)
-            return "data:,";
+            return ASCIILiteral("data:,");
 
         image = adoptCF(CGImageCreate(logicalSize().width(), logicalSize().height(), 8, 32, 4 * logicalSize().width(),
@@ -557 +557 @@
         size_t size = 4 * source.width() * source.height();
         if (!premultipliedData.tryReserveCapacity(size))
-            return "data:,";
+            return ASCIILiteral("data:,");
 
         premultipliedData.resize(size);
@@ -581 +581 @@
     dataProvider = adoptCF(CGDataProviderCreateWithData(0, data, 4 * source.width() * source.height(), 0));
     if (!dataProvider)
-        return "data:,";
+        return ASCIILiteral("data:,");
 
     RetainPtr<CGImageRef> image;

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -423 +423 @@
 String SVGImage::filenameExtension() const
 {
-    return "svg";
+    return ASCIILiteral("svg");
 }