[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 13:31:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c3c27e8975e7af3651113977e6dc8d72b01923d7
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Sep 18 05:34:21 2010 +0000
Replace all uses of WTF::String and WTF::AtomicString with
String and AtomicString.
Rubber-stamped by Anders Carlsson.
* Platform/Module.h:
* Shared/CommandLine.h:
(WebKit::CommandLine::operator[]):
* Shared/WebCoreArgumentCoders.h:
* Shared/WebEvent.h:
(WebKit::WebKeyboardEvent::WebKeyboardEvent):
(WebKit::WebKeyboardEvent::text):
(WebKit::WebKeyboardEvent::unmodifiedText):
(WebKit::WebKeyboardEvent::keyIdentifier):
(WebKit::WebKeyboardEvent::decode):
* Shared/WebNavigationDataStore.h:
* Shared/WebPreferencesStore.h:
* Shared/WebString.h:
(WebKit::WebString::create):
(WebKit::WebString::string):
(WebKit::WebString::WebString):
* Shared/WebURL.h:
(WebKit::WebURL::create):
(WebKit::WebURL::string):
(WebKit::WebURL::WebURL):
* UIProcess/API/C/WKAPICast.h:
(WebKit::toRef):
(WebKit::toURLRef):
(WebKit::toCopiedRef):
(WebKit::toCopiedURLRef):
(WebKit::toWTFString):
* UIProcess/API/C/WKContext.cpp:
(WKContextCreate):
* UIProcess/API/mac/PageClientImpl.h:
* UIProcess/API/mac/PageClientImpl.mm:
(WebKit::nsStringFromWebCoreString):
* UIProcess/PageClient.h:
* UIProcess/Plugins/PluginInfoStore.cpp:
(WebKit::PluginInfoStore::setAdditionalPluginsDirectories):
* UIProcess/Plugins/PluginInfoStore.h:
* UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
(WebKit::PluginInfoStore::getPluginInfo):
(WebKit::PluginInfoStore::getMIMETypeForExtension):
* UIProcess/WebBackForwardListItem.h:
(WebKit::WebBackForwardListItem::create):
(WebKit::WebBackForwardListItem::setOriginalURL):
(WebKit::WebBackForwardListItem::originalURL):
(WebKit::WebBackForwardListItem::setURL):
(WebKit::WebBackForwardListItem::url):
(WebKit::WebBackForwardListItem::setTitle):
(WebKit::WebBackForwardListItem::title):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
(WebKit::WebContext::setAdditionalPluginsDirectory):
* UIProcess/WebContext.h:
(WebKit::WebContext::injectedBundlePath):
* UIProcess/WebContextInjectedBundleClient.h:
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::didReceiveTitle):
* UIProcess/WebFrameProxy.h:
(WebKit::WebFrameProxy::url):
(WebKit::WebFrameProxy::provisionalURL):
* UIProcess/WebHistoryClient.h:
* UIProcess/WebLoaderClient.cpp:
(WebKit::WebLoaderClient::didReceiveTitleForFrame):
* UIProcess/WebLoaderClient.h:
* UIProcess/WebNavigationData.h:
(WebKit::WebNavigationData::title):
(WebKit::WebNavigationData::url):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::pageTitle):
(WebKit::WebPageProxy::toolTip):
(WebKit::WebPageProxy::urlAtProcessExit):
* UIProcess/WebPolicyClient.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::getPluginHostConnection):
* UIProcess/WebProcessProxy.h:
* UIProcess/WebUIClient.h:
* WebProcess/InjectedBundle/InjectedBundle.h:
(WebKit::InjectedBundle::create):
(WebKit::InjectedBundle::setSandboxToken):
* WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h:
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
(WebKit::InjectedBundlePageLoaderClient::willPerformClientRedirectForFrame):
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
* WebProcess/Plugins/NPRuntimeObjectMap.h:
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
* WebProcess/Plugins/Netscape/NetscapePluginModule.h:
* WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
(WebKit::NetscapePluginStream::start):
* WebProcess/Plugins/Netscape/NetscapePluginStream.h:
* WebProcess/Plugins/Plugin.h:
* WebProcess/Plugins/PluginController.h:
* WebProcess/Plugins/PluginView.h:
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebCoreSupport/WebContextMenuClient.h:
* WebProcess/WebCoreSupport/WebDragClient.h:
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::showCorrectionPanel):
* WebProcess/WebCoreSupport/WebEditorClient.h:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
* WebProcess/WebCoreSupport/WebInspectorClient.h:
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
* WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp:
(WebKit::WebSearchPopupMenu::saveRecentSearches):
(WebKit::WebSearchPopupMenu::loadRecentSearches):
* WebProcess/WebCoreSupport/WebSearchPopupMenu.h:
* WebProcess/WebPage/WebFrame.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::runJavaScriptInMainFrame):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::registerURLSchemeAsEmptyDocument):
* WebProcess/WebProcess.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67775 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1c2b850..e4f4b1b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,123 @@
2010-09-17 Sam Weinig <sam at webkit.org>
+ Rubber-stamped by Anders Carlsson.
+
+ Replace all uses of WTF::String and WTF::AtomicString with
+ String and AtomicString.
+
+ * Platform/Module.h:
+ * Shared/CommandLine.h:
+ (WebKit::CommandLine::operator[]):
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/WebEvent.h:
+ (WebKit::WebKeyboardEvent::WebKeyboardEvent):
+ (WebKit::WebKeyboardEvent::text):
+ (WebKit::WebKeyboardEvent::unmodifiedText):
+ (WebKit::WebKeyboardEvent::keyIdentifier):
+ (WebKit::WebKeyboardEvent::decode):
+ * Shared/WebNavigationDataStore.h:
+ * Shared/WebPreferencesStore.h:
+ * Shared/WebString.h:
+ (WebKit::WebString::create):
+ (WebKit::WebString::string):
+ (WebKit::WebString::WebString):
+ * Shared/WebURL.h:
+ (WebKit::WebURL::create):
+ (WebKit::WebURL::string):
+ (WebKit::WebURL::WebURL):
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit::toRef):
+ (WebKit::toURLRef):
+ (WebKit::toCopiedRef):
+ (WebKit::toCopiedURLRef):
+ (WebKit::toWTFString):
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextCreate):
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::nsStringFromWebCoreString):
+ * UIProcess/PageClient.h:
+ * UIProcess/Plugins/PluginInfoStore.cpp:
+ (WebKit::PluginInfoStore::setAdditionalPluginsDirectories):
+ * UIProcess/Plugins/PluginInfoStore.h:
+ * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+ (WebKit::PluginInfoStore::getPluginInfo):
+ (WebKit::PluginInfoStore::getMIMETypeForExtension):
+ * UIProcess/WebBackForwardListItem.h:
+ (WebKit::WebBackForwardListItem::create):
+ (WebKit::WebBackForwardListItem::setOriginalURL):
+ (WebKit::WebBackForwardListItem::originalURL):
+ (WebKit::WebBackForwardListItem::setURL):
+ (WebKit::WebBackForwardListItem::url):
+ (WebKit::WebBackForwardListItem::setTitle):
+ (WebKit::WebBackForwardListItem::title):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ (WebKit::WebContext::setAdditionalPluginsDirectory):
+ * UIProcess/WebContext.h:
+ (WebKit::WebContext::injectedBundlePath):
+ * UIProcess/WebContextInjectedBundleClient.h:
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::didReceiveTitle):
+ * UIProcess/WebFrameProxy.h:
+ (WebKit::WebFrameProxy::url):
+ (WebKit::WebFrameProxy::provisionalURL):
+ * UIProcess/WebHistoryClient.h:
+ * UIProcess/WebLoaderClient.cpp:
+ (WebKit::WebLoaderClient::didReceiveTitleForFrame):
+ * UIProcess/WebLoaderClient.h:
+ * UIProcess/WebNavigationData.h:
+ (WebKit::WebNavigationData::title):
+ (WebKit::WebNavigationData::url):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::pageTitle):
+ (WebKit::WebPageProxy::toolTip):
+ (WebKit::WebPageProxy::urlAtProcessExit):
+ * UIProcess/WebPolicyClient.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::getPluginHostConnection):
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/WebUIClient.h:
+ * WebProcess/InjectedBundle/InjectedBundle.h:
+ (WebKit::InjectedBundle::create):
+ (WebKit::InjectedBundle::setSandboxToken):
+ * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+ (WebKit::InjectedBundlePageLoaderClient::willPerformClientRedirectForFrame):
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
+ * WebProcess/Plugins/NPRuntimeObjectMap.h:
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/Netscape/NetscapePluginModule.h:
+ * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
+ (WebKit::NetscapePluginStream::start):
+ * WebProcess/Plugins/Netscape/NetscapePluginStream.h:
+ * WebProcess/Plugins/Plugin.h:
+ * WebProcess/Plugins/PluginController.h:
+ * WebProcess/Plugins/PluginView.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebCoreSupport/WebContextMenuClient.h:
+ * WebProcess/WebCoreSupport/WebDragClient.h:
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ (WebKit::WebEditorClient::showCorrectionPanel):
+ * WebProcess/WebCoreSupport/WebEditorClient.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebCoreSupport/WebInspectorClient.h:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+ * WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp:
+ (WebKit::WebSearchPopupMenu::saveRecentSearches):
+ (WebKit::WebSearchPopupMenu::loadRecentSearches):
+ * WebProcess/WebCoreSupport/WebSearchPopupMenu.h:
+ * WebProcess/WebPage/WebFrame.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::runJavaScriptInMainFrame):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::registerURLSchemeAsEmptyDocument):
+ * WebProcess/WebProcess.h:
+
+2010-09-17 Sam Weinig <sam at webkit.org>
+
Fix Windows and Qt builds.
* Shared/qt/PlatformCertificateInfo.h:
diff --git a/WebKit2/Platform/Module.h b/WebKit2/Platform/Module.h
index fe86b07..0825bf6 100644
--- a/WebKit2/Platform/Module.h
+++ b/WebKit2/Platform/Module.h
@@ -41,7 +41,7 @@ namespace WebKit {
class Module : public Noncopyable {
public:
- Module(const WTF::String& path);
+ Module(const String& path);
~Module();
bool load();
@@ -54,7 +54,7 @@ public:
private:
void* platformFunctionPointer(const char* functionName) const;
- WTF::String m_path;
+ String m_path;
#if PLATFORM(MAC)
RetainPtr<CFBundleRef> m_bundle;
#elif PLATFORM(WIN)
diff --git a/WebKit2/Shared/CommandLine.h b/WebKit2/Shared/CommandLine.h
index 4d621d9..f70601c 100644
--- a/WebKit2/Shared/CommandLine.h
+++ b/WebKit2/Shared/CommandLine.h
@@ -42,7 +42,7 @@ public:
#elif PLATFORM(WIN)
bool parse(LPTSTR commandLineString);
#endif
- WTF::String operator[](const WTF::String& key) const
+ String operator[](const String& key) const
{
return m_args.get(key);
}
@@ -50,7 +50,7 @@ public:
private:
bool m_parsedSuccessfully;
- HashMap<WTF::String, WTF::String> m_args;
+ HashMap<String, String> m_args;
};
}
diff --git a/WebKit2/Shared/WebCoreArgumentCoders.h b/WebKit2/Shared/WebCoreArgumentCoders.h
index 7847dc4..c9b7cab 100644
--- a/WebKit2/Shared/WebCoreArgumentCoders.h
+++ b/WebKit2/Shared/WebCoreArgumentCoders.h
@@ -44,8 +44,8 @@ template<> struct ArgumentCoder<WebCore::IntPoint> : SimpleArgumentCoder<WebCore
template<> struct ArgumentCoder<WebCore::IntSize> : SimpleArgumentCoder<WebCore::IntSize> { };
template<> struct ArgumentCoder<WebCore::IntRect> : SimpleArgumentCoder<WebCore::IntRect> { };
-template<> struct ArgumentCoder<WTF::String> {
- static void encode(ArgumentEncoder* encoder, const WTF::String& string)
+template<> struct ArgumentCoder<String> {
+ static void encode(ArgumentEncoder* encoder, const String& string)
{
// Special case the null string.
if (string.isNull()) {
@@ -58,7 +58,7 @@ template<> struct ArgumentCoder<WTF::String> {
encoder->encodeBytes(reinterpret_cast<const uint8_t*>(string.characters()), length * sizeof(UChar));
}
- static bool decode(ArgumentDecoder* decoder, WTF::String& s)
+ static bool decode(ArgumentDecoder* decoder, String& s)
{
uint32_t length;
if (!decoder->decode(length))
@@ -77,7 +77,7 @@ template<> struct ArgumentCoder<WTF::String> {
}
UChar* buffer;
- WTF::String string = WTF::String::createUninitialized(length, buffer);
+ String string = String::createUninitialized(length, buffer);
if (!decoder->decodeBytes(reinterpret_cast<uint8_t*>(buffer), length * sizeof(UChar)))
return false;
diff --git a/WebKit2/Shared/WebEvent.h b/WebKit2/Shared/WebEvent.h
index 57ef916..188703b 100644
--- a/WebKit2/Shared/WebEvent.h
+++ b/WebKit2/Shared/WebEvent.h
@@ -248,7 +248,7 @@ public:
{
}
- WebKeyboardEvent(Type type, const WTF::String& text, const WTF::String& unmodifiedText, const WTF::String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers modifiers, double timestamp)
+ WebKeyboardEvent(Type type, const String& text, const String& unmodifiedText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers modifiers, double timestamp)
: WebEvent(type, modifiers, timestamp)
, m_text(text)
, m_unmodifiedText(unmodifiedText)
@@ -262,9 +262,9 @@ public:
ASSERT(isKeyboardEventType(type));
}
- const WTF::String& text() const { return m_text; }
- const WTF::String& unmodifiedText() const { return m_unmodifiedText; }
- const WTF::String& keyIdentifier() const { return m_keyIdentifier; }
+ const String& text() const { return m_text; }
+ const String& unmodifiedText() const { return m_unmodifiedText; }
+ const String& keyIdentifier() const { return m_keyIdentifier; }
int32_t windowsVirtualKeyCode() const { return m_windowsVirtualKeyCode; }
int32_t nativeVirtualKeyCode() const { return m_nativeVirtualKeyCode; }
bool isAutoRepeat() const { return m_isAutoRepeat; }
@@ -290,17 +290,17 @@ public:
if (!WebEvent::decode(decoder, t))
return false;
- WTF::String text;
+ String text;
if (!decoder->decode(text))
return false;
t.m_text = text;
- WTF::String unmodifiedText;
+ String unmodifiedText;
if (!decoder->decode(unmodifiedText))
return false;
t.m_unmodifiedText = unmodifiedText;
- WTF::String keyIdentifier;
+ String keyIdentifier;
if (!decoder->decode(keyIdentifier))
return false;
t.m_keyIdentifier = keyIdentifier;
@@ -324,9 +324,9 @@ private:
return type == RawKeyDown || type == KeyDown || type == KeyUp || type == Char;
}
- WTF::String m_text;
- WTF::String m_unmodifiedText;
- WTF::String m_keyIdentifier;
+ String m_text;
+ String m_unmodifiedText;
+ String m_keyIdentifier;
int32_t m_windowsVirtualKeyCode;
int32_t m_nativeVirtualKeyCode;
bool m_isAutoRepeat;
diff --git a/WebKit2/Shared/WebNavigationDataStore.h b/WebKit2/Shared/WebNavigationDataStore.h
index 3a49cec..01fd429 100644
--- a/WebKit2/Shared/WebNavigationDataStore.h
+++ b/WebKit2/Shared/WebNavigationDataStore.h
@@ -50,8 +50,8 @@ struct WebNavigationDataStore {
}
// FIXME: Add the remaining items we want to track for history.
- WTF::String url;
- WTF::String title;
+ String url;
+ String title;
};
} // namespace WebKit
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index 6ecda58..dda6ebb 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -55,12 +55,12 @@ struct WebPreferencesStore {
uint32_t minimumLogicalFontSize;
uint32_t defaultFontSize;
uint32_t defaultFixedFontSize;
- WTF::String standardFontFamily;
- WTF::String cursiveFontFamily;
- WTF::String fantasyFontFamily;
- WTF::String fixedFontFamily;
- WTF::String sansSerifFontFamily;
- WTF::String serifFontFamily;
+ String standardFontFamily;
+ String cursiveFontFamily;
+ String fantasyFontFamily;
+ String fixedFontFamily;
+ String sansSerifFontFamily;
+ String serifFontFamily;
};
} // namespace WebKit
diff --git a/WebKit2/Shared/WebString.h b/WebKit2/Shared/WebString.h
index 5e69ce7..53a374a 100644
--- a/WebKit2/Shared/WebString.h
+++ b/WebKit2/Shared/WebString.h
@@ -38,7 +38,7 @@ class WebString : public APIObject {
public:
static const Type APIType = TypeString;
- static PassRefPtr<WebString> create(const WTF::String& string)
+ static PassRefPtr<WebString> create(const String& string)
{
return adoptRef(new WebString(string));
}
@@ -46,17 +46,17 @@ public:
bool isNull() const { return m_string.isNull(); }
bool isEmpty() const { return m_string.isEmpty(); }
- const WTF::String& string() const { return m_string; }
+ const String& string() const { return m_string; }
private:
- WebString(const WTF::String& string)
+ WebString(const String& string)
: m_string(string)
{
}
virtual Type type() const { return APIType; }
- WTF::String m_string;
+ String m_string;
};
} // namespace WebKit
diff --git a/WebKit2/Shared/WebURL.h b/WebKit2/Shared/WebURL.h
index 5d111fa..7b413e0 100644
--- a/WebKit2/Shared/WebURL.h
+++ b/WebKit2/Shared/WebURL.h
@@ -38,7 +38,7 @@ class WebURL : public APIObject {
public:
static const Type APIType = TypeURL;
- static PassRefPtr<WebURL> create(const WTF::String& string)
+ static PassRefPtr<WebURL> create(const String& string)
{
return adoptRef(new WebURL(string));
}
@@ -46,17 +46,17 @@ public:
bool isNull() const { return m_string.isNull(); }
bool isEmpty() const { return m_string.isEmpty(); }
- const WTF::String& string() const { return m_string; }
+ const String& string() const { return m_string; }
private:
- WebURL(const WTF::String& string)
+ WebURL(const String& string)
: m_string(string)
{
}
virtual Type type() const { return APIType; }
- WTF::String m_string;
+ String m_string;
};
} // namespace WebKit
diff --git a/WebKit2/UIProcess/API/C/WKAPICast.h b/WebKit2/UIProcess/API/C/WKAPICast.h
index 147b0fa..9b5283f 100644
--- a/WebKit2/UIProcess/API/C/WKAPICast.h
+++ b/WebKit2/UIProcess/API/C/WKAPICast.h
@@ -155,43 +155,43 @@ inline typename ImplTypeInfo<T>::APIType toRef(T t)
/* Special cases. */
-inline ProxyingRefPtr<WebString> toRef(WTF::StringImpl* string)
+inline ProxyingRefPtr<WebString> toRef(StringImpl* string)
{
- WTF::StringImpl* impl = string ? string : WTF::StringImpl::empty();
- return ProxyingRefPtr<WebString>(WebString::create(WTF::String(impl)));
+ StringImpl* impl = string ? string : StringImpl::empty();
+ return ProxyingRefPtr<WebString>(WebString::create(String(impl)));
}
-inline ProxyingRefPtr<WebURL> toURLRef(WTF::StringImpl* string)
+inline ProxyingRefPtr<WebURL> toURLRef(StringImpl* string)
{
- WTF::StringImpl* impl = string ? string : WTF::StringImpl::empty();
- return ProxyingRefPtr<WebURL>(WebURL::create(WTF::String(impl)));
+ StringImpl* impl = string ? string : StringImpl::empty();
+ return ProxyingRefPtr<WebURL>(WebURL::create(String(impl)));
}
-inline WKStringRef toCopiedRef(const WTF::String& string)
+inline WKStringRef toCopiedRef(const String& string)
{
- WTF::StringImpl* impl = string.impl() ? string.impl() : WTF::StringImpl::empty();
- RefPtr<WebString> webString = WebString::create(WTF::String(impl));
+ StringImpl* impl = string.impl() ? string.impl() : StringImpl::empty();
+ RefPtr<WebString> webString = WebString::create(String(impl));
return toRef(webString.release().releaseRef());
}
-inline WKURLRef toCopiedURLRef(const WTF::String& string)
+inline WKURLRef toCopiedURLRef(const String& string)
{
- WTF::StringImpl* impl = string.impl() ? string.impl() : WTF::StringImpl::empty();
- RefPtr<WebURL> webURL = WebURL::create(WTF::String(impl));
+ StringImpl* impl = string.impl() ? string.impl() : StringImpl::empty();
+ RefPtr<WebURL> webURL = WebURL::create(String(impl));
return toRef(webURL.release().releaseRef());
}
-inline WTF::String toWTFString(WKStringRef stringRef)
+inline String toWTFString(WKStringRef stringRef)
{
if (!stringRef)
- return WTF::String();
+ return String();
return toWK(stringRef)->string();
}
-inline WTF::String toWTFString(WKURLRef urlRef)
+inline String toWTFString(WKURLRef urlRef)
{
if (!urlRef)
- return WTF::String();
+ return String();
return toWK(urlRef)->string();
}
diff --git a/WebKit2/UIProcess/API/C/WKContext.cpp b/WebKit2/UIProcess/API/C/WKContext.cpp
index f19b3b1..3e24733 100644
--- a/WebKit2/UIProcess/API/C/WKContext.cpp
+++ b/WebKit2/UIProcess/API/C/WKContext.cpp
@@ -42,7 +42,7 @@ WKTypeID WKContextGetTypeID()
WKContextRef WKContextCreate()
{
- RefPtr<WebContext> context = WebContext::create(WTF::String());
+ RefPtr<WebContext> context = WebContext::create(String());
return toRef(context.release().releaseRef());
}
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.h b/WebKit2/UIProcess/API/mac/PageClientImpl.h
index d4123c5..a3b3350 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.h
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.h
@@ -36,7 +36,7 @@ namespace WebKit {
// NOTE: This does not use String::operator NSString*() since that function
// expects to be called on the thread running WebCore.
-NSString* nsStringFromWebCoreString(const WTF::String&);
+NSString* nsStringFromWebCoreString(const String&);
class PageClientImpl : public PageClient {
public:
@@ -49,7 +49,7 @@ private:
virtual void processDidExit();
virtual void processDidRevive();
virtual void takeFocus(bool direction);
- virtual void toolTipChanged(const WTF::String& oldToolTip, const WTF::String& newToolTip);
+ virtual void toolTipChanged(const String& oldToolTip, const String& newToolTip);
virtual void setCursor(const WebCore::Cursor&);
void registerEditCommand(PassRefPtr<WebEditCommandProxy>, UndoOrRedo);
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
index 051ae6c..de0204d 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -91,7 +91,7 @@ using namespace WebCore;
namespace WebKit {
-NSString* nsStringFromWebCoreString(const WTF::String& string)
+NSString* nsStringFromWebCoreString(const String& string)
{
return string.impl() ? HardAutorelease(WKStringCopyCFString(0, toRef(string.impl()))) : @"";
}
diff --git a/WebKit2/UIProcess/PageClient.h b/WebKit2/UIProcess/PageClient.h
index 1b04b9d..57e0fa4 100644
--- a/WebKit2/UIProcess/PageClient.h
+++ b/WebKit2/UIProcess/PageClient.h
@@ -44,7 +44,7 @@ public:
virtual void processDidRevive() = 0;
virtual void takeFocus(bool direction) = 0;
- virtual void toolTipChanged(const WTF::String&, const WTF::String&) = 0;
+ virtual void toolTipChanged(const String&, const String&) = 0;
virtual void setCursor(const WebCore::Cursor&) = 0;
diff --git a/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp b/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
index c1de12e..e55b00c 100644
--- a/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
+++ b/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
@@ -40,7 +40,7 @@ PluginInfoStore::PluginInfoStore()
{
}
-void PluginInfoStore::setAdditionalPluginsDirectories(const Vector<WTF::String>& directories)
+void PluginInfoStore::setAdditionalPluginsDirectories(const Vector<String>& directories)
{
m_additionalPluginsDirectories = directories;
refresh();
diff --git a/WebKit2/UIProcess/Plugins/PluginInfoStore.h b/WebKit2/UIProcess/Plugins/PluginInfoStore.h
index dcac5c2..173f05e 100644
--- a/WebKit2/UIProcess/Plugins/PluginInfoStore.h
+++ b/WebKit2/UIProcess/Plugins/PluginInfoStore.h
@@ -38,18 +38,18 @@ class PluginInfoStore {
public:
PluginInfoStore();
- void setAdditionalPluginsDirectories(const Vector<WTF::String>&);
+ void setAdditionalPluginsDirectories(const Vector<String>&);
void refresh();
void getPlugins(Vector<WebCore::PluginInfo>& plugins);
// Represents a single plug-in.
struct Plugin {
- WTF::String path;
+ String path;
WebCore::PluginInfo info;
#if PLATFORM(MAC)
cpu_type_t pluginArchitecture;
- WTF::String bundleIdentifier;
+ String bundleIdentifier;
unsigned versionNumber;
#endif
};
@@ -57,25 +57,25 @@ public:
// Returns the info for a plug-in that can handle the given MIME type.
// If the MIME type is null, the file extension of the given url will be used to infer the
// plug-in type. In that case, mimeType will be filled in with the right MIME type.
- Plugin findPlugin(WTF::String& mimeType, const WebCore::KURL& url);
+ Plugin findPlugin(String& mimeType, const WebCore::KURL& url);
private:
- Plugin findPluginForMIMEType(const WTF::String& mimeType);
- Plugin findPluginForExtension(const WTF::String& extension, WTF::String& mimeType);
+ Plugin findPluginForMIMEType(const String& mimeType);
+ Plugin findPluginForExtension(const String& extension, String& mimeType);
void loadPluginsIfNecessary();
- void loadPluginsInDirectory(const WTF::String& directory);
- void loadPlugin(const WTF::String& pluginPath);
+ void loadPluginsInDirectory(const String& directory);
+ void loadPlugin(const String& pluginPath);
// Platform specific member functions.
- static Vector<WTF::String> pluginsDirectories();
- static Vector<WTF::String> pluginPathsInDirectory(const WTF::String& directory);
- static bool getPluginInfo(const WTF::String& pluginPath, Plugin& plugin);
+ static Vector<String> pluginsDirectories();
+ static Vector<String> pluginPathsInDirectory(const String& directory);
+ static bool getPluginInfo(const String& pluginPath, Plugin& plugin);
static bool shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins);
- static WTF::String getMIMETypeForExtension(const WTF::String& extension);
+ static String getMIMETypeForExtension(const String& extension);
- Vector<WTF::String> m_additionalPluginsDirectories;
+ Vector<String> m_additionalPluginsDirectories;
Vector<Plugin> m_plugins;
bool m_pluginListIsUpToDate;
};
diff --git a/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm b/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
index e5a89cb..947226f 100644
--- a/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
+++ b/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
@@ -313,7 +313,7 @@ static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& plu
return true;
}
-bool PluginInfoStore::getPluginInfo(const WTF::String& pluginPath, Plugin& plugin)
+bool PluginInfoStore::getPluginInfo(const String& pluginPath, Plugin& plugin)
{
RetainPtr<CFStringRef> bundlePath(AdoptCF, safeCreateCFString(pluginPath));
RetainPtr<CFURLRef> bundleURL(AdoptCF, CFURLCreateWithFileSystemPath(kCFAllocatorDefault, bundlePath.get(), kCFURLPOSIXPathStyle, false));
@@ -371,7 +371,7 @@ bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>
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 WTF::String
+ // strength reduced into the callsite once we can safely convert String
// to CFStringRef off the main thread.
RetainPtr<CFStringRef> extensionCFString(AdoptCF, safeCreateCFString(extension));
diff --git a/WebKit2/UIProcess/WebBackForwardListItem.h b/WebKit2/UIProcess/WebBackForwardListItem.h
index dcbb398..b4c2357 100644
--- a/WebKit2/UIProcess/WebBackForwardListItem.h
+++ b/WebKit2/UIProcess/WebBackForwardListItem.h
@@ -38,7 +38,7 @@ class WebBackForwardListItem : public APIObject {
public:
static const Type APIType = TypeBackForwardListItem;
- static PassRefPtr<WebBackForwardListItem> create(const WTF::String& originalURL, const WTF::String& url, const WTF::String& title, uint64_t itemID)
+ static PassRefPtr<WebBackForwardListItem> create(const String& originalURL, const String& url, const String& title, uint64_t itemID)
{
return adoptRef(new WebBackForwardListItem(originalURL, url, title, itemID));
}
@@ -46,23 +46,23 @@ public:
uint64_t itemID() const { return m_itemID; }
- void setOriginalURL(const WTF::String& originalURL) { m_originalURL = originalURL; }
- const WTF::String& originalURL() const { return m_originalURL; }
+ void setOriginalURL(const String& originalURL) { m_originalURL = originalURL; }
+ const String& originalURL() const { return m_originalURL; }
- void setURL(const WTF::String& url) { m_url = url; }
- const WTF::String& url() const { return m_url; }
+ void setURL(const String& url) { m_url = url; }
+ const String& url() const { return m_url; }
- void setTitle(const WTF::String& title) { m_title = title; }
- const WTF::String& title() const { return m_title; }
+ void setTitle(const String& title) { m_title = title; }
+ const String& title() const { return m_title; }
private:
- WebBackForwardListItem(const WTF::String& originalURL, const WTF::String& url, const WTF::String& title, uint64_t itemID);
+ WebBackForwardListItem(const String& originalURL, const String& url, const String& title, uint64_t itemID);
virtual Type type() const { return APIType; }
- WTF::String m_originalURL;
- WTF::String m_url;
- WTF::String m_title;
+ String m_originalURL;
+ String m_url;
+ String m_title;
uint64_t m_itemID;
};
diff --git a/WebKit2/UIProcess/WebContext.cpp b/WebKit2/UIProcess/WebContext.cpp
index 8be90c9..280e091 100644
--- a/WebKit2/UIProcess/WebContext.cpp
+++ b/WebKit2/UIProcess/WebContext.cpp
@@ -75,7 +75,7 @@ PassRefPtr<WebContext> WebContext::create(const String& injectedBundlePath)
return adoptRef(new WebContext(ProcessModelSecondaryProcess, injectedBundlePath));
}
-WebContext::WebContext(ProcessModel processModel, const WTF::String& injectedBundlePath)
+WebContext::WebContext(ProcessModel processModel, const String& injectedBundlePath)
: m_processModel(processModel)
, m_injectedBundlePath(injectedBundlePath)
, m_visitedLinkProvider(this)
@@ -266,7 +266,7 @@ void WebContext::getStatistics(WKContextStatistics* statistics)
(*it)->getStatistics(statistics);
}
-void WebContext::setAdditionalPluginsDirectory(const WTF::String& directory)
+void WebContext::setAdditionalPluginsDirectory(const String& directory)
{
Vector<String> directories;
directories.append(directory);
diff --git a/WebKit2/UIProcess/WebContext.h b/WebKit2/UIProcess/WebContext.h
index 02583e4..2aef3d4 100644
--- a/WebKit2/UIProcess/WebContext.h
+++ b/WebKit2/UIProcess/WebContext.h
@@ -56,7 +56,7 @@ public:
static WebContext* sharedProcessContext();
static WebContext* sharedThreadContext();
- static PassRefPtr<WebContext> create(const WTF::String& injectedBundlePath);
+ static PassRefPtr<WebContext> create(const String& injectedBundlePath);
~WebContext();
@@ -79,9 +79,9 @@ public:
WebPreferences* preferences() const;
void preferencesDidChange();
- const WTF::String& injectedBundlePath() const { return m_injectedBundlePath; }
+ const String& injectedBundlePath() const { return m_injectedBundlePath; }
- void postMessageToInjectedBundle(const WTF::String&, APIObject*);
+ void postMessageToInjectedBundle(const String&, APIObject*);
// InjectedBundle client
void didReceiveMessageFromInjectedBundle(const String&, APIObject*);
@@ -89,20 +89,20 @@ public:
// History client
void didNavigateWithNavigationData(WebFrameProxy*, const WebNavigationDataStore&);
- void didPerformClientRedirect(WebFrameProxy*, const WTF::String& sourceURLString, const WTF::String& destinationURLString);
- void didPerformServerRedirect(WebFrameProxy*, const WTF::String& sourceURLString, const WTF::String& destinationURLString);
- void didUpdateHistoryTitle(WebFrameProxy*, const WTF::String& title, const WTF::String& url);
+ void didPerformClientRedirect(WebFrameProxy*, const String& sourceURLString, const String& destinationURLString);
+ void didPerformServerRedirect(WebFrameProxy*, const String& sourceURLString, const String& destinationURLString);
+ void didUpdateHistoryTitle(WebFrameProxy*, const String& title, const String& url);
void populateVisitedLinks();
void getStatistics(WKContextStatistics* statistics);
- void setAdditionalPluginsDirectory(const WTF::String&);
+ void setAdditionalPluginsDirectory(const String&);
PluginInfoStore* pluginInfoStore() { return &m_pluginInfoStore; }
- WTF::String applicationCacheDirectory();
+ String applicationCacheDirectory();
- void registerURLSchemeAsEmptyDocument(const WTF::String&);
+ void registerURLSchemeAsEmptyDocument(const String&);
- void addVisitedLink(const WTF::String&);
+ void addVisitedLink(const String&);
void addVisitedLink(WebCore::LinkHash);
void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
@@ -113,7 +113,7 @@ public:
#endif
private:
- WebContext(ProcessModel, const WTF::String& injectedBundlePath);
+ WebContext(ProcessModel, const String& injectedBundlePath);
virtual Type type() const { return APIType; }
@@ -129,7 +129,7 @@ private:
HashSet<WebPageNamespace*> m_pageNamespaces;
RefPtr<WebPreferences> m_preferences;
- WTF::String m_injectedBundlePath;
+ String m_injectedBundlePath;
WebContextInjectedBundleClient m_injectedBundleClient;
WebHistoryClient m_historyClient;
@@ -137,7 +137,7 @@ private:
PluginInfoStore m_pluginInfoStore;
VisitedLinkProvider m_visitedLinkProvider;
- HashSet<WTF::String> m_schemesToRegisterAsEmptyDocument;
+ HashSet<String> m_schemesToRegisterAsEmptyDocument;
Vector<pair<String, RefPtr<APIObject> > > m_pendingMessagesToPostToInjectedBundle;
#if PLATFORM(WIN)
diff --git a/WebKit2/UIProcess/WebContextInjectedBundleClient.h b/WebKit2/UIProcess/WebContextInjectedBundleClient.h
index 89cceb5..0a93187 100644
--- a/WebKit2/UIProcess/WebContextInjectedBundleClient.h
+++ b/WebKit2/UIProcess/WebContextInjectedBundleClient.h
@@ -39,7 +39,7 @@ public:
WebContextInjectedBundleClient();
void initialize(const WKContextInjectedBundleClient*);
- void didReceiveMessageFromInjectedBundle(WebContext*, const WTF::String&, APIObject*);
+ void didReceiveMessageFromInjectedBundle(WebContext*, const String&, APIObject*);
void didReceiveSynchronousMessageFromInjectedBundle(WebContext*, const String&, APIObject*, RefPtr<APIObject>& returnData);
private:
diff --git a/WebKit2/UIProcess/WebFrameProxy.cpp b/WebKit2/UIProcess/WebFrameProxy.cpp
index c382915..30e0b79 100644
--- a/WebKit2/UIProcess/WebFrameProxy.cpp
+++ b/WebKit2/UIProcess/WebFrameProxy.cpp
@@ -94,7 +94,7 @@ void WebFrameProxy::didFinishLoad()
m_loadState = LoadStateFinished;
}
-void WebFrameProxy::didReceiveTitle(const WTF::String&)
+void WebFrameProxy::didReceiveTitle(const String&)
{
}
diff --git a/WebKit2/UIProcess/WebFrameProxy.h b/WebKit2/UIProcess/WebFrameProxy.h
index 72839e5..80a1110 100644
--- a/WebKit2/UIProcess/WebFrameProxy.h
+++ b/WebKit2/UIProcess/WebFrameProxy.h
@@ -71,8 +71,8 @@ public:
bool isMainFrame() const;
LoadState loadState() const { return m_loadState; }
- const WTF::String& url() const { return m_url; }
- const WTF::String& provisionalURL() const { return m_provisionalURL; }
+ const String& url() const { return m_url; }
+ const String& provisionalURL() const { return m_provisionalURL; }
void setCertificateInfo(PassRefPtr<WebCertificateInfo>);
WebCertificateInfo* certificateInfo() const { return m_certificateInfo.get(); }
@@ -81,7 +81,7 @@ public:
void didReceiveServerRedirectForProvisionalLoad(const String& url);
void didCommitLoad();
void didFinishLoad();
- void didReceiveTitle(const WTF::String&);
+ void didReceiveTitle(const String&);
void receivedPolicyDecision(WebCore::PolicyAction, uint64_t listenerID);
WebFramePolicyListenerProxy* setUpPolicyListenerProxy(uint64_t listenerID);
@@ -94,8 +94,8 @@ private:
WebPageProxy* m_page;
LoadState m_loadState;
- WTF::String m_url;
- WTF::String m_provisionalURL;
+ String m_url;
+ String m_provisionalURL;
RefPtr<WebCertificateInfo> m_certificateInfo;
RefPtr<WebFrameListenerProxy> m_activeListener;
uint64_t m_frameID;
diff --git a/WebKit2/UIProcess/WebHistoryClient.h b/WebKit2/UIProcess/WebHistoryClient.h
index 18292f6..5a189cf 100644
--- a/WebKit2/UIProcess/WebHistoryClient.h
+++ b/WebKit2/UIProcess/WebHistoryClient.h
@@ -42,9 +42,9 @@ public:
void initialize(const WKContextHistoryClient*);
void didNavigateWithNavigationData(WebContext*, WebPageProxy*, const WebNavigationDataStore&, WebFrameProxy*);
- void didPerformClientRedirect(WebContext*, WebPageProxy*, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy*);
- void didPerformServerRedirect(WebContext*, WebPageProxy*, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy*);
- void didUpdateHistoryTitle(WebContext*, WebPageProxy*, const WTF::String& title, const WTF::String& url, WebFrameProxy*);
+ void didPerformClientRedirect(WebContext*, WebPageProxy*, const String& sourceURL, const String& destinationURL, WebFrameProxy*);
+ void didPerformServerRedirect(WebContext*, WebPageProxy*, const String& sourceURL, const String& destinationURL, WebFrameProxy*);
+ void didUpdateHistoryTitle(WebContext*, WebPageProxy*, const String& title, const String& url, WebFrameProxy*);
void populateVisitedLinks(WebContext*);
bool shouldTrackVisitedLinks() const { return m_contextHistoryClient.populateVisitedLinks; }
diff --git a/WebKit2/UIProcess/WebLoaderClient.cpp b/WebKit2/UIProcess/WebLoaderClient.cpp
index a55bb35..e5a0cfe 100644
--- a/WebKit2/UIProcess/WebLoaderClient.cpp
+++ b/WebKit2/UIProcess/WebLoaderClient.cpp
@@ -85,7 +85,7 @@ void WebLoaderClient::didFailLoadWithErrorForFrame(WebPageProxy* page, WebFrameP
m_pageLoaderClient.didFailLoadWithErrorForFrame(toRef(page), toRef(frame), m_pageLoaderClient.clientInfo);
}
-void WebLoaderClient::didReceiveTitleForFrame(WebPageProxy* page, WTF::StringImpl* title, WebFrameProxy* frame)
+void WebLoaderClient::didReceiveTitleForFrame(WebPageProxy* page, StringImpl* title, WebFrameProxy* frame)
{
if (m_pageLoaderClient.didReceiveTitleForFrame)
m_pageLoaderClient.didReceiveTitleForFrame(toRef(page), toRef(title), toRef(frame), m_pageLoaderClient.clientInfo);
diff --git a/WebKit2/UIProcess/WebLoaderClient.h b/WebKit2/UIProcess/WebLoaderClient.h
index 5d3fc79..fa7a935 100644
--- a/WebKit2/UIProcess/WebLoaderClient.h
+++ b/WebKit2/UIProcess/WebLoaderClient.h
@@ -46,7 +46,7 @@ public:
void didFinishDocumentLoadForFrame(WebPageProxy*, WebFrameProxy*);
void didFinishLoadForFrame(WebPageProxy*, WebFrameProxy*);
void didFailLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*);
- void didReceiveTitleForFrame(WebPageProxy*, WTF::StringImpl*, WebFrameProxy*);
+ void didReceiveTitleForFrame(WebPageProxy*, StringImpl*, WebFrameProxy*);
void didFirstLayoutForFrame(WebPageProxy*, WebFrameProxy*);
void didFirstVisuallyNonEmptyLayoutForFrame(WebPageProxy*, WebFrameProxy*);
void didStartProgress(WebPageProxy*);
diff --git a/WebKit2/UIProcess/WebNavigationData.h b/WebKit2/UIProcess/WebNavigationData.h
index 3b48977..608e18f 100644
--- a/WebKit2/UIProcess/WebNavigationData.h
+++ b/WebKit2/UIProcess/WebNavigationData.h
@@ -42,8 +42,8 @@ public:
}
~WebNavigationData();
- WTF::String title() const { return m_store.title; }
- WTF::String url() const { return m_store.url; }
+ String title() const { return m_store.title; }
+ String url() const { return m_store.url; }
private:
WebNavigationData(const WebNavigationDataStore&);
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index ffc51c7..ed7f78a 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -77,9 +77,9 @@ class WebURLRequest;
class WebWheelEvent;
struct WebNavigationDataStore;
-typedef GenericCallback<WKStringRef, WTF::StringImpl*> FrameSourceCallback;
-typedef GenericCallback<WKStringRef, WTF::StringImpl*> RenderTreeExternalRepresentationCallback;
-typedef GenericCallback<WKStringRef, WTF::StringImpl*> ScriptReturnValueCallback;
+typedef GenericCallback<WKStringRef, StringImpl*> FrameSourceCallback;
+typedef GenericCallback<WKStringRef, StringImpl*> RenderTreeExternalRepresentationCallback;
+typedef GenericCallback<WKStringRef, StringImpl*> ScriptReturnValueCallback;
class WebPageProxy : public APIObject {
public:
@@ -112,7 +112,7 @@ public:
bool tryClose();
bool isClosed() const { return m_closed; }
- void loadURL(const WTF::String&);
+ void loadURL(const String&);
void loadURLRequest(WebURLRequest*);
void stopLoading();
@@ -142,8 +142,8 @@ public:
void touchEvent(const WebTouchEvent&);
#endif
- const WTF::String& pageTitle() const { return m_pageTitle; }
- const WTF::String& toolTip() const { return m_toolTip; }
+ const String& pageTitle() const { return m_pageTitle; }
+ const String& toolTip() const { return m_toolTip; }
double estimatedProgress() const { return m_estimatedProgress; }
@@ -160,7 +160,7 @@ public:
void setPageZoomFactor(double);
void setPageAndTextZoomFactors(double pageZoomFactor, double textZoomFactor);
- void runJavaScriptInMainFrame(const WTF::String&, PassRefPtr<ScriptReturnValueCallback>);
+ void runJavaScriptInMainFrame(const String&, PassRefPtr<ScriptReturnValueCallback>);
void getRenderTreeExternalRepresentation(PassRefPtr<RenderTreeExternalRepresentationCallback>);
void getSourceForFrame(WebFrameProxy*, PassRefPtr<FrameSourceCallback>);
@@ -190,7 +190,7 @@ public:
bool isValid();
// REMOVE: For demo purposes only.
- const WTF::String& urlAtProcessExit() const { return m_urlAtProcessExit; }
+ const String& urlAtProcessExit() const { return m_urlAtProcessExit; }
void preferencesDidChange();
@@ -211,25 +211,25 @@ private:
void didFinishDocumentLoadForFrame(WebFrameProxy*);
void didFinishLoadForFrame(WebFrameProxy*);
void didFailLoadForFrame(WebFrameProxy*);
- void didReceiveTitleForFrame(WebFrameProxy*, const WTF::String&);
+ void didReceiveTitleForFrame(WebFrameProxy*, const String&);
void didFirstLayoutForFrame(WebFrameProxy*);
void didFirstVisuallyNonEmptyLayoutForFrame(WebFrameProxy*);
void didStartProgress();
void didChangeProgress(double);
void didFinishProgress();
- void decidePolicyForNavigationAction(WebFrameProxy*, WebCore::NavigationType navigationType, WebEvent::Modifiers modifiers, const WTF::String& url, uint64_t listenerID);
- void decidePolicyForNewWindowAction(WebFrameProxy*, WebCore::NavigationType navigationType, WebEvent::Modifiers modifiers, const WTF::String& url, uint64_t listenerID);
- void decidePolicyForMIMEType(WebFrameProxy*, const WTF::String& MIMEType, const WTF::String& url, uint64_t listenerID);
+ void decidePolicyForNavigationAction(WebFrameProxy*, WebCore::NavigationType navigationType, WebEvent::Modifiers modifiers, const String& url, uint64_t listenerID);
+ void decidePolicyForNewWindowAction(WebFrameProxy*, WebCore::NavigationType navigationType, WebEvent::Modifiers modifiers, const String& url, uint64_t listenerID);
+ void decidePolicyForMIMEType(WebFrameProxy*, const String& MIMEType, const String& url, uint64_t listenerID);
- void willSubmitForm(WebFrameProxy* frame, WebFrameProxy* frameSource, Vector<std::pair<WTF::String, WTF::String> >& textFieldValues, APIObject* userData, uint64_t listenerID);
+ void willSubmitForm(WebFrameProxy* frame, WebFrameProxy* frameSource, Vector<std::pair<String, String> >& textFieldValues, APIObject* userData, uint64_t listenerID);
PassRefPtr<WebPageProxy> createNewPage();
void showPage();
void closePage();
- void runJavaScriptAlert(WebFrameProxy*, const WTF::String&);
- bool runJavaScriptConfirm(WebFrameProxy* frame, const WTF::String&);
- WTF::String runJavaScriptPrompt(WebFrameProxy* frame, const WTF::String&, const WTF::String&);
+ void runJavaScriptAlert(WebFrameProxy*, const String&);
+ bool runJavaScriptConfirm(WebFrameProxy* frame, const String&);
+ String runJavaScriptPrompt(WebFrameProxy* frame, const String&, const String&);
void setStatusText(const String&);
void contentsSizeChanged(WebFrameProxy*, const WebCore::IntSize&);
@@ -242,13 +242,13 @@ private:
void clearAllEditCommands();
void takeFocus(bool direction);
- void setToolTip(const WTF::String&);
+ void setToolTip(const String&);
void setCursor(const WebCore::Cursor&);
void didReceiveEvent(WebEvent::Type);
- void didRunJavaScriptInMainFrame(const WTF::String&, uint64_t);
- void didGetRenderTreeExternalRepresentation(const WTF::String&, uint64_t);
+ void didRunJavaScriptInMainFrame(const String&, uint64_t);
+ void didGetRenderTreeExternalRepresentation(const String&, uint64_t);
void didGetSourceForFrame(const String&, uint64_t);
#if USE(ACCELERATED_COMPOSITING)
@@ -264,7 +264,7 @@ private:
OwnPtr<DrawingAreaProxy> m_drawingArea;
RefPtr<WebPageNamespace> m_pageNamespace;
RefPtr<WebFrameProxy> m_mainFrame;
- WTF::String m_pageTitle;
+ String m_pageTitle;
HashMap<uint64_t, RefPtr<ScriptReturnValueCallback> > m_scriptReturnValueCallbacks;
HashMap<uint64_t, RefPtr<RenderTreeExternalRepresentationCallback> > m_renderTreeExternalRepresentationCallbacks;
@@ -281,10 +281,10 @@ private:
bool m_canGoForward;
RefPtr<WebBackForwardList> m_backForwardList;
- WTF::String m_toolTip;
+ String m_toolTip;
// REMOVE: For demo purposes only.
- WTF::String m_urlAtProcessExit;
+ String m_urlAtProcessExit;
double m_textZoomFactor;
double m_pageZoomFactor;
diff --git a/WebKit2/UIProcess/WebPolicyClient.h b/WebKit2/UIProcess/WebPolicyClient.h
index c0c04f2..686919c 100644
--- a/WebKit2/UIProcess/WebPolicyClient.h
+++ b/WebKit2/UIProcess/WebPolicyClient.h
@@ -42,9 +42,9 @@ public:
WebPolicyClient();
void initialize(const WKPagePolicyClient*);
- bool decidePolicyForNavigationAction(WebPageProxy*, WebCore::NavigationType, WebEvent::Modifiers, const WTF::String& url, WebFrameProxy*, WebFramePolicyListenerProxy*);
- bool decidePolicyForNewWindowAction(WebPageProxy*, WebCore::NavigationType, WebEvent::Modifiers, const WTF::String& url, WebFrameProxy*, WebFramePolicyListenerProxy*);
- bool decidePolicyForMIMEType(WebPageProxy*, const WTF::String&, const WTF::String& url, WebFrameProxy*, WebFramePolicyListenerProxy*);
+ bool decidePolicyForNavigationAction(WebPageProxy*, WebCore::NavigationType, WebEvent::Modifiers, const String& url, WebFrameProxy*, WebFramePolicyListenerProxy*);
+ bool decidePolicyForNewWindowAction(WebPageProxy*, WebCore::NavigationType, WebEvent::Modifiers, const String& url, WebFrameProxy*, WebFramePolicyListenerProxy*);
+ bool decidePolicyForMIMEType(WebPageProxy*, const String&, const String& url, WebFrameProxy*, WebFramePolicyListenerProxy*);
private:
WKPagePolicyClient m_pagePolicyClient;
diff --git a/WebKit2/UIProcess/WebProcessProxy.cpp b/WebKit2/UIProcess/WebProcessProxy.cpp
index 52f42a8..2921087 100644
--- a/WebKit2/UIProcess/WebProcessProxy.cpp
+++ b/WebKit2/UIProcess/WebProcessProxy.cpp
@@ -205,7 +205,7 @@ void WebProcessProxy::getPlugins(bool refresh, Vector<PluginInfo>& plugins)
m_context->pluginInfoStore()->getPlugins(plugins);
}
-void WebProcessProxy::getPluginHostConnection(const String& mimeType, const KURL& url, WTF::String& pluginPath)
+void WebProcessProxy::getPluginHostConnection(const String& mimeType, const KURL& url, String& pluginPath)
{
String newMimeType = mimeType.lower();
diff --git a/WebKit2/UIProcess/WebProcessProxy.h b/WebKit2/UIProcess/WebProcessProxy.h
index e337a9d..3a0b178 100644
--- a/WebKit2/UIProcess/WebProcessProxy.h
+++ b/WebKit2/UIProcess/WebProcessProxy.h
@@ -105,9 +105,9 @@ private:
bool sendMessage(CoreIPC::MessageID, PassOwnPtr<CoreIPC::ArgumentEncoder>);
void getPlugins(bool refresh, Vector<WebCore::PluginInfo>&);
- void getPluginHostConnection(const WTF::String& mimeType, const WebCore::KURL& url, WTF::String& pluginPath);
+ void getPluginHostConnection(const String& mimeType, const WebCore::KURL& url, String& pluginPath);
- void addOrUpdateBackForwardListItem(uint64_t itemID, const WTF::String& originalURLString, const WTF::String& urlString, const WTF::String& title);
+ void addOrUpdateBackForwardListItem(uint64_t itemID, const String& originalURLString, const String& urlString, const String& title);
void addVisitedLink(WebCore::LinkHash);
// CoreIPC::Connection::Client
diff --git a/WebKit2/UIProcess/WebUIClient.h b/WebKit2/UIProcess/WebUIClient.h
index 22cc87d..33fe839 100644
--- a/WebKit2/UIProcess/WebUIClient.h
+++ b/WebKit2/UIProcess/WebUIClient.h
@@ -47,9 +47,9 @@ public:
PassRefPtr<WebPageProxy> createNewPage(WebPageProxy*);
void showPage(WebPageProxy*);
void close(WebPageProxy*);
- void runJavaScriptAlert(WebPageProxy*, const WTF::String&, WebFrameProxy*);
- bool runJavaScriptConfirm(WebPageProxy*, const WTF::String&, WebFrameProxy*);
- WTF::String runJavaScriptPrompt(WebPageProxy*, const WTF::String&, const WTF::String&, WebFrameProxy*);
+ void runJavaScriptAlert(WebPageProxy*, const String&, WebFrameProxy*);
+ bool runJavaScriptConfirm(WebPageProxy*, const String&, WebFrameProxy*);
+ String runJavaScriptPrompt(WebPageProxy*, const String&, const String&, WebFrameProxy*);
void setStatusText(WebPageProxy*, const String&);
void contentsSizeChanged(WebPageProxy*, const WebCore::IntSize&, WebFrameProxy*);
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
index c9eb5ee..f540db9 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
@@ -61,7 +61,7 @@ class InjectedBundle : public APIObject {
public:
static const Type APIType = TypeBundle;
- static PassRefPtr<InjectedBundle> create(const WTF::String& path)
+ static PassRefPtr<InjectedBundle> create(const String& path)
{
return adoptRef(new InjectedBundle(path));
}
@@ -70,7 +70,7 @@ public:
bool load();
#if ENABLE(WEB_PROCESS_SANDBOX)
- void setSandboxToken(const WTF::String& sandboxToken) { m_sandboxToken = sandboxToken; }
+ void setSandboxToken(const String& sandboxToken) { m_sandboxToken = sandboxToken; }
#endif
// API
@@ -101,20 +101,20 @@ public:
// Callback hooks
void didCreatePage(WebPage*);
void willDestroyPage(WebPage*);
- void didReceiveMessage(const WTF::String&, APIObject*);
+ void didReceiveMessage(const String&, APIObject*);
void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
private:
- InjectedBundle(const WTF::String&);
+ InjectedBundle(const String&);
virtual Type type() const { return APIType; }
- WTF::String m_path;
+ String m_path;
PlatformBundle m_platformBundle; // This is leaked right now, since we never unload the bundle/module.
#if ENABLE(WEB_PROCESS_SANDBOX)
- WTF::String m_sandboxToken;
+ String m_sandboxToken;
#endif
WKBundleClient m_client;
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h
index 84dbfbc..33df826 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h
@@ -50,14 +50,14 @@ public:
bool shouldBeginEditing(WebPage*, WebCore::Range*);
bool shouldEndEditing(WebPage*, WebCore::Range*);
bool shouldInsertNode(WebPage*, WebCore::Node*, WebCore::Range* rangeToReplace, WebCore::EditorInsertAction);
- bool shouldInsertText(WebPage*, WTF::StringImpl*, WebCore::Range* rangeToReplace, WebCore::EditorInsertAction);
+ bool shouldInsertText(WebPage*, StringImpl*, WebCore::Range* rangeToReplace, WebCore::EditorInsertAction);
bool shouldDeleteRange(WebPage*, WebCore::Range*);
bool shouldChangeSelectedRange(WebPage*, WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity affinity, bool stillSelecting);
bool shouldApplyStyle(WebPage*, WebCore::CSSStyleDeclaration*, WebCore::Range*);
- void didBeginEditing(WebPage*, WTF::StringImpl* notificationName);
- void didEndEditing(WebPage*, WTF::StringImpl* notificationName);
- void didChange(WebPage*, WTF::StringImpl* notificationName);
- void didChangeSelection(WebPage*, WTF::StringImpl* notificationName);
+ void didBeginEditing(WebPage*, StringImpl* notificationName);
+ void didEndEditing(WebPage*, StringImpl* notificationName);
+ void didChange(WebPage*, StringImpl* notificationName);
+ void didChangeSelection(WebPage*, StringImpl* notificationName);
private:
WKBundlePageEditorClient m_client;
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
index 8ddf9bb..b47cede 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
@@ -107,7 +107,7 @@ void InjectedBundlePageLoaderClient::didCancelClientRedirectForFrame(WebPage* pa
m_client.didCancelClientRedirectForFrame(toRef(page), toRef(frame), m_client.clientInfo);
}
-void InjectedBundlePageLoaderClient::willPerformClientRedirectForFrame(WebPage* page, WebFrame* frame, const WTF::String& url, double delay, double date)
+void InjectedBundlePageLoaderClient::willPerformClientRedirectForFrame(WebPage* page, WebFrame* frame, const String& url, double delay, double date)
{
if (m_client.willPerformClientRedirectForFrame)
m_client.willPerformClientRedirectForFrame(toRef(page), toRef(frame), toURLRef(url.impl()), delay, date, m_client.clientInfo);
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
index 0f547c5..84dbb1b 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
@@ -51,10 +51,10 @@ public:
void didFinishDocumentLoadForFrame(WebPage*, WebFrame*);
void didFinishLoadForFrame(WebPage*, WebFrame*);
void didFailLoadWithErrorForFrame(WebPage*, WebFrame*);
- void didReceiveTitleForFrame(WebPage*, const WTF::String&, WebFrame*);
+ void didReceiveTitleForFrame(WebPage*, const String&, WebFrame*);
void didClearWindowObjectForFrame(WebPage*, WebFrame*, WebCore::DOMWrapperWorld*);
void didCancelClientRedirectForFrame(WebPage*, WebFrame*);
- void willPerformClientRedirectForFrame(WebPage*, WebFrame*, const WTF::String& url, double delay, double date);
+ void willPerformClientRedirectForFrame(WebPage*, WebFrame*, const String& url, double delay, double date);
void didChangeLocationWithinPageForFrame(WebPage*, WebFrame*);
void didHandleOnloadEventsForFrame(WebPage*, WebFrame*);
void didDisplayInsecureContentForFrame(WebPage*, WebFrame*);
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h
index e0e9d85..da862e2 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h
@@ -39,11 +39,11 @@ public:
InjectedBundlePageUIClient();
void initialize(WKBundlePageUIClient*);
- void willAddMessageToConsole(WebPage*, const WTF::String& message, int32_t lineNumber);
- void willSetStatusbarText(WebPage*, const WTF::String&);
- void willRunJavaScriptAlert(WebPage*, const WTF::String&, WebFrame*);
- void willRunJavaScriptConfirm(WebPage*, const WTF::String&, WebFrame*);
- void willRunJavaScriptPrompt(WebPage*, const WTF::String&, const WTF::String&, WebFrame*);
+ void willAddMessageToConsole(WebPage*, const String& message, int32_t lineNumber);
+ void willSetStatusbarText(WebPage*, const String&);
+ void willRunJavaScriptAlert(WebPage*, const String&, WebFrame*);
+ void willRunJavaScriptConfirm(WebPage*, const String&, WebFrame*);
+ void willRunJavaScriptPrompt(WebPage*, const String&, const String&, WebFrame*);
private:
WKBundlePageUIClient m_client;
diff --git a/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h b/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h
index 19233b4..a11c354 100644
--- a/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h
+++ b/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h
@@ -71,7 +71,7 @@ public:
void convertJSValueToNPVariant(JSC::ExecState*, JSC::JSValue, NPVariant&);
JSC::JSValue convertNPVariantToJSValue(JSC::ExecState*, JSC::JSGlobalObject*, const NPVariant&);
- bool evaluate(NPObject*, const WTF::String& scriptString, NPVariant* result);
+ bool evaluate(NPObject*, const String& scriptString, NPVariant* result);
// Called when the plug-in is destroyed. Will invalidate all the NPObjects.
void invalidate();
@@ -79,7 +79,7 @@ public:
JSC::JSGlobalObject* globalObject() const;
JSC::ExecState* globalExec() const;
- static void setGlobalException(const WTF::String& exceptionString);
+ static void setGlobalException(const String& exceptionString);
static void moveGlobalExceptionToExecState(JSC::ExecState*);
private:
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
index 18f6cf5..413f9c5 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
@@ -59,13 +59,13 @@ public:
void invalidate(const NPRect*);
const char* userAgent();
- void loadURL(const WTF::String& method, const WTF::String& urlString, const WTF::String& target, const WebCore::HTTPHeaderMap& headerFields,
+ void loadURL(const String& method, const String& urlString, const String& target, const WebCore::HTTPHeaderMap& headerFields,
const Vector<char>& httpBody, bool sendNotification, void* notificationData);
NPError destroyStream(NPStream*, NPReason);
void setIsWindowed(bool windowed) { m_isWindowed = windowed; }
- void setStatusbarText(const WTF::String&);
- static void setException(const WTF::String&);
- bool evaluate(NPObject*, const WTF::String&scriptString, NPVariant* result);
+ void setStatusbarText(const String&);
+ static void setException(const String&);
+ bool evaluate(NPObject*, const String&scriptString, NPVariant* result);
// These return retained objects.
NPObject* windowScriptNPObject();
@@ -117,14 +117,14 @@ private:
virtual void geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
virtual void frameDidFinishLoading(uint64_t requestID);
virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
- virtual void didEvaluateJavaScript(uint64_t requestID, const WTF::String& requestURLString, const WTF::String& result);
+ virtual void didEvaluateJavaScript(uint64_t requestID, const String& requestURLString, const String& result);
virtual void streamDidReceiveResponse(uint64_t streamID, const WebCore::KURL& responseURL, uint32_t streamLength,
- uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers);
+ uint32_t lastModifiedTime, const String& mimeType, const String& headers);
virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length);
virtual void streamDidFinishLoading(uint64_t streamID);
virtual void streamDidFail(uint64_t streamID, bool wasCancelled);
virtual void manualStreamDidReceiveResponse(const WebCore::KURL& responseURL, uint32_t streamLength,
- uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers);
+ uint32_t lastModifiedTime, const String& mimeType, const String& headers);
virtual void manualStreamDidReceiveData(const char* bytes, int length);
virtual void manualStreamDidFinishLoading();
virtual void manualStreamDidFail(bool wasCancelled);
@@ -141,7 +141,7 @@ private:
PluginController* m_pluginController;
uint64_t m_nextRequestID;
- typedef HashMap<uint64_t, std::pair<WTF::String, void*> > PendingURLNotifyMap;
+ typedef HashMap<uint64_t, std::pair<String, void*> > PendingURLNotifyMap;
PendingURLNotifyMap m_pendingURLNotifications;
typedef HashMap<uint64_t, RefPtr<NetscapePluginStream> > StreamsMap;
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h
index c2331b3..e495242 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h
@@ -35,7 +35,7 @@ namespace WebKit {
class NetscapePluginModule : public RefCounted<NetscapePluginModule> {
public:
- static PassRefPtr<NetscapePluginModule> getOrCreate(const WTF::String& pluginPath);
+ static PassRefPtr<NetscapePluginModule> getOrCreate(const String& pluginPath);
~NetscapePluginModule();
const NPPluginFuncs& pluginFuncs() const { return m_pluginFuncs; }
@@ -44,7 +44,7 @@ public:
void pluginDestroyed();
private:
- explicit NetscapePluginModule(const WTF::String& pluginPath);
+ explicit NetscapePluginModule(const String& pluginPath);
bool tryLoad();
bool load();
@@ -52,7 +52,7 @@ private:
void shutdown();
- WTF::String m_pluginPath;
+ String m_pluginPath;
bool m_isInitialized;
unsigned m_pluginCount;
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
index fa6948b..799f598 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
@@ -142,7 +142,7 @@ static bool isSupportedTransferMode(uint16_t transferMode)
return false;
}
-bool NetscapePluginStream::start(const WTF::String& responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers)
+bool NetscapePluginStream::start(const String& responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers)
{
m_responseURL = responseURLString.utf8();
m_mimeType = mimeType.utf8();
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
index 6e7ce67..4a72c23 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
@@ -55,12 +55,12 @@ public:
const NPStream* npStream() const { return &m_npStream; }
void didReceiveResponse(const WebCore::KURL& responseURL, uint32_t streamLength,
- uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers);
+ uint32_t lastModifiedTime, const String& mimeType, const String& headers);
void didReceiveData(const char* bytes, int length);
void didFinishLoading();
void didFail(bool wasCancelled);
- void sendJavaScriptStream(const WTF::String& requestURLString, const WTF::String& result);
+ void sendJavaScriptStream(const String& requestURLString, const String& result);
void stop(NPReason);
NPError destroy(NPReason);
@@ -68,8 +68,8 @@ public:
private:
NetscapePluginStream(PassRefPtr<NetscapePlugin>, uint64_t streamID, bool sendNotification, void* notificationData);
- bool start(const WTF::String& responseURLString, uint32_t streamLength,
- uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers);
+ bool start(const String& responseURLString, uint32_t streamLength,
+ uint32_t lastModifiedTime, const String& mimeType, const String& headers);
void cancel();
void notifyAndDestroyStream(NPReason);
diff --git a/WebKit2/WebProcess/Plugins/Plugin.h b/WebKit2/WebProcess/Plugins/Plugin.h
index cd9a3d0..a8d1faa 100644
--- a/WebKit2/WebProcess/Plugins/Plugin.h
+++ b/WebKit2/WebProcess/Plugins/Plugin.h
@@ -49,9 +49,9 @@ class Plugin : public RefCounted<Plugin> {
public:
struct Parameters {
WebCore::KURL url;
- Vector<WTF::String> names;
- Vector<WTF::String> values;
- WTF::String mimeType;
+ Vector<String> names;
+ Vector<String> values;
+ String mimeType;
bool loadManually;
};
@@ -83,11 +83,11 @@ public:
// Tells the plug-in that a request to evaluate JavaScript (using PluginController::loadURL) has been fulfilled and passes
// back the result. If evaluating the script failed, result will be null.
- virtual void didEvaluateJavaScript(uint64_t requestID, const WTF::String& requestURLString, const WTF::String& result) = 0;
+ virtual void didEvaluateJavaScript(uint64_t requestID, const String& requestURLString, const String& result) = 0;
// Tells the plug-in that a stream has received its HTTP response.
virtual void streamDidReceiveResponse(uint64_t streamID, const WebCore::KURL& responseURL, uint32_t streamLength,
- uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers) = 0;
+ uint32_t lastModifiedTime, const String& mimeType, const String& headers) = 0;
// Tells the plug-in that a stream did receive data.
virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length) = 0;
@@ -100,7 +100,7 @@ public:
// Tells the plug-in that the manual stream has received its HTTP response.
virtual void manualStreamDidReceiveResponse(const WebCore::KURL& responseURL, uint32_t streamLength,
- uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers) = 0;
+ uint32_t lastModifiedTime, const String& mimeType, const String& headers) = 0;
// Tells the plug-in that the manual stream did receive data.
virtual void manualStreamDidReceiveData(const char* bytes, int length) = 0;
diff --git a/WebKit2/WebProcess/Plugins/PluginController.h b/WebKit2/WebProcess/Plugins/PluginController.h
index 9f49482..be6fe31 100644
--- a/WebKit2/WebProcess/Plugins/PluginController.h
+++ b/WebKit2/WebProcess/Plugins/PluginController.h
@@ -45,7 +45,7 @@ public:
virtual void invalidate(const WebCore::IntRect&) = 0;
// Returns the user agent string for the given URL.
- virtual WTF::String userAgent(const WebCore::KURL&) = 0;
+ virtual String userAgent(const WebCore::KURL&) = 0;
// Loads the given URL and associates it with the request ID.
//
@@ -54,7 +54,7 @@ public:
// fails to load, Plugin::frameDidFailToLoad will be called.
//
// If the URL is a JavaScript URL, the JavaScript code will be evaluated and the result sent back using Plugin::didEvaluateJavaScript.
- virtual void loadURL(uint64_t requestID, const WTF::String& method, const WTF::String& urlString, const WTF::String& target,
+ virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target,
const WebCore::HTTPHeaderMap& headerFields, const Vector<char>& httpBody, bool allowPopups) = 0;
/// Cancels the load of a stream that was requested by loadURL.
@@ -70,10 +70,10 @@ public:
virtual NPObject* pluginElementNPObject() = 0;
// Evaluates the given script string in the context of the given NPObject.
- virtual bool evaluate(NPObject*, const WTF::String&scriptString, NPVariant* result, bool allowPopups) = 0;
+ virtual bool evaluate(NPObject*, const String&scriptString, NPVariant* result, bool allowPopups) = 0;
// Set the statusbar text.
- virtual void setStatusbarText(const WTF::String&) = 0;
+ virtual void setStatusbarText(const String&) = 0;
#if USE(ACCELERATED_COMPOSITING)
// Return whether accelerated compositing is enabled.
diff --git a/WebKit2/WebProcess/Plugins/PluginView.h b/WebKit2/WebProcess/Plugins/PluginView.h
index b8fee35..4c47cb9 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.h
+++ b/WebKit2/WebProcess/Plugins/PluginView.h
@@ -107,15 +107,15 @@ private:
// PluginController
virtual void invalidate(const WebCore::IntRect&);
- virtual WTF::String userAgent(const WebCore::KURL&);
- virtual void loadURL(uint64_t requestID, const WTF::String& method, const WTF::String& urlString, const WTF::String& target,
+ virtual String userAgent(const WebCore::KURL&);
+ virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target,
const WebCore::HTTPHeaderMap& headerFields, const Vector<char>& httpBody, bool allowPopups);
virtual void cancelStreamLoad(uint64_t streamID);
virtual void cancelManualStreamLoad();
virtual NPObject* windowScriptNPObject();
virtual NPObject* pluginElementNPObject();
- virtual bool evaluate(NPObject*, const WTF::String&scriptString, NPVariant* result, bool allowPopups);
- virtual void setStatusbarText(const WTF::String&);
+ virtual bool evaluate(NPObject*, const String&scriptString, NPVariant* result, bool allowPopups);
+ virtual void setStatusbarText(const String&);
virtual bool isAcceleratedCompositingEnabled();
// WebFrame::LoadListener
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
index eaffefa..419a6c9 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
@@ -84,17 +84,17 @@ private:
virtual void setResizable(bool);
- virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageType, WebCore::MessageLevel, const WTF::String& message, unsigned int lineNumber, const WTF::String& sourceID);
+ virtual void addMessageToConsole(WebCore::MessageSource, WebCore::MessageType, WebCore::MessageLevel, const String& message, unsigned int lineNumber, const String& sourceID);
virtual bool canRunBeforeUnloadConfirmPanel();
- virtual bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame* frame);
+ virtual bool runBeforeUnloadConfirmPanel(const String& message, WebCore::Frame* frame);
virtual void closeWindowSoon();
- virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&);
- virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&);
- virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result);
- virtual void setStatusbarText(const WTF::String&);
+ virtual void runJavaScriptAlert(WebCore::Frame*, const String&);
+ virtual bool runJavaScriptConfirm(WebCore::Frame*, const String&);
+ virtual bool runJavaScriptPrompt(WebCore::Frame*, const String& message, const String& defaultValue, String& result);
+ virtual void setStatusbarText(const String&);
virtual bool shouldInterruptJavaScript();
virtual bool tabsToLinks() const;
@@ -115,12 +115,12 @@ private:
virtual void scrollbarsModeDidChange() const;
virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags);
- virtual void setToolTip(const WTF::String&, WebCore::TextDirection);
+ virtual void setToolTip(const String&, WebCore::TextDirection);
virtual void print(WebCore::Frame*);
#if ENABLE(DATABASE)
- virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName);
+ virtual void exceededDatabaseQuota(WebCore::Frame*, const String& databaseName);
#endif
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -138,8 +138,8 @@ private:
virtual void paintCustomHighlight(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect,
bool behindText, bool entireLine);
- virtual bool shouldReplaceWithGeneratedFileForUpload(const WTF::String& path, WTF::String& generatedFilename);
- virtual WTF::String generateReplacementFile(const WTF::String& path);
+ virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename);
+ virtual String generateReplacementFile(const String& path);
virtual bool paintCustomScrollbar(WebCore::GraphicsContext*, const WebCore::FloatRect&, WebCore::ScrollbarControlSize,
WebCore::ScrollbarControlState, WebCore::ScrollbarPart pressedPart, bool vertical,
@@ -152,7 +152,7 @@ private:
virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
- virtual void chooseIconForFiles(const Vector<WTF::String>&, WebCore::FileChooser*);
+ virtual void chooseIconForFiles(const Vector<String>&, WebCore::FileChooser*);
virtual void setCursor(const WebCore::Cursor&);
@@ -187,7 +187,7 @@ private:
virtual void setLastSetCursorToCurrentCursor();
#endif
- WTF::String m_cachedToolTip;
+ String m_cachedToolTip;
WebPage* m_page;
};
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h b/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h
index d66906b..c76235a 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h
@@ -49,7 +49,7 @@ private:
virtual void searchWithGoogle(const WebCore::Frame*);
virtual void lookUpInDictionary(WebCore::Frame*);
virtual bool isSpeaking();
- virtual void speak(const WTF::String&);
+ virtual void speak(const String&);
virtual void stopSpeaking();
#if PLATFORM(MAC)
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h b/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h
index 438fd4f..ce123c8 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h
@@ -46,7 +46,7 @@ private:
virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint);
virtual void startDrag(WebCore::DragImageRef dragImage, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag = false);
- virtual WebCore::DragImageRef createDragImageForLink(WebCore::KURL&, const WTF::String& label, WebCore::Frame*);
+ virtual WebCore::DragImageRef createDragImageForLink(WebCore::KURL&, const String& label, WebCore::Frame*);
virtual void dragControllerDestroyed();
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
index 745c19b..08be997 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
@@ -496,7 +496,7 @@ void WebEditorClient::setInputMethodState(bool)
}
#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-void WebEditorClient::showCorrectionPanel(const WebCore::FloatRect& boundingBoxOfReplacedString, const WTF::String& replacedString, const WTF::String& replacementString, WebCore::Editor*)
+void WebEditorClient::showCorrectionPanel(const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, WebCore::Editor*)
{
notImplemented();
}
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
index 007fcd2..7344c06 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
@@ -57,7 +57,7 @@ private:
virtual bool shouldBeginEditing(WebCore::Range*);
virtual bool shouldEndEditing(WebCore::Range*);
virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction);
- virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction);
+ virtual bool shouldInsertText(const String&, WebCore::Range*, WebCore::EditorInsertAction);
virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting);
virtual bool shouldApplyStyle(WebCore::CSSStyleDeclaration*, WebCore::Range*);
@@ -118,23 +118,23 @@ private:
virtual void toggleAutomaticSpellingCorrection();
#endif
- virtual void ignoreWordInSpellDocument(const WTF::String&);
- virtual void learnWord(const WTF::String&);
+ virtual void ignoreWordInSpellDocument(const String&);
+ virtual void learnWord(const String&);
virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength);
- virtual WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String& misspelledWord);
+ virtual String getAutoCorrectSuggestionForMisspelledWord(const String& misspelledWord);
virtual void checkGrammarOfString(const UChar*, int length, Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength);
#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
virtual void checkTextOfParagraph(const UChar* text, int length, uint64_t checkingTypes, Vector<WebCore::TextCheckingResult>& results);
#endif
- virtual void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail& detail);
- virtual void updateSpellingUIWithMisspelledWord(const WTF::String&);
+ virtual void updateSpellingUIWithGrammarString(const String&, const WebCore::GrammarDetail& detail);
+ virtual void updateSpellingUIWithMisspelledWord(const String&);
virtual void showSpellingUI(bool show);
virtual bool spellingUIIsShowing();
- virtual void getGuessesForWord(const WTF::String&, Vector<WTF::String>& guesses);
+ virtual void getGuessesForWord(const String&, Vector<String>& guesses);
virtual void willSetInputMethodState();
virtual void setInputMethodState(bool enabled);
#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
- virtual void showCorrectionPanel(const WebCore::FloatRect& boundingBoxOfReplacedString, const WTF::String& replacedString, const WTF::String& replacementString, WebCore::Editor*);
+ virtual void showCorrectionPanel(const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, WebCore::Editor*);
virtual void dismissCorrectionPanel(bool correctionAccepted);
virtual bool isShowingCorrectionPanel();
#endif
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
index 766557a..72358a5 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
@@ -82,7 +82,7 @@ private:
virtual void dispatchWillClose();
virtual void dispatchDidReceiveIcon();
virtual void dispatchDidStartProvisionalLoad();
- virtual void dispatchDidReceiveTitle(const WTF::String& title);
+ virtual void dispatchDidReceiveTitle(const String& title);
virtual void dispatchDidChangeIcons();
virtual void dispatchDidCommitLoad();
virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
@@ -95,8 +95,8 @@ private:
virtual WebCore::Frame* dispatchCreatePage();
virtual void dispatchShow();
- virtual void dispatchDecidePolicyForMIMEType(WebCore::FramePolicyFunction, const WTF::String& MIMEType, const WebCore::ResourceRequest&);
- virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName);
+ virtual void dispatchDecidePolicyForMIMEType(WebCore::FramePolicyFunction, const String& MIMEType, const WebCore::ResourceRequest&);
+ virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const String& frameName);
virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>);
virtual void cancelPolicyCheck();
@@ -149,10 +149,10 @@ private:
virtual bool shouldFallBack(const WebCore::ResourceError&);
virtual bool canHandleRequest(const WebCore::ResourceRequest&) const;
- virtual bool canShowMIMEType(const WTF::String& MIMEType) const;
+ virtual bool canShowMIMEType(const String& MIMEType) const;
virtual bool canShowMIMETypeAsHTML(const String& MIMEType) const;
- virtual bool representationExistsForURLScheme(const WTF::String& URLScheme) const;
- virtual WTF::String generatedMIMETypeForURLScheme(const WTF::String& URLScheme) const;
+ virtual bool representationExistsForURLScheme(const String& URLScheme) const;
+ virtual String generatedMIMETypeForURLScheme(const String& URLScheme) const;
virtual void frameLoadCompleted();
virtual void saveViewStateToItem(WebCore::HistoryItem*);
@@ -162,9 +162,9 @@ private:
virtual void prepareForDataSourceReplacement();
virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
- virtual void setTitle(const WTF::String& title, const WebCore::KURL&);
+ virtual void setTitle(const String& title, const WebCore::KURL&);
- virtual WTF::String userAgent(const WebCore::KURL&);
+ virtual String userAgent(const WebCore::KURL&);
virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*);
virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*);
@@ -173,17 +173,17 @@ private:
virtual bool canCachePage() const;
virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
- virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement,
- const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
+ virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const String& name, WebCore::HTMLFrameOwnerElement* ownerElement,
+ const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
virtual void didTransferChildFrameToNewDocument();
- virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool loadManually);
+ virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually);
virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget);
- virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues);
+ virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues);
- virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WTF::String& mimeType);
- virtual WTF::String overrideMediaType() const;
+ virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const String& mimeType);
+ virtual String overrideMediaType() const;
virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*);
@@ -202,7 +202,7 @@ private:
virtual bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length);
#endif
- virtual bool shouldUsePluginDocument(const WTF::String& /*mimeType*/) const;
+ virtual bool shouldUsePluginDocument(const String& /*mimeType*/) const;
virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext();
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h b/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h
index ef8c6a5..26cca5f 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h
@@ -46,9 +46,9 @@ private:
virtual WebCore::Page* createPage();
- virtual WTF::String localizedStringsURL();
+ virtual String localizedStringsURL();
- virtual WTF::String hiddenPanels();
+ virtual String hiddenPanels();
virtual void showWindow();
virtual void closeWindow();
@@ -61,12 +61,12 @@ private:
virtual void highlight(WebCore::Node*);
virtual void hideHighlight();
- virtual void inspectedURLChanged(const WTF::String& newURL);
+ virtual void inspectedURLChanged(const String& newURL);
- virtual void populateSetting(const WTF::String& key, WTF::String* value);
- virtual void storeSetting(const WTF::String& key, const WTF::String& value);
+ virtual void populateSetting(const String& key, String* value);
+ virtual void storeSetting(const String& key, const String& value);
- virtual bool sendMessageToFrontend(const WTF::String&);
+ virtual bool sendMessageToFrontend(const String&);
virtual void inspectorWindowObjectCleared();
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
index 642b9fc..c166756 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
@@ -52,124 +52,124 @@ private:
virtual void getPluginInfo(Vector<WebCore::PluginInfo>&);
// WebCore::LocalizationStrategy
- virtual WTF::String inputElementAltText();
- virtual WTF::String resetButtonDefaultLabel();
- virtual WTF::String searchableIndexIntroduction();
- virtual WTF::String submitButtonDefaultLabel();
- virtual WTF::String fileButtonChooseFileLabel();
- virtual WTF::String fileButtonNoFileSelectedLabel();
+ virtual String inputElementAltText();
+ virtual String resetButtonDefaultLabel();
+ virtual String searchableIndexIntroduction();
+ virtual String submitButtonDefaultLabel();
+ virtual String fileButtonChooseFileLabel();
+ virtual String fileButtonNoFileSelectedLabel();
#if PLATFORM(MAC)
- virtual WTF::String copyImageUnknownFileLabel();
+ virtual String copyImageUnknownFileLabel();
#endif
#if ENABLE(CONTEXT_MENUS)
- virtual WTF::String contextMenuItemTagOpenLinkInNewWindow();
- virtual WTF::String contextMenuItemTagDownloadLinkToDisk();
- virtual WTF::String contextMenuItemTagCopyLinkToClipboard();
- virtual WTF::String contextMenuItemTagOpenImageInNewWindow();
- virtual WTF::String contextMenuItemTagDownloadImageToDisk();
- virtual WTF::String contextMenuItemTagCopyImageToClipboard();
- virtual WTF::String contextMenuItemTagOpenFrameInNewWindow();
- virtual WTF::String contextMenuItemTagCopy();
- virtual WTF::String contextMenuItemTagGoBack();
- virtual WTF::String contextMenuItemTagGoForward();
- virtual WTF::String contextMenuItemTagStop();
- virtual WTF::String contextMenuItemTagReload();
- virtual WTF::String contextMenuItemTagCut();
- virtual WTF::String contextMenuItemTagPaste();
+ virtual String contextMenuItemTagOpenLinkInNewWindow();
+ virtual String contextMenuItemTagDownloadLinkToDisk();
+ virtual String contextMenuItemTagCopyLinkToClipboard();
+ virtual String contextMenuItemTagOpenImageInNewWindow();
+ virtual String contextMenuItemTagDownloadImageToDisk();
+ virtual String contextMenuItemTagCopyImageToClipboard();
+ virtual String contextMenuItemTagOpenFrameInNewWindow();
+ virtual String contextMenuItemTagCopy();
+ virtual String contextMenuItemTagGoBack();
+ virtual String contextMenuItemTagGoForward();
+ virtual String contextMenuItemTagStop();
+ virtual String contextMenuItemTagReload();
+ virtual String contextMenuItemTagCut();
+ virtual String contextMenuItemTagPaste();
#if PLATFORM(GTK)
- virtual WTF::String contextMenuItemTagDelete();
- virtual WTF::String contextMenuItemTagSelectAll();
- virtual WTF::String contextMenuItemTagInputMethods();
- virtual WTF::String contextMenuItemTagUnicode();
+ virtual String contextMenuItemTagDelete();
+ virtual String contextMenuItemTagSelectAll();
+ virtual String contextMenuItemTagInputMethods();
+ virtual String contextMenuItemTagUnicode();
#endif
- virtual WTF::String contextMenuItemTagNoGuessesFound();
- virtual WTF::String contextMenuItemTagIgnoreSpelling();
- virtual WTF::String contextMenuItemTagLearnSpelling();
- virtual WTF::String contextMenuItemTagSearchWeb();
- virtual WTF::String contextMenuItemTagLookUpInDictionary();
- virtual WTF::String contextMenuItemTagOpenLink();
- virtual WTF::String contextMenuItemTagIgnoreGrammar();
- virtual WTF::String contextMenuItemTagSpellingMenu();
- virtual WTF::String contextMenuItemTagShowSpellingPanel(bool show);
- virtual WTF::String contextMenuItemTagCheckSpelling();
- virtual WTF::String contextMenuItemTagCheckSpellingWhileTyping();
- virtual WTF::String contextMenuItemTagCheckGrammarWithSpelling();
- virtual WTF::String contextMenuItemTagFontMenu();
- virtual WTF::String contextMenuItemTagBold();
- virtual WTF::String contextMenuItemTagItalic();
- virtual WTF::String contextMenuItemTagUnderline();
- virtual WTF::String contextMenuItemTagOutline();
- virtual WTF::String contextMenuItemTagWritingDirectionMenu();
- virtual WTF::String contextMenuItemTagTextDirectionMenu();
- virtual WTF::String contextMenuItemTagDefaultDirection();
- virtual WTF::String contextMenuItemTagLeftToRight();
- virtual WTF::String contextMenuItemTagRightToLeft();
+ virtual String contextMenuItemTagNoGuessesFound();
+ virtual String contextMenuItemTagIgnoreSpelling();
+ virtual String contextMenuItemTagLearnSpelling();
+ virtual String contextMenuItemTagSearchWeb();
+ virtual String contextMenuItemTagLookUpInDictionary();
+ virtual String contextMenuItemTagOpenLink();
+ virtual String contextMenuItemTagIgnoreGrammar();
+ virtual String contextMenuItemTagSpellingMenu();
+ virtual String contextMenuItemTagShowSpellingPanel(bool show);
+ virtual String contextMenuItemTagCheckSpelling();
+ virtual String contextMenuItemTagCheckSpellingWhileTyping();
+ virtual String contextMenuItemTagCheckGrammarWithSpelling();
+ virtual String contextMenuItemTagFontMenu();
+ virtual String contextMenuItemTagBold();
+ virtual String contextMenuItemTagItalic();
+ virtual String contextMenuItemTagUnderline();
+ virtual String contextMenuItemTagOutline();
+ virtual String contextMenuItemTagWritingDirectionMenu();
+ virtual String contextMenuItemTagTextDirectionMenu();
+ virtual String contextMenuItemTagDefaultDirection();
+ virtual String contextMenuItemTagLeftToRight();
+ virtual String contextMenuItemTagRightToLeft();
#if PLATFORM(MAC)
- virtual WTF::String contextMenuItemTagSearchInSpotlight();
- virtual WTF::String contextMenuItemTagShowFonts();
- virtual WTF::String contextMenuItemTagStyles();
- virtual WTF::String contextMenuItemTagShowColors();
- virtual WTF::String contextMenuItemTagSpeechMenu();
- virtual WTF::String contextMenuItemTagStartSpeaking();
- virtual WTF::String contextMenuItemTagStopSpeaking();
- virtual WTF::String contextMenuItemTagCorrectSpellingAutomatically();
- virtual WTF::String contextMenuItemTagSubstitutionsMenu();
- virtual WTF::String contextMenuItemTagShowSubstitutions(bool show);
- virtual WTF::String contextMenuItemTagSmartCopyPaste();
- virtual WTF::String contextMenuItemTagSmartQuotes();
- virtual WTF::String contextMenuItemTagSmartDashes();
- virtual WTF::String contextMenuItemTagSmartLinks();
- virtual WTF::String contextMenuItemTagTextReplacement();
- virtual WTF::String contextMenuItemTagTransformationsMenu();
- virtual WTF::String contextMenuItemTagMakeUpperCase();
- virtual WTF::String contextMenuItemTagMakeLowerCase();
- virtual WTF::String contextMenuItemTagCapitalize();
- virtual WTF::String contextMenuItemTagChangeBack(const WTF::String& replacedString);
+ virtual String contextMenuItemTagSearchInSpotlight();
+ virtual String contextMenuItemTagShowFonts();
+ virtual String contextMenuItemTagStyles();
+ virtual String contextMenuItemTagShowColors();
+ virtual String contextMenuItemTagSpeechMenu();
+ virtual String contextMenuItemTagStartSpeaking();
+ virtual String contextMenuItemTagStopSpeaking();
+ virtual String contextMenuItemTagCorrectSpellingAutomatically();
+ virtual String contextMenuItemTagSubstitutionsMenu();
+ virtual String contextMenuItemTagShowSubstitutions(bool show);
+ virtual String contextMenuItemTagSmartCopyPaste();
+ virtual String contextMenuItemTagSmartQuotes();
+ virtual String contextMenuItemTagSmartDashes();
+ virtual String contextMenuItemTagSmartLinks();
+ virtual String contextMenuItemTagTextReplacement();
+ virtual String contextMenuItemTagTransformationsMenu();
+ virtual String contextMenuItemTagMakeUpperCase();
+ virtual String contextMenuItemTagMakeLowerCase();
+ virtual String contextMenuItemTagCapitalize();
+ virtual String contextMenuItemTagChangeBack(const String& replacedString);
#endif
- virtual WTF::String contextMenuItemTagInspectElement();
+ virtual String contextMenuItemTagInspectElement();
#endif // ENABLE(CONTEXT_MENUS)
- virtual WTF::String searchMenuNoRecentSearchesText();
- virtual WTF::String searchMenuRecentSearchesText();
- virtual WTF::String searchMenuClearRecentSearchesText();
- virtual WTF::String AXWebAreaText();
- virtual WTF::String AXLinkText();
- virtual WTF::String AXListMarkerText();
- virtual WTF::String AXImageMapText();
- virtual WTF::String AXHeadingText();
- virtual WTF::String AXDefinitionListTermText();
- virtual WTF::String AXDefinitionListDefinitionText();
+ virtual String searchMenuNoRecentSearchesText();
+ virtual String searchMenuRecentSearchesText();
+ virtual String searchMenuClearRecentSearchesText();
+ virtual String AXWebAreaText();
+ virtual String AXLinkText();
+ virtual String AXListMarkerText();
+ virtual String AXImageMapText();
+ virtual String AXHeadingText();
+ virtual String AXDefinitionListTermText();
+ virtual String AXDefinitionListDefinitionText();
#if PLATFORM(MAC)
- virtual WTF::String AXARIAContentGroupText(const WTF::String& ariaType);
+ virtual String AXARIAContentGroupText(const String& ariaType);
#endif
- virtual WTF::String AXButtonActionVerb();
- virtual WTF::String AXRadioButtonActionVerb();
- virtual WTF::String AXTextFieldActionVerb();
- virtual WTF::String AXCheckedCheckBoxActionVerb();
- virtual WTF::String AXUncheckedCheckBoxActionVerb();
- virtual WTF::String AXMenuListActionVerb();
- virtual WTF::String AXMenuListPopupActionVerb();
- virtual WTF::String AXLinkActionVerb();
- virtual WTF::String missingPluginText();
- virtual WTF::String crashedPluginText();
- virtual WTF::String multipleFileUploadText(unsigned numberOfFiles);
- virtual WTF::String unknownFileSizeText();
+ virtual String AXButtonActionVerb();
+ virtual String AXRadioButtonActionVerb();
+ virtual String AXTextFieldActionVerb();
+ virtual String AXCheckedCheckBoxActionVerb();
+ virtual String AXUncheckedCheckBoxActionVerb();
+ virtual String AXMenuListActionVerb();
+ virtual String AXMenuListPopupActionVerb();
+ virtual String AXLinkActionVerb();
+ virtual String missingPluginText();
+ virtual String crashedPluginText();
+ virtual String multipleFileUploadText(unsigned numberOfFiles);
+ virtual String unknownFileSizeText();
#if PLATFORM(WIN)
- virtual WTF::String uploadFileText();
- virtual WTF::String allFilesText();
+ virtual String uploadFileText();
+ virtual String allFilesText();
#endif
- virtual WTF::String imageTitle(const WTF::String& filename, const WebCore::IntSize& size);
- virtual WTF::String mediaElementLoadingStateText();
- virtual WTF::String mediaElementLiveBroadcastStateText();
- virtual WTF::String localizedMediaControlElementString(const WTF::String&);
- virtual WTF::String localizedMediaControlElementHelpText(const WTF::String&);
- virtual WTF::String localizedMediaTimeDescription(float);
- virtual WTF::String validationMessageValueMissingText();
- virtual WTF::String validationMessageTypeMismatchText();
- virtual WTF::String validationMessagePatternMismatchText();
- virtual WTF::String validationMessageTooLongText();
- virtual WTF::String validationMessageRangeUnderflowText();
- virtual WTF::String validationMessageRangeOverflowText();
- virtual WTF::String validationMessageStepMismatchText();
+ virtual String imageTitle(const String& filename, const WebCore::IntSize& size);
+ virtual String mediaElementLoadingStateText();
+ virtual String mediaElementLiveBroadcastStateText();
+ virtual String localizedMediaControlElementString(const String&);
+ virtual String localizedMediaControlElementHelpText(const String&);
+ virtual String localizedMediaTimeDescription(float);
+ virtual String validationMessageValueMissingText();
+ virtual String validationMessageTypeMismatchText();
+ virtual String validationMessagePatternMismatchText();
+ virtual String validationMessageTooLongText();
+ virtual String validationMessageRangeUnderflowText();
+ virtual String validationMessageRangeOverflowText();
+ virtual String validationMessageStepMismatchText();
void populatePluginCache();
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp b/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp
index 7da2c5a..fe622fd 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp
@@ -39,11 +39,11 @@ WebCore::PopupMenu* WebSearchPopupMenu::popupMenu()
return m_popup.get();
}
-void WebSearchPopupMenu::saveRecentSearches(const WTF::AtomicString&, const Vector<WTF::String>&)
+void WebSearchPopupMenu::saveRecentSearches(const AtomicString&, const Vector<String>&)
{
}
-void WebSearchPopupMenu::loadRecentSearches(const WTF::AtomicString&, Vector<WTF::String>&)
+void WebSearchPopupMenu::loadRecentSearches(const AtomicString&, Vector<String>&)
{
}
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h b/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h
index 7346dcb..f6576ad 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h
@@ -31,8 +31,8 @@ public:
static PassRefPtr<WebSearchPopupMenu> create(WebCore::PopupMenuClient*);
virtual WebCore::PopupMenu* popupMenu();
- virtual void saveRecentSearches(const WTF::AtomicString& name, const Vector<WTF::String>& searchItems);
- virtual void loadRecentSearches(const WTF::AtomicString& name, Vector<WTF::String>& searchItems);
+ virtual void saveRecentSearches(const WTF::AtomicString& name, const Vector<String>& searchItems);
+ virtual void loadRecentSearches(const WTF::AtomicString& name, Vector<String>& searchItems);
virtual bool enabled();
private:
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.h b/WebKit2/WebProcess/WebPage/WebFrame.h
index 2497ead..10a5a93 100644
--- a/WebKit2/WebProcess/WebPage/WebFrame.h
+++ b/WebKit2/WebProcess/WebPage/WebFrame.h
@@ -53,7 +53,7 @@ public:
static const Type APIType = TypeBundleFrame;
static PassRefPtr<WebFrame> createMainFrame(WebPage*);
- static PassRefPtr<WebFrame> createSubframe(WebPage*, const WTF::String& frameName, WebCore::HTMLFrameOwnerElement*);
+ static PassRefPtr<WebFrame> createSubframe(WebPage*, const String& frameName, WebCore::HTMLFrameOwnerElement*);
~WebFrame();
// Called when the FrameLoaderClient (and therefore the WebCore::Frame) is being torn down.
@@ -72,9 +72,9 @@ public:
// WKBundleFrame API and SPI functions
bool isMainFrame() const;
- WTF::String name() const;
- WTF::String url() const;
- WTF::String innerText() const;
+ String name() const;
+ String url() const;
+ String innerText() const;
PassRefPtr<ImmutableArray> childFrames();
JSValueRef computedStyleIncludingVisitedInfo(JSObjectRef element);
JSGlobalContextRef jsContext();
@@ -82,11 +82,11 @@ public:
JSValueRef jsWrapperForWorld(InjectedBundleNodeHandle*, InjectedBundleScriptWorld*);
- static WTF::String counterValue(JSObjectRef element);
- static WTF::String markerText(JSObjectRef element);
+ static String counterValue(JSObjectRef element);
+ static String markerText(JSObjectRef element);
unsigned numberOfActiveAnimations();
- bool pauseAnimationOnElementWithId(const WTF::String& animationName, const WTF::String& elementID, double time);
+ bool pauseAnimationOnElementWithId(const String& animationName, const String& elementID, double time);
unsigned pendingUnloadCount();
@@ -102,8 +102,8 @@ public:
LoadListener* loadListener() const { return m_loadListener; }
private:
- static PassRefPtr<WebFrame> create(WebPage*, const WTF::String& frameName, WebCore::HTMLFrameOwnerElement*);
- WebFrame(WebPage*, const WTF::String& frameName, WebCore::HTMLFrameOwnerElement*);
+ static PassRefPtr<WebFrame> create(WebPage*, const String& frameName, WebCore::HTMLFrameOwnerElement*);
+ WebFrame(WebPage*, const String& frameName, WebCore::HTMLFrameOwnerElement*);
virtual Type type() const { return APIType; }
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 7a4ac4f..719cd34 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -533,7 +533,7 @@ IntRect WebPage::windowResizerRect() const
windowResizerSize, windowResizerSize);
}
-void WebPage::runJavaScriptInMainFrame(const WTF::String& script, uint64_t callbackID)
+void WebPage::runJavaScriptInMainFrame(const String& script, uint64_t callbackID)
{
// NOTE: We need to be careful when running scripts that the objects we depend on don't
// disappear during script execution.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index 380755a..844bdf9 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -121,8 +121,8 @@ public:
WebFrame* mainFrame() const { return m_mainFrame.get(); }
String renderTreeExternalRepresentation() const;
- void executeEditingCommand(const WTF::String& commandName, const WTF::String& argument);
- bool isEditingCommandEnabled(const WTF::String& commandName);
+ void executeEditingCommand(const String& commandName, const String& argument);
+ bool isEditingCommandEnabled(const String& commandName);
void clearMainFrameName();
void sendClose();
@@ -174,13 +174,13 @@ private:
#if ENABLE(TOUCH_EVENTS)
void touchEvent(const WebTouchEvent&);
#endif
- void runJavaScriptInMainFrame(const WTF::String&, uint64_t callbackID);
+ void runJavaScriptInMainFrame(const String&, uint64_t callbackID);
void getRenderTreeExternalRepresentation(uint64_t callbackID);
void getSourceForFrame(WebFrame*, uint64_t callbackID);
void preferencesDidChange(const WebPreferencesStore&);
void platformPreferencesDidChange(const WebPreferencesStore&);
void didReceivePolicyDecision(WebFrame*, uint64_t listenerID, WebCore::PolicyAction policyAction);
- void setCustomUserAgent(const WTF::String&);
+ void setCustomUserAgent(const String&);
void unapplyEditCommand(uint64_t commandID);
void reapplyEditCommand(uint64_t commandID);
diff --git a/WebKit2/WebProcess/WebProcess.cpp b/WebKit2/WebProcess/WebProcess.cpp
index ffc6d17..9636705 100644
--- a/WebKit2/WebProcess/WebProcess.cpp
+++ b/WebKit2/WebProcess/WebProcess.cpp
@@ -137,7 +137,7 @@ void WebProcess::setApplicationCacheDirectory(const String& directory)
cacheStorage().setCacheDirectory(directory);
}
-void WebProcess::registerURLSchemeAsEmptyDocument(const WTF::String& urlScheme)
+void WebProcess::registerURLSchemeAsEmptyDocument(const String& urlScheme)
{
SchemeRegistry::registerURLSchemeAsEmptyDocument(urlScheme);
}
diff --git a/WebKit2/WebProcess/WebProcess.h b/WebKit2/WebProcess/WebProcess.h
index 380bca0..b15835b 100644
--- a/WebKit2/WebProcess/WebProcess.h
+++ b/WebKit2/WebProcess/WebProcess.h
@@ -81,12 +81,12 @@ private:
void shutdown();
#if ENABLE(WEB_PROCESS_SANDBOX)
- void loadInjectedBundle(const WTF::String&, const WTF::String&);
+ void loadInjectedBundle(const String&, const String&);
#else
- void loadInjectedBundle(const WTF::String&);
+ void loadInjectedBundle(const String&);
#endif
- void setApplicationCacheDirectory(const WTF::String&);
- void registerURLSchemeAsEmptyDocument(const WTF::String&);
+ void setApplicationCacheDirectory(const String&);
+ void registerURLSchemeAsEmptyDocument(const String&);
void setVisitedLinkTable(const SharedMemory::Handle&);
void visitedLinkStateChanged(const Vector<WebCore::LinkHash>& linkHashes);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list