Changeset 160572 in webkit

Timestamp:

Dec 13, 2013 3:59:14 PM (10 years ago)

Author:

weinig@apple.com

Message:

[WK2] Start removing calls to String::characters()
​https://bugs.webkit.org/show_bug.cgi?id=125699

Reviewed by Anders Carlsson.

• Shared/mac/WebCoreArgumentCodersMac.mm:

(CoreIPC::::decodePlatformData):

• UIProcess/Plugins/PluginInfoStore.cpp:

(WebKit::PluginInfoStore::defaultLoadPolicyForPlugin):
(WebKit::PluginInfoStore::findPlugin):

• UIProcess/Plugins/PluginInfoStore.h:
• UIProcess/Plugins/mac/PluginInfoStoreMac.mm:

(WebKit::PluginInfoStore::pluginsDirectories):
(WebKit::PluginInfoStore::pluginPathsInDirectory):

• UIProcess/cf/WebPreferencesCF.cpp:

(WebKit::makeKey):

• WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:

(WebKit::InjectedBundle::load):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::loadStringImpl):
(WebKit::WebPage::loadHTMLString):
(WebKit::WebPage::loadAlternateHTMLString):
(WebKit::WebPage::loadPlainTextString):
(WebKit::WebPage::loadWebArchiveData):

• WebProcess/WebPage/WebPage.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/mac/WebCoreArgumentCodersMac.mm (modified) (2 diffs)
• UIProcess/Plugins/PluginInfoStore.cpp (modified) (2 diffs)
• UIProcess/Plugins/PluginInfoStore.h (modified) (1 diff)
• UIProcess/Plugins/mac/PluginInfoStoreMac.mm (modified) (3 diffs)
• UIProcess/cf/WebPreferencesCF.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-13  Sam Weinig  <sam@webkit.org>
+
+        [WK2] Start removing calls to String::characters()
+        https://bugs.webkit.org/show_bug.cgi?id=125699
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/mac/WebCoreArgumentCodersMac.mm:
+        (CoreIPC::::decodePlatformData):
+        * UIProcess/Plugins/PluginInfoStore.cpp:
+        (WebKit::PluginInfoStore::defaultLoadPolicyForPlugin):
+        (WebKit::PluginInfoStore::findPlugin):
+        * UIProcess/Plugins/PluginInfoStore.h:
+        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+        (WebKit::PluginInfoStore::pluginsDirectories):
+        (WebKit::PluginInfoStore::pluginPathsInDirectory):
+        * UIProcess/cf/WebPreferencesCF.cpp:
+        (WebKit::makeKey):
+        * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WebKit::InjectedBundle::load):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::loadStringImpl):
+        (WebKit::WebPage::loadHTMLString):
+        (WebKit::WebPage::loadAlternateHTMLString):
+        (WebKit::WebPage::loadPlainTextString):
+        (WebKit::WebPage::loadWebArchiveData):
+        * WebProcess/WebPage/WebPage.h:
+
 2013-12-13  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm

@@ -165 +165 @@
 }
 
-static NSString* nsString(const String& string)
-{
-    return string.impl() ? [NSString stringWithCharacters:reinterpret_cast<const UniChar*>(string.characters()) length:string.length()] : @"";
-}
-
 void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
 {
@@ -242 +237 @@
     }
 
-    RetainPtr<NSError> nsError = adoptNS([[NSError alloc] initWithDomain:nsString(domain) code:code userInfo:(NSDictionary *)userInfo.get()]);
+    RetainPtr<NSError> nsError = adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:(NSDictionary *)userInfo.get()]);
 
     resourceError = ResourceError(nsError.get());

trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

@@ -177 +177 @@
     return PluginModuleLoadNormally;
 }
-
-String PluginInfoStore::getMIMETypeForExtension(const String& extension)
-{
-    return MIMETypeRegistry::getMIMETypeForExtension(extension);
-}
     
 PluginModuleInfo PluginInfoStore::findPluginWithBundleIdentifier(const String&)
@@ -210 +205 @@
         
         // Finally, try to get the MIME type from the extension in a platform specific manner and use that.
-        String extensionMimeType = getMIMETypeForExtension(extension);
+        String extensionMimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
         if (!extensionMimeType.isNull()) {
             PluginModuleInfo plugin = findPluginForMIMEType(extensionMimeType, allowedPluginTypes);

trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h

@@ -101 +101 @@
     static bool shouldUsePlugin(Vector<PluginModuleInfo>& alreadyLoadedPlugins, const PluginModuleInfo&);
 
-    // Get the MIME type for the given extension.
-    static String getMIMETypeForExtension(const String& extension);
-
     Vector<String> m_additionalPluginsDirectories;
     Vector<PluginModuleInfo> m_plugins;

trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm

@@ -48 +48 @@
     return pluginsDirectories;
 }
-
-// FIXME: Once the UI process knows the difference between the main thread and the web thread we can drop this and just use
-// String::createCFString.
-static CFStringRef safeCreateCFString(const String& string)
-{
-    return CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(string.characters()), string.length());
-}
     
 Vector<String> PluginInfoStore::pluginPathsInDirectory(const String& directory)
