Remove WTF:: prefix from types in messages.in files.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Dec 2013 19:37:35 +0000 (19:37 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Dec 2013 19:37:35 +0000 (19:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=124578

Patch by Tamas Gergely <tgergely.u-szeged@partner.samsung.com> on 2013-12-03
Reviewed by Anders Carlsson.

The WTF:: prefixes are removed from the messages.in files, and the
messages.py now handles unprefixed non-template WTF classes (only
the WTF::String class is used currently). Tests are also updated.

* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* NetworkProcess/NetworkProcess.messages.in:
* PluginProcess/PluginControllerProxy.messages.in:
* PluginProcess/PluginProcess.messages.in:
* Scripts/webkit2/messages.py:
(forward_declarations_and_headers):
(class_template_headers):
(argument_coder_headers_for_type):
* Scripts/webkit2/messages_unittest.py:
(std):
* Shared/Network/CustomProtocols/CustomProtocolManager.messages.in:
* UIProcess/Downloads/DownloadProxy.messages.in:
* UIProcess/Plugins/PluginProcessProxy.messages.in:
* UIProcess/Storage/StorageManager.messages.in:
* UIProcess/WebContext.messages.in:
* UIProcess/WebCookieManagerProxy.messages.in:
* UIProcess/WebDatabaseManagerProxy.messages.in:
* UIProcess/WebIconDatabase.messages.in:
* UIProcess/WebInspectorProxy.messages.in:
* UIProcess/WebMediaCacheManagerProxy.messages.in:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebProcessProxy.messages.in:
* WebProcess/Cookies/WebCookieManager.messages.in:
* WebProcess/Geolocation/WebGeolocationManager.messages.in:
* WebProcess/MediaCache/WebMediaCacheManager.messages.in:
* WebProcess/Notifications/WebNotificationManager.messages.in:
* WebProcess/Plugins/PluginProcessConnection.messages.in:
* WebProcess/Plugins/PluginProxy.messages.in:
* WebProcess/Storage/StorageAreaMap.messages.in:
* WebProcess/WebCoreSupport/WebDatabaseManager.messages.in:
* WebProcess/WebPage/WebInspector.messages.in:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebProcess.messages.in:
* WebProcess/soup/WebSoupRequestManager.messages.in:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@160022 268f45cc-cd09-0410-ab3c-d52691b4dbfc

32 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in
Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in
Source/WebKit2/NetworkProcess/NetworkProcess.messages.in
Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in
Source/WebKit2/PluginProcess/PluginProcess.messages.in
Source/WebKit2/Scripts/webkit2/messages.py
Source/WebKit2/Scripts/webkit2/messages_unittest.py
Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in
Source/WebKit2/UIProcess/Downloads/DownloadProxy.messages.in
Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in
Source/WebKit2/UIProcess/Storage/StorageManager.messages.in
Source/WebKit2/UIProcess/WebContext.messages.in
Source/WebKit2/UIProcess/WebCookieManagerProxy.messages.in
Source/WebKit2/UIProcess/WebDatabaseManagerProxy.messages.in
Source/WebKit2/UIProcess/WebIconDatabase.messages.in
Source/WebKit2/UIProcess/WebInspectorProxy.messages.in
Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.messages.in
Source/WebKit2/UIProcess/WebPageProxy.messages.in
Source/WebKit2/UIProcess/WebProcessProxy.messages.in
Source/WebKit2/WebProcess/Cookies/WebCookieManager.messages.in
Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.messages.in
Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.messages.in
Source/WebKit2/WebProcess/Notifications/WebNotificationManager.messages.in
Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.messages.in
Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in
Source/WebKit2/WebProcess/Storage/StorageAreaMap.messages.in
Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.messages.in
Source/WebKit2/WebProcess/WebPage/WebInspector.messages.in
Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
Source/WebKit2/WebProcess/WebProcess.messages.in
Source/WebKit2/WebProcess/soup/WebSoupRequestManager.messages.in

index 23bf3d7..19c0734 100644 (file)
@@ -1,3 +1,50 @@
+2013-12-03  Tamas Gergely  <tgergely.u-szeged@partner.samsung.com>
+
+        Remove WTF:: prefix from types in messages.in files.
+        https://bugs.webkit.org/show_bug.cgi?id=124578
+
+        Reviewed by Anders Carlsson.
+
+        The WTF:: prefixes are removed from the messages.in files, and the
+        messages.py now handles unprefixed non-template WTF classes (only
+        the WTF::String class is used currently). Tests are also updated.
+
+        * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
+        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+        * NetworkProcess/NetworkProcess.messages.in:
+        * PluginProcess/PluginControllerProxy.messages.in:
+        * PluginProcess/PluginProcess.messages.in:
+        * Scripts/webkit2/messages.py:
+        (forward_declarations_and_headers):
+        (class_template_headers):
+        (argument_coder_headers_for_type):
+        * Scripts/webkit2/messages_unittest.py:
+        (std):
+        * Shared/Network/CustomProtocols/CustomProtocolManager.messages.in:
+        * UIProcess/Downloads/DownloadProxy.messages.in:
+        * UIProcess/Plugins/PluginProcessProxy.messages.in:
+        * UIProcess/Storage/StorageManager.messages.in:
+        * UIProcess/WebContext.messages.in:
+        * UIProcess/WebCookieManagerProxy.messages.in:
+        * UIProcess/WebDatabaseManagerProxy.messages.in:
+        * UIProcess/WebIconDatabase.messages.in:
+        * UIProcess/WebInspectorProxy.messages.in:
+        * UIProcess/WebMediaCacheManagerProxy.messages.in:
+        * UIProcess/WebPageProxy.messages.in:
+        * UIProcess/WebProcessProxy.messages.in:
+        * WebProcess/Cookies/WebCookieManager.messages.in:
+        * WebProcess/Geolocation/WebGeolocationManager.messages.in:
+        * WebProcess/MediaCache/WebMediaCacheManager.messages.in:
+        * WebProcess/Notifications/WebNotificationManager.messages.in:
+        * WebProcess/Plugins/PluginProcessConnection.messages.in:
+        * WebProcess/Plugins/PluginProxy.messages.in:
+        * WebProcess/Storage/StorageAreaMap.messages.in:
+        * WebProcess/WebCoreSupport/WebDatabaseManager.messages.in:
+        * WebProcess/WebPage/WebInspector.messages.in:
+        * WebProcess/WebPage/WebPage.messages.in:
+        * WebProcess/WebProcess.messages.in:
+        * WebProcess/soup/WebSoupRequestManager.messages.in:
+
 2013-12-03  Anders Carlsson  <andersca@apple.com>
 
         Tweak build fixes.
index 4832f38..91dbb44 100644 (file)
@@ -23,7 +23,7 @@
 #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
 
 messages -> DatabaseProcessIDBConnection LegacyReceiver {
-    EstablishConnection(WTF::String databaseName, WebKit::SecurityOriginData openingOrigin, WebKit::SecurityOriginData mainFrameOrigin)
+    EstablishConnection(String databaseName, WebKit::SecurityOriginData openingOrigin, WebKit::SecurityOriginData mainFrameOrigin)
     GetOrEstablishIDBDatabaseMetadata(uint64_t requestID)
 }
 
index b2ce1be..7e89035 100644 (file)
@@ -35,12 +35,12 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver {
     StartDownload(bool privateBrowsingEnabled, uint64_t downloadID, WebCore::ResourceRequest request)
     ConvertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, WebCore::ResourceRequest request, WebCore::ResourceResponse response)
 
-    CookiesForDOM(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url) -> (WTF::String result)
-    SetCookiesFromDOM(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url, WTF::String cookieString)
+    CookiesForDOM(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url) -> (String result)
+    SetCookiesFromDOM(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url, String cookieString)
     CookiesEnabled(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url) -> (bool enabled)
-    CookieRequestHeaderFieldValue(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url) -> (WTF::String result)
+    CookieRequestHeaderFieldValue(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url) -> (String result)
     GetRawCookies(bool privateBrowsingEnabled, WebCore::URL firstParty, WebCore::URL url) -> (Vector<WebCore::Cookie> cookies)
-    DeleteCookie(bool privateBrowsingEnabled, WebCore::URL url, WTF::String cookieName)
+    DeleteCookie(bool privateBrowsingEnabled, WebCore::URL url, String cookieName)
 
     RegisterBlobURL(WebCore::URL url, WebKit::BlobRegistrationData data)
     RegisterBlobURLFromURL(WebCore::URL url, WebCore::URL srcURL)
index f964a7f..12c7275 100644 (file)
@@ -39,7 +39,7 @@ messages -> NetworkProcess LegacyReceiver {
     SetProcessSuppressionEnabled(bool flag)
 #endif
 
-    AllowSpecificHTTPSCertificateForHost(WebKit::CertificateInfo certificate, WTF::String host)
+    AllowSpecificHTTPSCertificateForHost(WebKit::CertificateInfo certificate, String host)
     
     GetNetworkProcessStatistics(uint64_t callbackID)
     
index 5c90876..dd763e0 100644 (file)
@@ -33,10 +33,10 @@ messages -> PluginControllerProxy LegacyReceiver {
     FrameDidFail(uint64_t requestID, bool wasCancelled)
 
     # Sent when JavaScript that the plug-in asked to be evaluated has been evaluated.
-    DidEvaluateJavaScript(uint64_t requestID, WTF::String result)
+    DidEvaluateJavaScript(uint64_t requestID, String result)
 
     # Sent when the plug-in receives a response for a stream.
-    StreamDidReceiveResponse(uint64_t streamID, WTF::String responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, WTF::String mimeType, WTF::String headers)
+    StreamDidReceiveResponse(uint64_t streamID, String responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, String mimeType, String headers)
 
     # Sent when the plug-in receives data for a stream.
     StreamDidReceiveData(uint64_t streamID, CoreIPC::DataReference data)
@@ -48,7 +48,7 @@ messages -> PluginControllerProxy LegacyReceiver {
     StreamDidFail(uint64_t streamID, bool wasCancelled)
 
     # Sent when the plug-in receives a response for the manual stream.
-    ManualStreamDidReceiveResponse(WTF::String responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, WTF::String mimeType, WTF::String headers)
+    ManualStreamDidReceiveResponse(String responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, String mimeType, String headers)
 
     # Sent when the plug-in receives data for the manual stream.
     ManualStreamDidReceiveData(CoreIPC::DataReference data)
@@ -75,10 +75,10 @@ messages -> PluginControllerProxy LegacyReceiver {
     HandleKeyboardEvent(WebKit::WebKeyboardEvent keyboardEvent) -> (bool handled)
     
     # Sent when an editing command should be processed.
-    HandleEditingCommand(WTF::String commandName, WTF::String argument) -> (bool handled);
+    HandleEditingCommand(String commandName, String argument) -> (bool handled);
     
     # Return whether or not a plugin wants to enable the given editing command.
-    IsEditingCommandEnabled(WTF::String commandName) -> (bool enabled);
+    IsEditingCommandEnabled(String commandName) -> (bool enabled);
     
     # Return whether or not a plugin wants to handle page scale factor itself.
     HandlesPageScaleFactor() -> (bool enabled);
@@ -97,7 +97,7 @@ messages -> PluginControllerProxy LegacyReceiver {
 
 #if PLATFORM(MAC)
     # Send the complex text input to the plug-in.
-    SendComplexTextInput(WTF::String textInput)
+    SendComplexTextInput(String textInput)
 
     # Sent when the containing NSWindow's focus changes
     WindowFocusChanged(bool hasFocus)
@@ -125,7 +125,7 @@ messages -> PluginControllerProxy LegacyReceiver {
     PrivateBrowsingStateChanged(bool isPrivateBrowsingEnabled)
 
     # Gets the string representating the form value of the plug-in
-    GetFormValue() -> (bool returnValue, WTF::String formValue)
+    GetFormValue() -> (bool returnValue, String formValue)
 }
 
 #endif
index d1199db..d382156 100644 (file)
@@ -37,7 +37,7 @@ messages -> PluginProcess LegacyReceiver {
 
     # Asks the plug-in to clear data for the given sites. The plug-in process sends back
     # a DidClearSiteData message when done.
-    ClearSiteData(Vector<WTF::String> sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
+    ClearSiteData(Vector<String> sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
 
 #if PLATFORM(MAC)
     SetProcessSuppressionEnabled(bool flag);
index f6d23e7..64f19ac 100644 (file)
@@ -244,6 +244,10 @@ def forward_declarations_and_headers(receiver):
         '"StringReference.h"',
     ])
 
+    non_template_wtf_types = frozenset([
+        'String',
+    ])
+
     for message in receiver.messages:
         if message.reply_parameters != None and message.has_attribute(DELAYED_ATTRIBUTE):
             headers.add('<wtf/ThreadSafeRefCounted.h>')
@@ -259,6 +263,10 @@ def forward_declarations_and_headers(receiver):
 
         split = type.split('::')
 
+        # Handle WTF types even if the WTF:: prefix is not given
+        if split[0] in non_template_wtf_types:
+            split.insert(0, 'WTF')
+
         if len(split) == 2:
             namespace = split[0]
             inner_type = split[1]
@@ -389,7 +397,7 @@ def argument_coder_headers_for_type(type):
     header_infos_and_types = class_template_headers(type)
 
     special_cases = {
-        'WTF::String': '"ArgumentCoders.h"',
+        'String': '"ArgumentCoders.h"',
         'WebKit::InjectedBundleUserMessageEncoder': '"InjectedBundleUserMessageCoders.h"',
         'WebKit::WebContextUserMessageEncoder': '"WebContextUserMessageCoders.h"',
     }
@@ -415,7 +423,7 @@ def headers_for_type(type):
     header_infos_and_types = class_template_headers(type)
 
     special_cases = {
-        'WTF::String': ['<wtf/text/WTFString.h>'],
+        'String': ['<wtf/text/WTFString.h>'],
         'WebCore::CompositionUnderline': ['<WebCore/Editor.h>'],
         'WebCore::GrammarDetail': ['<WebCore/TextCheckerClient.h>'],
         'WebCore::GraphicsLayerAnimations': ['<WebCore/GraphicsLayerAnimation.h>'],
index a0dd480..d80e168 100644 (file)
@@ -52,16 +52,16 @@ _messages_file_contents = """# Copyright (C) 2010 Apple Inc. All rights reserved
 #if NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND
 
 messages -> WebPage LegacyReceiver {
-    LoadURL(WTF::String url)
+    LoadURL(String url)
 #if ENABLE(TOUCH_EVENTS)
-    LoadSomething(WTF::String url)
+    LoadSomething(String url)
 #if NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION
     TouchEvent(WebKit::WebTouchEvent event)
 #endif
 #if NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION
     AddEvent(WebKit::WebTouchEvent event)
 #endif
-    LoadSomethingElse(WTF::String url)
+    LoadSomethingElse(String url)
 #endif
     DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction)
     Close()
@@ -71,9 +71,9 @@ messages -> WebPage LegacyReceiver {
     SendInts(Vector<uint64_t> ints, Vector<Vector<uint64_t>> intVectors)
 
     CreatePlugin(uint64_t pluginInstanceID, WebKit::Plugin::Parameters parameters) -> (bool result)
-    RunJavaScriptAlert(uint64_t frameID, WTF::String message) -> ()
+    RunJavaScriptAlert(uint64_t frameID, String message) -> ()
     GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins)
-    GetPluginProcessConnection(WTF::String pluginPath) -> (CoreIPC::Connection::Handle connectionHandle) Delayed
+    GetPluginProcessConnection(String pluginPath) -> (CoreIPC::Connection::Handle connectionHandle) Delayed
 
     TestMultipleAttributes() -> () WantsConnection Delayed
 
@@ -110,14 +110,14 @@ _expected_results = {
         {
             'name': 'LoadURL',
             'parameters': (
-                ('WTF::String', 'url'),
+                ('String', 'url'),
             ),
             'conditions': (None),
         },
         {
             'name': 'LoadSomething',
             'parameters': (
-                ('WTF::String', 'url'),
+                ('String', 'url'),
             ),
             'conditions': ('ENABLE(TOUCH_EVENTS)'),
         },
@@ -138,7 +138,7 @@ _expected_results = {
         {
             'name': 'LoadSomethingElse',
             'parameters': (
-                ('WTF::String', 'url'),
+                ('String', 'url'),
             ),
             'conditions': ('ENABLE(TOUCH_EVENTS)'),
         },
@@ -194,7 +194,7 @@ _expected_results = {
             'name': 'RunJavaScriptAlert',
             'parameters': (
                 ('uint64_t', 'frameID'),
-                ('WTF::String', 'message')
+                ('String', 'message')
             ),
             'reply_parameters': (),
             'conditions': (None),
@@ -212,7 +212,7 @@ _expected_results = {
         {
             'name': 'GetPluginProcessConnection',
             'parameters': (
-                ('WTF::String', 'pluginPath'),
+                ('String', 'pluginPath'),
             ),
             'reply_parameters': (
                 ('CoreIPC::Connection::Handle', 'connectionHandle'),
@@ -353,6 +353,7 @@ _expected_header = """/*
 #include <wtf/HashMap.h>
 #include <wtf/ThreadSafeRefCounted.h>
 #include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
 
 namespace CoreIPC {
     class Connection;
@@ -379,47 +380,47 @@ static inline CoreIPC::StringReference messageReceiverName()
 
 class LoadURL {
 public:
-    typedef std::tuple<WTF::String> DecodeType;
+    typedef std::tuple<String> DecodeType;
 
     static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
     static CoreIPC::StringReference name() { return CoreIPC::StringReference("LoadURL"); }
     static const bool isSync = false;
 
-    explicit LoadURL(const WTF::String& url)
+    explicit LoadURL(const String& url)
         : m_arguments(url)
     {
     }
 
-    const std::tuple<const WTF::String&> arguments() const
+    const std::tuple<const String&> arguments() const
     {
         return m_arguments;
     }
 
 private:
-    std::tuple<const WTF::String&> m_arguments;
+    std::tuple<const String&> m_arguments;
 };
 
 #if ENABLE(TOUCH_EVENTS)
 class LoadSomething {
 public:
-    typedef std::tuple<WTF::String> DecodeType;
+    typedef std::tuple<String> DecodeType;
 
     static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
     static CoreIPC::StringReference name() { return CoreIPC::StringReference("LoadSomething"); }
     static const bool isSync = false;
 
-    explicit LoadSomething(const WTF::String& url)
+    explicit LoadSomething(const String& url)
         : m_arguments(url)
     {
     }
 
-    const std::tuple<const WTF::String&> arguments() const
+    const std::tuple<const String&> arguments() const
     {
         return m_arguments;
     }
 
 private:
-    std::tuple<const WTF::String&> m_arguments;
+    std::tuple<const String&> m_arguments;
 };
 #endif
 
@@ -474,24 +475,24 @@ private:
 #if ENABLE(TOUCH_EVENTS)
 class LoadSomethingElse {
 public:
-    typedef std::tuple<WTF::String> DecodeType;
+    typedef std::tuple<String> DecodeType;
 
     static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
     static CoreIPC::StringReference name() { return CoreIPC::StringReference("LoadSomethingElse"); }
     static const bool isSync = false;
 
-    explicit LoadSomethingElse(const WTF::String& url)
+    explicit LoadSomethingElse(const String& url)
         : m_arguments(url)
     {
     }
 
-    const std::tuple<const WTF::String&> arguments() const
+    const std::tuple<const String&> arguments() const
     {
         return m_arguments;
     }
 
 private:
-    std::tuple<const WTF::String&> m_arguments;
+    std::tuple<const String&> m_arguments;
 };
 #endif
 
@@ -625,25 +626,25 @@ private:
 
 class RunJavaScriptAlert {
 public:
-    typedef std::tuple<uint64_t, WTF::String> DecodeType;
+    typedef std::tuple<uint64_t, String> DecodeType;
 
     static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
     static CoreIPC::StringReference name() { return CoreIPC::StringReference("RunJavaScriptAlert"); }
     static const bool isSync = true;
 
     typedef CoreIPC::Arguments0 Reply;
-    RunJavaScriptAlert(uint64_t frameID, const WTF::String& message)
+    RunJavaScriptAlert(uint64_t frameID, const String& message)
         : m_arguments(frameID, message)
     {
     }
 
-    const std::tuple<uint64_t, const WTF::String&> arguments() const
+    const std::tuple<uint64_t, const String&> arguments() const
     {
         return m_arguments;
     }
 
 private:
-    std::tuple<uint64_t, const WTF::String&> m_arguments;
+    std::tuple<uint64_t, const String&> m_arguments;
 };
 
 class GetPlugins {
@@ -671,7 +672,7 @@ private:
 
 class GetPluginProcessConnection {
 public:
-    typedef std::tuple<WTF::String> DecodeType;
+    typedef std::tuple<String> DecodeType;
 
     static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
     static CoreIPC::StringReference name() { return CoreIPC::StringReference("GetPluginProcessConnection"); }
@@ -689,18 +690,18 @@ public:
     };
 
     typedef CoreIPC::Arguments1<CoreIPC::Connection::Handle&> Reply;
-    explicit GetPluginProcessConnection(const WTF::String& pluginPath)
+    explicit GetPluginProcessConnection(const String& pluginPath)
         : m_arguments(pluginPath)
     {
     }
 
-    const std::tuple<const WTF::String&> arguments() const
+    const std::tuple<const String&> arguments() const
     {
         return m_arguments;
     }
 
 private:
-    std::tuple<const WTF::String&> m_arguments;
+    std::tuple<const String&> m_arguments;
 };
 
 class TestMultipleAttributes {
index 1bc0cc9..ca51560 100644 (file)
@@ -28,8 +28,8 @@ messages -> CustomProtocolManager {
     DidReceiveResponse(uint64_t customProtocolID, WebCore::ResourceResponse response, uint32_t cacheStoragePolicy)
     DidFinishLoading(uint64_t customProtocolID)
 
-    RegisterScheme(WTF::String name)
-    UnregisterScheme(WTF::String name)
+    RegisterScheme(String name)
+    UnregisterScheme(String name)
 }
 
 #endif // ENABLE(CUSTOM_PROTOCOLS)
index d725599..7394c22 100644 (file)
@@ -28,7 +28,7 @@ messages -> DownloadProxy {
     DidReceiveData(uint64_t length)
     ShouldDecodeSourceDataOfMIMEType(String mimeType) -> (bool result)
     DecideDestinationWithSuggestedFilename(String filename) -> (String destination, bool allowOverwrite, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
-    DidCreateDestination(WTF::String path)
+    DidCreateDestination(String path)
     DidFinish()
     DidFail(WebCore::ResourceError error, CoreIPC::DataReference resumeData)
     DidCancel(CoreIPC::DataReference resumeData)
index ef7f3c7..7ad2bdd 100644 (file)
@@ -25,7 +25,7 @@
 messages -> PluginProcessProxy {
     DidCreateWebProcessConnection(CoreIPC::Attachment connectionIdentifier, bool supportsAsynchronousPluginInitialization)
 
-    DidGetSitesWithData(Vector<WTF::String> sites, uint64_t callbackID)
+    DidGetSitesWithData(Vector<String> sites, uint64_t callbackID)
     DidClearSiteData(uint64_t callbackID)
 
 #if PLATFORM(MAC)
@@ -36,16 +36,16 @@ messages -> PluginProcessProxy {
     OpenPluginPreferencePane()
 
     # Returns true if the UI process launched the process.
-    LaunchProcess(WTF::String launchPath, Vector<WTF::String> arguments) -> (bool result)
+    LaunchProcess(String launchPath, Vector<String> arguments) -> (bool result)
 
     # Returns true if the UI process launched the application.
-    LaunchApplicationAtURL(WTF::String url, Vector<WTF::String> arguments) -> (bool result)
+    LaunchApplicationAtURL(String url, Vector<String> arguments) -> (bool result)
 
     # Returns true if the UI process did open the URL.
-    OpenURL(WTF::String urlString) -> (bool result, int32_t status, WTF::String launchedURLString)
+    OpenURL(String urlString) -> (bool result, int32_t status, String launchedURLString)
     
     # Returns true if the UI process did open the file.
-    OpenFile(WTF::String fullPath) -> (bool result)
+    OpenFile(String fullPath) -> (bool result)
 #endif
 }
 
index dd234ce..59b8f36 100644 (file)
@@ -25,9 +25,9 @@ messages -> StorageManager {
     CreateSessionStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData) WantsConnection
     DestroyStorageMap(uint64_t storageMapID) WantsConnection
 
-    GetValues(uint64_t storageMapID, uint64_t storageMapSeed) -> (HashMap<WTF::String, WTF::String> values) WantsConnection
+    GetValues(uint64_t storageMapID, uint64_t storageMapSeed) -> (HashMap<String, String> values) WantsConnection
 
-    SetItem(uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, WTF::String key, WTF::String value, WTF::String urlString) WantsConnection
-    RemoveItem(uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, WTF::String key, WTF::String urlString) WantsConnection
-    Clear(uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, WTF::String urlString) WantsConnection
+    SetItem(uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, String key, String value, String urlString) WantsConnection
+    RemoveItem(uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, String key, String urlString) WantsConnection
+    Clear(uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, String urlString) WantsConnection
 }
index d7d769c..056088c 100644 (file)
@@ -30,29 +30,29 @@ messages -> WebContext LegacyReceiver {
 #if PLATFORM(IOS)
     WriteWebContentToPasteboard(WebCore::PasteboardWebContent content)
     WriteImageToPasteboard(WebCore::PasteboardImage pasteboardImage)
-    WriteStringToPasteboard(WTF::String pasteboardType, WTF::String text) 
-    ReadStringFromPasteboard(uint64_t index, WTF::String pasteboardType) -> (WTF::String string)
-    ReadURLFromPasteboard(uint64_t index, WTF::String pasteboardType) -> (WTF::String string)
-    ReadBufferFromPasteboard(uint64_t index, WTF::String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
+    WriteStringToPasteboard(String pasteboardType, String text) 
+    ReadStringFromPasteboard(uint64_t index, String pasteboardType) -> (String string)
+    ReadURLFromPasteboard(uint64_t index, String pasteboardType) -> (String string)
+    ReadBufferFromPasteboard(uint64_t index, String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
     GetPasteboardItemsCount() -> (uint64_t itemsCount)
 #endif
 
 #if PLATFORM(MAC)
     # Pasteboard messages.
-    GetPasteboardTypes(WTF::String pasteboardName) -> (Vector<WTF::String> types)
-    GetPasteboardPathnamesForType(WTF::String pasteboardName, WTF::String pasteboardType) -> (Vector<WTF::String> pathnames)
-    GetPasteboardStringForType(WTF::String pasteboardName, WTF::String pasteboardType) -> (WTF::String string)
-    GetPasteboardBufferForType(WTF::String pasteboardName, WTF::String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
-    PasteboardCopy(WTF::String fromPasteboard, WTF::String toPasteboard) -> (uint64_t changeCount)
-    GetPasteboardChangeCount(WTF::String pasteboardName) -> (uint64_t changeCount)
-    GetPasteboardUniqueName() -> (WTF::String pasteboardName)
-    GetPasteboardColor(WTF::String pasteboardName) -> (WebCore::Color color)
-    GetPasteboardURL(WTF::String pasteboardName) -> (WTF::String urlString)
-    AddPasteboardTypes(WTF::String pasteboardName, Vector<WTF::String> pasteboardTypes) -> (uint64_t changeCount)
-    SetPasteboardTypes(WTF::String pasteboardName, Vector<WTF::String> pasteboardTypes) -> (uint64_t changeCount)
-    SetPasteboardPathnamesForType(WTF::String pasteboardName, WTF::String pasteboardType, Vector<WTF::String> pathnames) -> (uint64_t changeCount)
-    SetPasteboardStringForType(WTF::String pasteboardName, WTF::String pasteboardType, WTF::String string) -> (uint64_t changeCount)
-    SetPasteboardBufferForType(WTF::String pasteboardName, WTF::String pasteboardType, WebKit::SharedMemory::Handle handle, uint64_t size) -> (uint64_t changeCount)
+    GetPasteboardTypes(String pasteboardName) -> (Vector<String> types)
+    GetPasteboardPathnamesForType(String pasteboardName, String pasteboardType) -> (Vector<String> pathnames)
+    GetPasteboardStringForType(String pasteboardName, String pasteboardType) -> (String string)
+    GetPasteboardBufferForType(String pasteboardName, String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
+    PasteboardCopy(String fromPasteboard, String toPasteboard) -> (uint64_t changeCount)
+    GetPasteboardChangeCount(String pasteboardName) -> (uint64_t changeCount)
+    GetPasteboardUniqueName() -> (String pasteboardName)
+    GetPasteboardColor(String pasteboardName) -> (WebCore::Color color)
+    GetPasteboardURL(String pasteboardName) -> (String urlString)
+    AddPasteboardTypes(String pasteboardName, Vector<String> pasteboardTypes) -> (uint64_t changeCount)
+    SetPasteboardTypes(String pasteboardName, Vector<String> pasteboardTypes) -> (uint64_t changeCount)
+    SetPasteboardPathnamesForType(String pasteboardName, String pasteboardType, Vector<String> pathnames) -> (uint64_t changeCount)
+    SetPasteboardStringForType(String pasteboardName, String pasteboardType, String string) -> (uint64_t changeCount)
+    SetPasteboardBufferForType(String pasteboardName, String pasteboardType, WebKit::SharedMemory::Handle handle, uint64_t size) -> (uint64_t changeCount)
 #endif
 
 #if !PLATFORM(MAC)
@@ -62,6 +62,6 @@ messages -> WebContext LegacyReceiver {
 #endif
 
     # Plug-in messages.
-    void AddPlugInAutoStartOriginHash(WTF::String pageOrigin, uint32_t hash)
+    void AddPlugInAutoStartOriginHash(String pageOrigin, uint32_t hash)
     void PlugInDidReceiveUserInteraction(uint32_t hash)
 }
index 2ae0545..49ac6db 100644 (file)
@@ -21,7 +21,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 messages -> WebCookieManagerProxy {
-    DidGetHostnamesWithCookies(Vector<WTF::String> hostnames, uint64_t callbackID);
+    DidGetHostnamesWithCookies(Vector<String> hostnames, uint64_t callbackID);
     DidGetHTTPCookieAcceptPolicy(uint32_t policy, uint64_t callbackID);
     
     CookiesDidChange()
index 503275f..b399cab 100644 (file)
@@ -24,9 +24,9 @@
 
 messages -> WebDatabaseManagerProxy {
     DidGetDatabasesByOrigin(Vector<WebKit::OriginAndDatabases> originAndDatabases, uint64_t callbackID);
-    DidGetDatabaseOrigins(Vector<WTF::String> originIdentifiers, uint64_t callbackID)
-    DidModifyOrigin(WTF::String originIdentifier)
-    DidModifyDatabase(WTF::String originIdentifier, WTF::String databaseIdentifier)
+    DidGetDatabaseOrigins(Vector<String> originIdentifiers, uint64_t callbackID)
+    DidModifyOrigin(String originIdentifier)
+    DidModifyDatabase(String originIdentifier, String databaseIdentifier)
 }
 
 #endif // ENABLE(SQL_DATABASE)
index 400adb0..38b33dc 100644 (file)
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 messages -> WebIconDatabase {
-    RetainIconForPageURL(WTF::String pageURL)
-    ReleaseIconForPageURL(WTF::String pageURL)
-    SetIconURLForPageURL(WTF::String iconURL, WTF::String pageURL)
-    SetIconDataForIconURL(CoreIPC::DataReference iconData, WTF::String iconURL)
+    RetainIconForPageURL(String pageURL)
+    ReleaseIconForPageURL(String pageURL)
+    SetIconURLForPageURL(String iconURL, String pageURL)
+    SetIconDataForIconURL(CoreIPC::DataReference iconData, String iconURL)
     
-    SynchronousIconDataForPageURL(WTF::String pageURL) -> (CoreIPC::DataReference iconData)
-    SynchronousIconURLForPageURL(WTF::String pageURL) -> (WTF::String iconURL)
-    SynchronousIconDataKnownForIconURL(WTF::String iconURL) -> (bool dataKnown)
-    SynchronousLoadDecisionForIconURL(WTF::String iconURL) -> (int loadDecision)
+    SynchronousIconDataForPageURL(String pageURL) -> (CoreIPC::DataReference iconData)
+    SynchronousIconURLForPageURL(String pageURL) -> (String iconURL)
+    SynchronousIconDataKnownForIconURL(String iconURL) -> (bool dataKnown)
+    SynchronousLoadDecisionForIconURL(String iconURL) -> (int loadDecision)
     
-    GetLoadDecisionForIconURL(WTF::String iconURL, uint64_t callbackID)
-    DidReceiveIconForPageURL(WTF::String pageURL)
+    GetLoadDecisionForIconURL(String iconURL, uint64_t callbackID)
+    DidReceiveIconForPageURL(String pageURL)
 }
index 8c2bf7c..2add42f 100644 (file)
@@ -26,10 +26,10 @@ messages -> WebInspectorProxy {
     CreateInspectorPage() -> (uint64_t inspectorPageID, WebKit::WebPageCreationParameters inspectorPageParameters)
     DidClose()
     BringToFront()
-    InspectedURLChanged(WTF::String urlString)
+    InspectedURLChanged(String urlString)
 
-    Save(WTF::String filename, WTF::String content, bool base64Encoded, bool forceSaveAs)
-    Append(WTF::String filename, WTF::String content)
+    Save(String filename, String content, bool base64Encoded, bool forceSaveAs)
+    Append(String filename, String content)
 
     AttachBottom()
     AttachRight()
@@ -41,7 +41,7 @@ messages -> WebInspectorProxy {
     SetToolbarHeight(unsigned height)
 
 #if ENABLE(INSPECTOR_SERVER)
-    SendMessageToRemoteFrontend(WTF::String message)
+    SendMessageToRemoteFrontend(String message)
 #endif
 }
 
index 7929064..13a72cf 100644 (file)
@@ -21,5 +21,5 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 messages -> WebMediaCacheManagerProxy {
-    DidGetHostnamesWithMediaCache(Vector<WTF::String> hostnames, uint64_t callbackID);
+    DidGetHostnamesWithMediaCache(Vector<String> hostnames, uint64_t callbackID);
 }
index 883bf05..19c5f50 100644 (file)
@@ -25,13 +25,13 @@ messages -> WebPageProxy {
     CreateNewPage(WebCore::ResourceRequest request, WebCore::WindowFeatures windowFeatures, uint32_t modifiers, int32_t mouseButton) -> (uint64_t newPageID, WebKit::WebPageCreationParameters newPageParameters)
     ShowPage()
     ClosePage(bool stopResponsivenessTimer)
-    RunJavaScriptAlert(uint64_t frameID, WTF::String message) -> ()
-    RunJavaScriptConfirm(uint64_t frameID, WTF::String message) -> (bool result)
-    RunJavaScriptPrompt(uint64_t frameID, WTF::String message, WTF::String defaultValue) -> (WTF::String result)
+    RunJavaScriptAlert(uint64_t frameID, String message) -> ()
+    RunJavaScriptConfirm(uint64_t frameID, String message) -> (bool result)
+    RunJavaScriptPrompt(uint64_t frameID, String message, String defaultValue) -> (String result)
     ShouldInterruptJavaScript() -> (bool shouldInterupt)
     MouseDidMoveOverElement(WebKit::WebHitTestResult::Data hitTestResultData, uint32_t modifiers, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
 #if ENABLE(NETSCAPE_PLUGIN_API)
-    UnavailablePluginButtonClicked(uint32_t pluginUnavailabilityReason, WTF::String mimeType, WTF::String pluginURLString, WTF::String pluginspageAttributeURLString, WTF::String frameURLString, WTF::String pageURLString)
+    UnavailablePluginButtonClicked(uint32_t pluginUnavailabilityReason, String mimeType, String pluginURLString, String pluginspageAttributeURLString, String frameURLString, String pageURLString)
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
     DidChangeViewportProperties(WebCore::ViewportAttributes attributes)
     DidReceiveEvent(uint32_t type, bool handled)
@@ -40,8 +40,8 @@ messages -> WebPageProxy {
     SetCursor(WebCore::Cursor cursor)
     SetCursorHiddenUntilMouseMoves(bool hiddenUntilMouseMoves)
 #endif
-    SetStatusText(WTF::String statusText)
-    SetToolTip(WTF::String toolTip)
+    SetStatusText(String statusText)
+    SetToolTip(String toolTip)
     SetFocus(bool focused)
     TakeFocus(uint32_t direction)
     FocusedFrameChanged(uint64_t frameID)
@@ -59,7 +59,7 @@ messages -> WebPageProxy {
     GetWindowFrame() -> (WebCore::FloatRect windowFrame)
     ScreenToWindow(WebCore::IntPoint screenPoint) -> (WebCore::IntPoint windowPoint)
     WindowToScreen(WebCore::IntRect rect) -> (WebCore::IntRect screenFrame)
-    RunBeforeUnloadConfirmPanel(WTF::String message, uint64_t frameID) -> (bool shouldClose)
+    RunBeforeUnloadConfirmPanel(String message, uint64_t frameID) -> (bool shouldClose)
     PageDidScroll()
     RunOpenPanel(uint64_t frameID, WebCore::FileChooserSettings parameters)
     PrintFrame(uint64_t frameID) -> ()
@@ -70,8 +70,8 @@ messages -> WebPageProxy {
     DidChangeScrollOffsetPinningForMainFrame(bool pinnedToLeftSide, bool pinnedToRightSide, bool pinnedToTopSide, bool pinnedToBottomSide)
     DidChangePageCount(unsigned pageCount);
 #if ENABLE(NETSCAPE_PLUGIN_API)
-    DidFailToInitializePlugin(WTF::String mimeType, WTF::String frameURLString, WTF::String pageURLString)
-    DidBlockInsecurePluginVersion(WTF::String mimeType, WTF::String pluginURLString, WTF::String frameURLString, WTF::String pageURLString, bool replacementObscured)
+    DidFailToInitializePlugin(String mimeType, String frameURLString, String pageURLString)
+    DidBlockInsecurePluginVersion(String mimeType, String pluginURLString, String frameURLString, String pageURLString, bool replacementObscured)
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
     SetCanShortCircuitHorizontalWheelEvents(bool canShortCircuitHorizontalWheelEvents)
 
@@ -104,7 +104,7 @@ messages -> WebPageProxy {
     # Policy messages
     DecidePolicyForResponseSync(uint64_t frameID, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) -> (bool receivedPolicyAction, uint64_t policyAction, uint64_t downloadID) Variadic
     DecidePolicyForNavigationAction(uint64_t frameID, uint32_t navigationType, uint32_t modifiers, int32_t mouseButton, uint64_t originatingFrameID, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) -> (bool receivedPolicyAction, uint64_t policyAction, uint64_t downloadID) Variadic
-    DecidePolicyForNewWindowAction(uint64_t frameID, uint32_t navigationType, uint32_t modifiers, int32_t mouseButton, WebCore::ResourceRequest request, WTF::String frameName, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+    DecidePolicyForNewWindowAction(uint64_t frameID, uint32_t navigationType, uint32_t modifiers, int32_t mouseButton, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData)  Variadic
 
     # Progress messages
@@ -117,7 +117,7 @@ messages -> WebPageProxy {
     DidCreateSubframe(uint64_t frameID)
 
     # Frame load messages
-    DidCommitLoadForFrame(uint64_t frameID, WTF::String mimeType, uint32_t loadType, WebKit::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+    DidCommitLoadForFrame(uint64_t frameID, String mimeType, uint32_t loadType, WebKit::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     DidFailLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     DidFailProvisionalLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     DidFinishDocumentLoadForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
@@ -125,28 +125,28 @@ messages -> WebPageProxy {
     DidFirstLayoutForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     DidFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     DidLayout(uint32_t type, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
-    DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, WTF::String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+    DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     DidRemoveFrameFromHierarchy(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
-    DidStartProvisionalLoadForFrame(uint64_t frameID, WTF::String url, WTF::String unreachableURL, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
-    DidReceiveTitleForFrame(uint64_t frameID, WTF::String title, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+    DidStartProvisionalLoadForFrame(uint64_t frameID, String url, String unreachableURL, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+    DidReceiveTitleForFrame(uint64_t frameID, String title, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     DidDisplayInsecureContentForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     DidRunInsecureContentForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     DidDetectXSSForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
-    DidSameDocumentNavigationForFrame(uint64_t frameID, uint32_t type, WTF::String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+    DidSameDocumentNavigationForFrame(uint64_t frameID, uint32_t type, String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
 
     FrameDidBecomeFrameSet(uint64_t frameID, bool value)
 
     # Forms messages
-    WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, Vector<std::pair<WTF::String, WTF::String>> textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+    WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, Vector<std::pair<String, String>> textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
 
     # Callback messages
     VoidCallback(uint64_t callbackID)
     DataCallback(CoreIPC::DataReference resultData, uint64_t callbackID)
     ImageCallback(WebKit::ShareableBitmap::Handle bitmapHandle, uint64_t callbackID)
-    StringCallback(WTF::String resultString, uint64_t callbackID)
+    StringCallback(String resultString, uint64_t callbackID)
     ScriptValueCallback(CoreIPC::DataReference resultData, uint64_t callbackID)
     ComputedPagesCallback(Vector<WebCore::IntRect> pageRects, double totalScaleFactorForPrinting, uint64_t callbackID)
-    ValidateCommandCallback(WTF::String command, bool isEnabled, int32_t state, uint64_t callbackID)
+    ValidateCommandCallback(String command, bool isEnabled, int32_t state, uint64_t callbackID)
 #if PLATFORM(IOS)
     GestureCallback(WebCore::IntPoint point, uint32_t gestureType, uint32_t gestureState, uint32_t flags, uint64_t callbackID)
     TouchesCallback(WebCore::IntPoint point, uint32_t touches, uint64_t callbackID)
@@ -162,10 +162,10 @@ messages -> WebPageProxy {
 
 #if PLATFORM(GTK)
     # Support for GTK+ platform keybindings
-    GetEditorCommandsForKeyEvent(AtomicString eventType) -> (Vector<WTF::String> commandsList)
+    GetEditorCommandsForKeyEvent(AtomicString eventType) -> (Vector<String> commandsList)
 
     # Support for connecting the Accessibility worlds of the UI and the Web processes
-    BindAccessibilityTree(WTF::String plugID)
+    BindAccessibilityTree(String plugID)
 
     SetInputMethodState(bool enabled);
 #endif
@@ -190,11 +190,11 @@ messages -> WebPageProxy {
     EditorStateChanged(WebKit::EditorState editorState)
 
     # Find messages
-    DidCountStringMatches(WTF::String string, uint32_t matchCount)
+    DidCountStringMatches(String string, uint32_t matchCount)
     SetFindIndicator(WebCore::FloatRect selectionRect, Vector<WebCore::FloatRect> textRects, float contentImageScaleFactor, WebKit::ShareableBitmap::Handle contentImageHandle, bool fadeOut, bool animate)
-    DidFindString(WTF::String string, uint32_t matchCount)
-    DidFailToFindString(WTF::String string)
-    DidFindStringMatches(WTF::String string, Vector<Vector<WebCore::IntRect>> matches, int32_t firstIndexAfterSelection)
+    DidFindString(String string, uint32_t matchCount)
+    DidFailToFindString(String string)
+    DidFindStringMatches(String string, Vector<Vector<WebCore::IntRect>> matches, int32_t firstIndexAfterSelection)
     DidGetImageForFindMatch(WebKit::ShareableBitmap::Handle contentImageHandle, uint32_t matchIndex)
 
     # PopupMenu messages
@@ -211,30 +211,30 @@ messages -> WebPageProxy {
     DidReceiveAuthenticationChallenge(uint64_t frameID, WebCore::AuthenticationChallenge challenge, uint64_t challengeID)
 
     # Database messages
-    ExceededDatabaseQuota(uint64_t frameID, WTF::String originIdentifier, WTF::String databaseName, WTF::String databaseDisplayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage) -> (uint64_t newQuota) Delayed
+    ExceededDatabaseQuota(uint64_t frameID, String originIdentifier, String databaseName, String databaseDisplayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage) -> (uint64_t newQuota) Delayed
 
     # Geolocation messages
-    RequestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, WTF::String originIdentifier)
+    RequestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, String originIdentifier)
     
     # Notification messages
-    RequestNotificationPermission(uint64_t requestID, WTF::String originIdentifier)
-    ShowNotification(WTF::String title, WTF::String body, WTF::String iconURL, WTF::String tag, WTF::String lang, WTF::String dir, WTF::String originIdentifier, uint64_t notificationID)
+    RequestNotificationPermission(uint64_t requestID, String originIdentifier)
+    ShowNotification(String title, String body, String iconURL, String tag, String lang, String dir, String originIdentifier, uint64_t notificationID)
     CancelNotification(uint64_t notificationID)
     ClearNotifications(Vector<uint64_t> notificationIDs)
     DidDestroyNotification(uint64_t notificationID)
 
     # Spelling and grammar messages
 #if USE(UNIFIED_TEXT_CHECKING)  
-    CheckTextOfParagraph(WTF::String text, uint64_t checkingTypes) -> (Vector<WebCore::TextCheckingResult> results)
+    CheckTextOfParagraph(String text, uint64_t checkingTypes) -> (Vector<WebCore::TextCheckingResult> results)
 #endif
-    CheckSpellingOfString(WTF::String text) -> (int32_t misspellingLocation, int32_t misspellingLength)
-    CheckGrammarOfString(WTF::String text) -> (Vector<WebCore::GrammarDetail> results, int32_t badGrammarLocation, int32_t badGrammarLength)
+    CheckSpellingOfString(String text) -> (int32_t misspellingLocation, int32_t misspellingLength)
+    CheckGrammarOfString(String text) -> (Vector<WebCore::GrammarDetail> results, int32_t badGrammarLocation, int32_t badGrammarLength)
     SpellingUIIsShowing() -> (bool isShowing)
-    UpdateSpellingUIWithMisspelledWord(WTF::String misspelledWord)
-    UpdateSpellingUIWithGrammarString(WTF::String badGrammarPhrase, WebCore::GrammarDetail grammarDetail)
-    GetGuessesForWord(WTF::String word, WTF::String context) -> (Vector<WTF::String> guesses)
-    LearnWord(WTF::String word);
-    IgnoreWord(WTF::String word);
+    UpdateSpellingUIWithMisspelledWord(String misspelledWord)
+    UpdateSpellingUIWithGrammarString(String badGrammarPhrase, WebCore::GrammarDetail grammarDetail)
+    GetGuessesForWord(String word, String context) -> (Vector<String> guesses)
+    LearnWord(String word);
+    IgnoreWord(String word);
     RequestCheckingOfString(uint64_t requestID, WebCore::TextCheckingRequestData request)
 
     # Drag and drop messages
@@ -243,7 +243,7 @@ messages -> WebPageProxy {
 #endif
 #if PLATFORM(MAC) && ENABLE(DRAG_SUPPORT)
     SetDragImage(WebCore::IntPoint clientPosition, WebKit::ShareableBitmap::Handle dragImage, bool linkDrag)
-    SetPromisedData(WTF::String pasteboardName, WebKit::SharedMemory::Handle imageHandle, uint64_t imageSize, WTF::String filename, WTF::String extension, WTF::String title, WTF::String url, WTF::String visibleURL, WebKit::SharedMemory::Handle archiveHandle, uint64_t archiveSize)
+    SetPromisedData(String pasteboardName, WebKit::SharedMemory::Handle imageHandle, uint64_t imageSize, String filename, String extension, String title, String url, String visibleURL, WebKit::SharedMemory::Handle archiveHandle, uint64_t archiveSize)
 #endif
 #if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
     StartDrag(WebCore::DragData dragData, WebKit::ShareableBitmap::Handle dragImage)
@@ -255,7 +255,7 @@ messages -> WebPageProxy {
 
     # Keyboard input support messages
     InterpretQueuedKeyEvent(WebKit::EditorState state) -> (bool handled, Vector<WebCore::KeypressCommand> savedCommands)
-    ExecuteSavedCommandBySelector(WTF::String selector) -> (bool handled)
+    ExecuteSavedCommandBySelector(String selector) -> (bool handled)
 
     # Remote accessibility messages
     RegisterWebProcessAccessibilityToken(CoreIPC::DataReference data)
@@ -266,15 +266,15 @@ messages -> WebPageProxy {
 
     # Speech messages
     GetIsSpeaking() -> (bool isSpeaking)
-    Speak(WTF::String string)
+    Speak(String string)
     StopSpeaking()
 
     MakeFirstResponder()
 
     # Spotlight
-    SearchWithSpotlight(WTF::String string)
+    SearchWithSpotlight(String string)
 
-    SearchTheWeb(WTF::String string)
+    SearchTheWeb(String string)
 #endif
 
 #if USE(APPKIT)
@@ -311,23 +311,23 @@ messages -> WebPageProxy {
 #endif
 
     # Search popup menus
-    SaveRecentSearches(WTF::String name, Vector<String> searchItems)
-    LoadRecentSearches(WTF::String name) -> (Vector<String> result)
+    SaveRecentSearches(String name, Vector<String> searchItems)
+    LoadRecentSearches(String name) -> (Vector<String> result)
 
 #if USE(SOUP)
     # Soup custom URI request messages
-    DidReceiveURIRequest(WTF::String uriString, uint64_t requestID);
+    DidReceiveURIRequest(String uriString, uint64_t requestID);
 #endif
 
-    SavePDFToFileInDownloadsFolder(WTF::String suggestedFilename, WTF::String originatingURLString, CoreIPC::DataReference data)
+    SavePDFToFileInDownloadsFolder(String suggestedFilename, String originatingURLString, CoreIPC::DataReference data)
 
 #if PLATFORM(MAC)
-    SavePDFToTemporaryFolderAndOpenWithNativeApplication(WTF::String suggestedFilename, WTF::String originatingURLString, CoreIPC::DataReference data, WTF::String pdfUUID)
-    OpenPDFFromTemporaryFolderWithNativeApplication(WTF::String pdfUUID)
+    SavePDFToTemporaryFolderAndOpenWithNativeApplication(String suggestedFilename, String originatingURLString, CoreIPC::DataReference data, String pdfUUID)
+    OpenPDFFromTemporaryFolderWithNativeApplication(String pdfUUID)
 #endif
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
-    FindPlugin(WTF::String mimeType, uint32_t processType, WTF::String urlString, WTF::String frameURLString, WTF::String pageURLString, bool allowOnlyApplicationPlugins) -> (uint64_t pluginProcessToken, WTF::String newMIMEType, uint32_t pluginLoadPolicy, WTF::String unavailabilityDescription)
+    FindPlugin(String mimeType, uint32_t processType, String urlString, String frameURLString, String pageURLString, bool allowOnlyApplicationPlugins) -> (uint64_t pluginProcessToken, String newMIMEType, uint32_t pluginLoadPolicy, String unavailabilityDescription)
 #endif
 
     DidUpdateViewState()
index d8da80d..7121bc1 100644 (file)
@@ -24,11 +24,11 @@ messages -> WebProcessProxy LegacyReceiver {
 
     # History client messages.
     DidNavigateWithNavigationData(uint64_t pageID, WebKit::WebNavigationDataStore store, uint64_t frameID)
-    DidPerformClientRedirect(uint64_t pageID, WTF::String sourceURLString, WTF::String destinationURLString, uint64_t frameID)
-    DidPerformServerRedirect(uint64_t pageID, WTF::String sourceURLString, WTF::String destinationURLString, uint64_t frameID)
-    DidUpdateHistoryTitle(uint64_t pageID, WTF::String title, WTF::String url, uint64_t frameID)
+    DidPerformClientRedirect(uint64_t pageID, String sourceURLString, String destinationURLString, uint64_t frameID)
+    DidPerformServerRedirect(uint64_t pageID, String sourceURLString, String destinationURLString, uint64_t frameID)
+    DidUpdateHistoryTitle(uint64_t pageID, String title, String url, uint64_t frameID)
 
-    AddBackForwardItem(uint64_t itemID, WTF::String originalURL, WTF::String url, WTF::String title, CoreIPC::DataReference backForwardData)
+    AddBackForwardItem(uint64_t itemID, String originalURL, String url, String title, CoreIPC::DataReference backForwardData)
     DidDestroyFrame(uint64_t frameID) 
 
     ShouldTerminate() -> (bool shouldTerminate)
index 0ae1155..65b3e5c 100644 (file)
@@ -25,7 +25,7 @@
  
  messages -> WebCookieManager {
     void GetHostnamesWithCookies(uint64_t callbackID)
-    void DeleteCookiesForHostname(WTF::String hostname)
+    void DeleteCookiesForHostname(String hostname)
     void DeleteAllCookies()
 
     void SetHTTPCookieAcceptPolicy(uint32_t policy)
@@ -35,6 +35,6 @@
     void StopObservingCookieChanges()
 
 #if USE(SOUP)
-    SetCookiePersistentStorage(WTF::String storagePath, uint32_t storageType)
+    SetCookiePersistentStorage(String storagePath, uint32_t storageType)
 #endif
 }
index b944428..27154f5 100644 (file)
@@ -22,7 +22,7 @@
 
 messages -> WebGeolocationManager {
     DidChangePosition(WebKit::WebGeolocationPosition::Data position);
-    DidFailToDeterminePosition(WTF::String errorMessage);
+    DidFailToDeterminePosition(String errorMessage);
 #if PLATFORM(IOS)
     ResetPermissions();
 #endif
index 5eee8cc..c0cf8f8 100644 (file)
@@ -22,6 +22,6 @@
 
 messages -> WebMediaCacheManager {
     void GetHostnamesWithMediaCache(uint64_t callbackID)
-    void ClearCacheForHostname(WTF::String hostname)
+    void ClearCacheForHostname(String hostname)
     void ClearCacheForAllHostnames()
 }
index b88f26c..a2e623c 100644 (file)
@@ -24,6 +24,6 @@ messages -> WebNotificationManager {
     DidShowNotification(uint64_t notificationID);
     DidClickNotification(uint64_t notificationID);
     DidCloseNotifications(Vector<uint64_t> notificationIDs);
-    DidUpdateNotificationDecision(WTF::String originString, bool allowed);
-    DidRemoveNotificationDecisions(Vector<WTF::String> originStrings);
+    DidUpdateNotificationDecision(String originString, bool allowed);
+    DidRemoveNotificationDecisions(Vector<String> originStrings);
 }
index 2a548f0..db379fb 100644 (file)
@@ -24,7 +24,7 @@
 
 messages -> PluginProcessConnection LegacyReceiver {
     # Set a global JavaScript exception.
-    SetException(WTF::String exceptionString) -> ()
+    SetException(String exceptionString) -> ()
 }
 
 #endif
index 6532045..0b85e91 100644 (file)
 
 messages -> PluginProxy LegacyReceiver {
     # Asks the web process to load a URL.
-    LoadURL(uint64_t requestID, WTF::String method, WTF::String urlString, WTF::String target, WebCore::HTTPHeaderMap headerFields, Vector<uint8_t> httpBody, bool allowPopups);
+    LoadURL(uint64_t requestID, String method, String urlString, String target, WebCore::HTTPHeaderMap headerFields, Vector<uint8_t> httpBody, bool allowPopups);
 
     # Called when the plug-in has painted into its backing store. The painted rect is in plug-in coordinates.
     Update(WebCore::IntRect paintedRect)
 
     # Returns a PAC style string with proxies for the given URL.
-    ProxiesForURL(WTF::String urlString) -> (WTF::String proxiesString)
+    ProxiesForURL(String urlString) -> (String proxiesString)
 
     # Returns the cookies for the given URL.
-    CookiesForURL(WTF::String urlString) -> (WTF::String cookieString)
+    CookiesForURL(String urlString) -> (String cookieString)
 
     # Sets the cookies for the given URL.
-    SetCookiesForURL(WTF::String urlString, WTF::String cookieString)
+    SetCookiesForURL(String urlString, String cookieString)
 
     # Gets the authentication info for the given protection space.
-    GetAuthenticationInfo(WebCore::ProtectionSpace protectionSpace) -> (bool returnValue, WTF::String username, WTF::String password)
+    GetAuthenticationInfo(WebCore::ProtectionSpace protectionSpace) -> (bool returnValue, String username, String password)
 
     # Gets a reference to the plug-in element NPObject.
     GetPluginElementNPObject() -> (uint64_t pluginElementNPObjectID)
 
     # Evaluates the given JavaScript string.
-    Evaluate(WebKit::NPVariantData npObjectAsVariantData, WTF::String scriptString, bool allowPopups) -> (bool returnValue, WebKit::NPVariantData resultData)
+    Evaluate(WebKit::NPVariantData npObjectAsVariantData, String scriptString, bool allowPopups) -> (bool returnValue, WebKit::NPVariantData resultData)
 
     # Cancels the given stream load.
     CancelStreamLoad(uint64_t streamID)
@@ -54,7 +54,7 @@ messages -> PluginProxy LegacyReceiver {
     CancelManualStreamLoad()
 
     # Set the status bar text.
-    SetStatusbarText(WTF::String statusbarText)
+    SetStatusbarText(String statusbarText)
 
 #if PLATFORM(MAC)
     # Called when the plug-in's focus or its containing window focus changes.
index 06dde94..b15904f 100644 (file)
 
 messages -> StorageAreaMap {
     DidGetValues(uint64_t storageMapSeed)
-    DidSetItem(uint64_t storageMapSeed, WTF::String key, bool quotaException)
-    DidRemoveItem(uint64_t storageMapSeed, WTF::String key)
+    DidSetItem(uint64_t storageMapSeed, String key, bool quotaException)
+    DidRemoveItem(uint64_t storageMapSeed, String key)
     DidClear(uint64_t storageMapSeed)
 
-    DispatchStorageEvent(uint64_t sourceStorageAreaID, WTF::String key, WTF::String oldValue, WTF::String newValue, WTF::String urlString)
+    DispatchStorageEvent(uint64_t sourceStorageAreaID, String key, String oldValue, String newValue, String urlString)
     ClearCache()
 }
index a344c00..b8f92e2 100644 (file)
 messages -> WebDatabaseManager {
     void GetDatabasesByOrigin(uint64_t callbackID)
     void GetDatabaseOrigins(uint64_t callbackID)
-    void DeleteDatabaseWithNameForOrigin(WTF::String databaseIdentifier, WTF::String originIdentifier)
-    void DeleteDatabasesForOrigin(WTF::String originIdentifier)
+    void DeleteDatabaseWithNameForOrigin(String databaseIdentifier, String originIdentifier)
+    void DeleteDatabasesForOrigin(String originIdentifier)
     void DeleteAllDatabases()
-    void SetQuotaForOrigin(WTF::String originIdentifier, uint64_t quota)
+    void SetQuotaForOrigin(String originIdentifier, uint64_t quota)
 }
 
 #endif // ENABLE(SQL_DATABASE)
index 22d2fb0..c23b86f 100644 (file)
@@ -28,8 +28,8 @@ messages -> WebInspector LegacyReceiver {
     AttachedBottom()
     AttachedRight()
     Detached()
-    DidSave(WTF::String url)
-    DidAppend(WTF::String url)
+    DidSave(String url)
+    DidAppend(String url)
     ShowConsole()
     ShowResources()
     ShowMainResourceForFrame(uint64_t frameID)
@@ -41,7 +41,7 @@ messages -> WebInspector LegacyReceiver {
     StopPageProfiling()
 
 #if ENABLE(INSPECTOR_SERVER)
-    DispatchMessageFromRemoteFrontend(WTF::String message)
+    DispatchMessageFromRemoteFrontend(String message)
     RemoteFrontendConnected()
     RemoteFrontendDisconnected()
 #endif
index 6d2313a..f046d2b 100644 (file)
@@ -71,16 +71,16 @@ messages -> WebPage LegacyReceiver {
     GoToBackForwardItem(uint64_t backForwardItemID)
     TryRestoreScrollPosition()
 
-    LoadURL(WTF::String url, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
-    LoadURLInFrame(WTF::String url, uint64_t frameID)
+    LoadURL(String url, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
+    LoadURLInFrame(String url, uint64_t frameID)
     LoadURLRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
-    LoadData(CoreIPC::DataReference data, WTF::String MIMEType, WTF::String encoding, WTF::String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
-    LoadHTMLString(WTF::String htmlString, WTF::String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
-    LoadAlternateHTMLString(WTF::String htmlString, WTF::String baseURL, WTF::String unreachableURL, WebKit::WebContextUserMessageEncoder userData) Variadic
-    LoadPlainTextString(WTF::String string, WebKit::WebContextUserMessageEncoder userData) Variadic
+    LoadData(CoreIPC::DataReference data, String MIMEType, String encoding, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
+    LoadHTMLString(String htmlString, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
+    LoadAlternateHTMLString(String htmlString, String baseURL, String unreachableURL, WebKit::WebContextUserMessageEncoder userData) Variadic
+    LoadPlainTextString(String string, WebKit::WebContextUserMessageEncoder userData) Variadic
     LoadWebArchiveData(CoreIPC::DataReference webArchiveData, WebKit::WebContextUserMessageEncoder userData) Variadic
 
-    LinkClicked(WTF::String url, WebKit::WebMouseEvent event)
+    LinkClicked(String url, WebKit::WebMouseEvent event)
 
     Reload(bool reloadFromOrigin, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
     StopLoading()
@@ -103,13 +103,13 @@ messages -> WebPage LegacyReceiver {
     GetContentsAsMHTMLData(uint64_t callbackID, bool useBinaryEncoding)
 #endif
     GetMainResourceDataOfFrame(uint64_t frameID, uint64_t callbackID)
-    GetResourceDataFromFrame(uint64_t frameID, WTF::String resourceURL, uint64_t callbackID)
+    GetResourceDataFromFrame(uint64_t frameID, String resourceURL, uint64_t callbackID)
     GetRenderTreeExternalRepresentation(uint64_t callbackID)
     GetSelectionOrContentsAsString(uint64_t callbackID)
     GetSelectionAsWebArchiveData(uint64_t callbackID)
     GetSourceForFrame(uint64_t frameID, uint64_t callbackID)
     GetWebArchiveOfFrame(uint64_t frameID, uint64_t callbackID)
-    RunJavaScriptInMainFrame(WTF::String script, uint64_t callbackID)
+    RunJavaScriptInMainFrame(String script, uint64_t callbackID)
     ForceRepaint(uint64_t callbackID)
 
 #if PLATFORM(MAC)
@@ -119,8 +119,8 @@ messages -> WebPage LegacyReceiver {
 
     PreferencesDidChange(WebKit::WebPreferencesStore store)
 
-    SetUserAgent(WTF::String userAgent)
-    SetCustomTextEncodingName(WTF::String encodingName)
+    SetUserAgent(String userAgent)
+    SetCustomTextEncodingName(String encodingName)
 
     SuspendActiveDOMObjectsAndAnimations()
     ResumeActiveDOMObjectsAndAnimations()
@@ -128,8 +128,8 @@ messages -> WebPage LegacyReceiver {
     Close()
     TryClose()
 
-    ValidateCommand(WTF::String name, uint64_t callbackID)
-    ExecuteEditCommand(WTF::String name)
+    ValidateCommand(String name, uint64_t callbackID)
+    ExecuteEditCommand(String name)
 
     DidRemoveEditCommand(uint64_t commandID)
     ReapplyEditCommand(uint64_t commandID)
@@ -152,22 +152,22 @@ messages -> WebPage LegacyReceiver {
     SetPageLength(double pageLength)
     SetGapBetweenPages(double gap)
 
-    PostInjectedBundleMessage(WTF::String messageName, WebKit::WebContextUserMessageEncoder messageBody) Variadic
+    PostInjectedBundleMessage(String messageName, WebKit::WebContextUserMessageEncoder messageBody) Variadic
 
     # Find.
-    FindString(WTF::String string, uint32_t findOptions, unsigned maxMatchCount)
-    FindStringMatches(WTF::String string, uint32_t findOptions, unsigned maxMatchCount)
+    FindString(String string, uint32_t findOptions, unsigned maxMatchCount)
+    FindStringMatches(String string, uint32_t findOptions, unsigned maxMatchCount)
     GetImageForFindMatch(uint32_t matchIndex)
     SelectFindMatch(uint32_t matchIndex)
     HideFindUI()
-    CountStringMatches(WTF::String string, uint32_t findOptions, unsigned maxMatchCount)
+    CountStringMatches(String string, uint32_t findOptions, unsigned maxMatchCount)
 
     # Drag and drop.
 #if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
     PerformDragControllerAction(uint64_t action, WebCore::DragData dragData)
 #endif
 #if !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
-    PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, WTF::String dragStorageName, uint32_t flags, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload)
+    PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, String dragStorageName, uint32_t flags, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload)
 #endif
 #if ENABLE(DRAG_SUPPORT)
     DragEnded(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t operation)
@@ -186,7 +186,7 @@ messages -> WebPage LegacyReceiver {
 #endif
 
     # Open panel.
-    DidChooseFilesForOpenPanel(Vector<WTF::String> fileURLs)
+    DidChooseFilesForOpenPanel(Vector<String> fileURLs)
     DidCancelForOpenPanel()
 #if ENABLE(WEB_PROCESS_SANDBOX)
     ExtendSandboxForFileFromOpenPanel(WebKit::SandboxExtension::Handle sandboxExtensionHandle)
@@ -194,7 +194,7 @@ messages -> WebPage LegacyReceiver {
 
     # Spelling and grammar.
     AdvanceToNextMisspelling(bool startBeforeSelection)
-    ChangeSpellingToWord(WTF::String word)
+    ChangeSpellingToWord(String word)
     DidFinishCheckingText(uint64_t requestID, Vector<WebCore::TextCheckingResult> result)
     DidCancelCheckingText(uint64_t requestID)
 #if USE(APPKIT)
@@ -242,7 +242,7 @@ messages -> WebPage LegacyReceiver {
     SetCanRunModal(bool canRunModal)
 
 #if PLATFORM(EFL)
-    SetThemePath(WTF::String themePath)
+    SetThemePath(String themePath)
 #endif
 
 #if USE(TILED_BACKING_STORE)
@@ -250,8 +250,8 @@ messages -> WebPage LegacyReceiver {
 #endif
 
 #if PLATFORM(GTK)
-    SetComposition(WTF::String text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
-    ConfirmComposition(WTF::String text, int64_t selectionStart, int64_t selectionLength)
+    SetComposition(String text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
+    ConfirmComposition(String text, int64_t selectionStart, int64_t selectionLength)
     CancelComposition()
 #endif
 
@@ -263,15 +263,15 @@ messages -> WebPage LegacyReceiver {
     ViewExposedRectChanged(WebCore::FloatRect exposedRect, bool clipsToExposedRect)
     SetMainFrameIsScrollable(bool isScrollable)
     RegisterUIProcessAccessibilityTokens(CoreIPC::DataReference elemenToken, CoreIPC::DataReference windowToken)
-    GetStringSelectionForPasteboard() -> (WTF::String stringValue)
-    GetDataSelectionForPasteboard(WTF::String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
-    ReadSelectionFromPasteboard(WTF::String pasteboardName) -> (bool result)
+    GetStringSelectionForPasteboard() -> (String stringValue)
+    GetDataSelectionForPasteboard(String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
+    ReadSelectionFromPasteboard(String pasteboardName) -> (bool result)
 
     # Text input.
-    SetComposition(WTF::String text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (WebKit::EditorState newState)
+    SetComposition(String text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (WebKit::EditorState newState)
     ConfirmComposition() -> (WebKit::EditorState newState)
     CancelComposition() -> (WebKit::EditorState newState)
-    InsertText(WTF::String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (bool handled, WebKit::EditorState newState)
+    InsertText(String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (bool handled, WebKit::EditorState newState)
     GetMarkedRange() -> (uint64_t location, uint64_t length)
     GetSelectedRange() -> (uint64_t location, uint64_t length)
     GetAttributedSubstringFromRange(uint64_t location, uint64_t length) -> (WebKit::AttributedString result)
@@ -280,15 +280,15 @@ messages -> WebPage LegacyReceiver {
     ExecuteKeypressCommands(Vector<WebCore::KeypressCommand> savedCommands) -> (bool handled, WebKit::EditorState newState)
     ShouldDelayWindowOrderingEvent(WebKit::WebMouseEvent event) -> (bool result)
     AcceptsFirstMouse(int eventNumber, WebKit::WebMouseEvent event) -> (bool result)
-    InsertDictatedText(WTF::String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd, Vector<WebCore::DictationAlternative> dictationAlternatives) -> (bool handled, WebKit::EditorState newState)
+    InsertDictatedText(String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd, Vector<WebCore::DictationAlternative> dictationAlternatives) -> (bool handled, WebKit::EditorState newState)
 #endif
 
     SetMinimumLayoutSize(WebCore::IntSize minimumLayoutSize)
     SetAutoSizingShouldExpandToViewHeight(bool shouldExpand)
 
 #if PLATFORM(EFL)
-    ConfirmComposition(WTF::String compositionString)
-    SetComposition(WTF::String compositionString, Vector<WebCore::CompositionUnderline> underlines, uint64_t cursorPosition)
+    ConfirmComposition(String compositionString)
+    SetComposition(String compositionString, Vector<WebCore::CompositionUnderline> underlines, uint64_t cursorPosition)
     CancelComposition()
 #endif
 #if USE(COORDINATED_GRAPHICS)
index a09ff56..7ec46f6 100644 (file)
@@ -35,17 +35,17 @@ messages -> WebProcess LegacyReceiver {
     # Global preferences.
     SetShouldTrackVisitedLinks(bool shouldTrackVisitedLinks)
     SetCacheModel(uint32_t cacheModel)
-    RegisterURLSchemeAsEmptyDocument(WTF::String scheme)
-    RegisterURLSchemeAsSecure(WTF::String scheme)
-    SetDomainRelaxationForbiddenForURLScheme(WTF::String scheme)
-    RegisterURLSchemeAsLocal(WTF::String scheme)
-    RegisterURLSchemeAsNoAccess(WTF::String scheme)
-    RegisterURLSchemeAsDisplayIsolated(WTF::String scheme)
-    RegisterURLSchemeAsCORSEnabled(WTF::String scheme)
+    RegisterURLSchemeAsEmptyDocument(String scheme)
+    RegisterURLSchemeAsSecure(String scheme)
+    SetDomainRelaxationForbiddenForURLScheme(String scheme)
+    RegisterURLSchemeAsLocal(String scheme)
+    RegisterURLSchemeAsNoAccess(String scheme)
+    RegisterURLSchemeAsDisplayIsolated(String scheme)
+    RegisterURLSchemeAsCORSEnabled(String scheme)
     SetDefaultRequestTimeoutInterval(double timeoutInterval)
     SetAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
     SetShouldUseFontSmoothing(bool useFontSmoothing)
-    UserPreferredLanguagesChanged(Vector<WTF::String> languages)
+    UserPreferredLanguagesChanged(Vector<String> languages)
     FullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
 #if USE(SOUP)
     SetIgnoreTLSErrors(bool ignoreTLSErrors)
@@ -59,7 +59,7 @@ messages -> WebProcess LegacyReceiver {
     DidAddPlugInAutoStartOriginHash(uint32_t hash, double expirationTime)
     ResetPlugInAutoStartOriginHashes(HashMap<uint32_t,double> hashes)
 
-    void StartMemorySampler(WebKit::SandboxExtension::Handle sampleLogFileHandle, WTF::String sampleLogFilePath, double interval);
+    void StartMemorySampler(WebKit::SandboxExtension::Handle sampleLogFileHandle, String sampleLogFilePath, double interval);
     void StopMemorySampler();
 
     # Downloads. This should really be in a Download.messages.in, but it seemed unnecessary to create a new file just for
@@ -84,6 +84,6 @@ messages -> WebProcess LegacyReceiver {
 #endif
 
 #if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
-    AllowSpecificHTTPSCertificateForHost(WebKit::CertificateInfo certificate, WTF::String host)
+    AllowSpecificHTTPSCertificateForHost(WebKit::CertificateInfo certificate, String host)
 #endif
 }
index b158805..2a07ee2 100644 (file)
@@ -21,8 +21,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 messages -> WebSoupRequestManager {
-    RegisterURIScheme(WTF::String uriScheme);
-    DidHandleURIRequest(CoreIPC::DataReference requestData, uint64_t contentLength, WTF::String mimeType, uint64_t requestID);
+    RegisterURIScheme(String uriScheme);
+    DidHandleURIRequest(CoreIPC::DataReference requestData, uint64_t contentLength, String mimeType, uint64_t requestID);
     DidReceiveURIRequestData(CoreIPC::DataReference requestData, uint64_t requestID);
     DidFailURIRequest(WebCore::ResourceError error, uint64_t requestID);
 }