@@ -60 +53 @@
     Vector<String> pluginPaths;
 
-    RetainPtr<CFStringRef> directoryCFString = adoptCF(safeCreateCFString(directory));
-    
+    RetainPtr<CFStringRef> directoryCFString = directory.createCFString();
     NSArray *filenames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:(NSString *)directoryCFString.get() error:nil];
     for (NSString *filename in filenames)
@@ -114 +106 @@
 }
 
-String PluginInfoStore::getMIMETypeForExtension(const String& extension)
-{
-    // FIXME: This should just call MIMETypeRegistry::getMIMETypeForExtension and be
-    // strength reduced into the callsite once we can safely convert String
-    // to CFStringRef off the main thread.
-
-    RetainPtr<CFStringRef> extensionCFString = adoptCF(safeCreateCFString(extension));
-    return WKGetMIMETypeForExtension((NSString *)extensionCFString.get());
-}
-
 PluginModuleInfo PluginInfoStore::findPluginWithBundleIdentifier(const String& bundleIdentifier)
 {

trunk/Source/WebKit2/UIProcess/cf/WebPreferencesCF.cpp

@@ -34 +34 @@
 namespace WebKit {
 
-static RetainPtr<CFStringRef> cfStringFromWebCoreString(const String& string)
-{
-    return RetainPtr<CFStringRef> = adoptCF(CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(string.characters()), string.length()));
-}
-
 static inline RetainPtr<CFStringRef> makeKey(const String& identifier, const String& baseKey)
 {
-    return cfStringFromWebCoreString(makeString(identifier, ".WebKit2", baseKey));
+    return makeString(identifier, ".WebKit2", baseKey).createCFString();
 }
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm

@@ -56 +56 @@
     }
     
-    RetainPtr<CFStringRef> injectedBundlePathStr = adoptCF(CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(m_path.characters()), m_path.length()));
+    RetainPtr<CFStringRef> injectedBundlePathStr = m_path.createCFString();
     if (!injectedBundlePathStr) {
         WTFLogAlways("InjectedBundle::load failed - Could not create the path string.\n");

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -918 +918 @@
 }
 
+void WebPage::loadString(const String& htmlString, const String& MIMEType, const URL& baseURL, const URL& unreachableURL, CoreIPC::MessageDecoder& decoder)
+{
+    if (htmlString.is8Bit()) {
+        RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters8()), htmlString.length() * sizeof(LChar));
+        loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("utf-8"), baseURL, unreachableURL, decoder);
+    } else {
+        RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters16()), htmlString.length() * sizeof(UChar));
+        loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("utf-16"), baseURL, unreachableURL, decoder);
+    }
+}
+
 void WebPage::loadData(const CoreIPC::DataReference& data, const String& MIMEType, const String& encodingName, const String& baseURLString, CoreIPC::MessageDecoder& decoder)
 {
@@ -927 +938 @@
 void WebPage::loadHTMLString(const String& htmlString, const String& baseURLString, CoreIPC::MessageDecoder& decoder)
 {
-    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters()), htmlString.length() * sizeof(UChar));
     URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
-    loadDataImpl(sharedBuffer, "text/html", "utf-16", baseURL, URL(), decoder);
+    loadString(htmlString, ASCIILiteral("text/html"), baseURL, URL(), decoder);
 }
 
 void WebPage::loadAlternateHTMLString(const String& htmlString, const String& baseURLString, const String& unreachableURLString, CoreIPC::MessageDecoder& decoder)
 {
-    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters()), htmlString.length() * sizeof(UChar));
     URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
     URL unreachableURL = unreachableURLString.isEmpty() ? URL() : URL(URL(), unreachableURLString);
-    loadDataImpl(sharedBuffer, "text/html", "utf-16", baseURL, unreachableURL, decoder);
+    loadString(htmlString, ASCIILiteral("text/html"), baseURL, unreachableURL, decoder);
 }
 
 void WebPage::loadPlainTextString(const String& string, CoreIPC::MessageDecoder& decoder)
 {
-    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(string.characters()), string.length() * sizeof(UChar));
-    loadDataImpl(sharedBuffer, "text/plain", "utf-16", blankURL(), URL(), decoder);
+    loadString(string, ASCIILiteral("text/plain"), blankURL(), URL(), decoder);
 }
 
@@ -949 +957 @@
 {
     RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(webArchiveData.data()), webArchiveData.size() * sizeof(uint8_t));
-    loadDataImpl(sharedBuffer, "application/x-webarchive", "utf-16", blankURL(), URL(), decoder);
+    loadDataImpl(sharedBuffer, ASCIILiteral("application/x-webarchive"), ASCIILiteral("utf-16"), blankURL(), URL(), decoder);
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -701 +701 @@
 
     void loadDataImpl(PassRefPtr<WebCore::SharedBuffer>, const String& MIMEType, const String& encodingName, const WebCore::URL& baseURL, const WebCore::URL& failingURL, CoreIPC::MessageDecoder&);
+    void loadString(const String&, const String& MIMEType, const WebCore::URL& baseURL, const WebCore::URL& failingURL, CoreIPC::MessageDecoder&);
 
     bool platformHasLocalDataForURL(const WebCore::URL&);