diff options
author | Ben Murdoch <benm@google.com> | 2010-08-13 05:20:16 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-13 05:20:16 -0700 |
commit | f4958a7d95cd5fbc1c74905e229b02c95cd5ee78 (patch) | |
tree | 14a0f1b07a19948c2ed93d0d8547caa7fe10aa0e /WebCore/bindings/cpp | |
parent | d074a7997da8ce379434eb6e208b97cde8a0841c (diff) | |
parent | f964bc1fd59a545a80a0cc2529ad8830be514871 (diff) | |
download | external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.zip external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.gz external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.bz2 |
Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849
* changes:
Merge WebKit at r65072 : Update WebKit revision number.
Merge WebKit at r65072 : Update test_expectations.
Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
Merge WebKit at r65072: JSC build fix in InspectorController.h
Merge WebKit at r65072: Fix V8 code generator.
Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
Merge WebKit at r65072: String class has moved to the WTF namespace.
Merge Webkit at r65072 : Fix conflicts.
Merge Webkit at r65072 : Fix Makefiles.
Merge WebKit at r65072 : Initial merge by git.
Diffstat (limited to 'WebCore/bindings/cpp')
-rw-r--r-- | WebCore/bindings/cpp/WebDOMCString.h | 5 | ||||
-rw-r--r-- | WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp | 2 | ||||
-rw-r--r-- | WebCore/bindings/cpp/WebDOMString.cpp | 24 | ||||
-rw-r--r-- | WebCore/bindings/cpp/WebDOMString.h | 18 | ||||
-rw-r--r-- | WebCore/bindings/cpp/WebNativeEventListener.cpp | 2 | ||||
-rw-r--r-- | WebCore/bindings/cpp/WebNativeEventListener.h | 2 |
6 files changed, 23 insertions, 30 deletions
diff --git a/WebCore/bindings/cpp/WebDOMCString.h b/WebCore/bindings/cpp/WebDOMCString.h index e02a587..c921895 100644 --- a/WebCore/bindings/cpp/WebDOMCString.h +++ b/WebCore/bindings/cpp/WebDOMCString.h @@ -22,12 +22,9 @@ #define WebDOMCString_h #include <WebDOMObject.h> +#include <wtf/Forward.h> #include <stddef.h> // For size_t -namespace WTF { -class CString; -}; - // UTF-16 character type #if defined(WIN32) typedef wchar_t WebUChar; diff --git a/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp b/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp index aa511ad..3bab0c1 100644 --- a/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp +++ b/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp @@ -27,7 +27,7 @@ static inline void documentWrite(const WebDOMString& text, WebCore::HTMLDocument* document, bool addNewline) { - WebCore::SegmentedString segmentedString = WebCore::String(text); + WebCore::SegmentedString segmentedString = WTF::String(text); if (addNewline) segmentedString.append(WebCore::SegmentedString(&WebCore::newlineCharacter, 1)); document->write(segmentedString); diff --git a/WebCore/bindings/cpp/WebDOMString.cpp b/WebCore/bindings/cpp/WebDOMString.cpp index d87dedd..59d98f7 100644 --- a/WebCore/bindings/cpp/WebDOMString.cpp +++ b/WebCore/bindings/cpp/WebDOMString.cpp @@ -26,7 +26,7 @@ #include <wtf/text/CString.h> #include <wtf/text/WTFString.h> -class WebDOMStringPrivate : public WebCore::StringImpl { +class WebDOMStringPrivate : public WTF::StringImpl { }; void WebDOMString::reset() @@ -45,7 +45,7 @@ void WebDOMString::assign(const WebDOMString& other) void WebDOMString::assign(const WebUChar* data, size_t length) { assign(static_cast<WebDOMStringPrivate*>( - WebCore::StringImpl::create(data, length).get())); + WTF::StringImpl::create(data, length).get())); } size_t WebDOMString::length() const @@ -60,52 +60,52 @@ const WebUChar* WebDOMString::data() const WebDOMCString WebDOMString::utf8() const { - return WebCore::String(m_private).utf8(); + return WTF::String(m_private).utf8(); } WebDOMString WebDOMString::fromUTF8(const char* data, size_t length) { - return WebCore::String::fromUTF8(data, length); + return WTF::String::fromUTF8(data, length); } WebDOMString WebDOMString::fromUTF8(const char* data) { - return WebCore::String::fromUTF8(data); + return WTF::String::fromUTF8(data); } -WebDOMString::WebDOMString(const WebCore::String& s) +WebDOMString::WebDOMString(const WTF::String& s) : m_private(static_cast<WebDOMStringPrivate*>(s.impl())) { if (m_private) m_private->ref(); } -WebDOMString& WebDOMString::operator=(const WebCore::String& s) +WebDOMString& WebDOMString::operator=(const WTF::String& s) { assign(static_cast<WebDOMStringPrivate*>(s.impl())); return *this; } -WebDOMString::operator WebCore::String() const +WebDOMString::operator WTF::String() const { return m_private; } -WebDOMString::WebDOMString(const WebCore::AtomicString& s) +WebDOMString::WebDOMString(const WTF::AtomicString& s) : m_private(0) { assign(s.string()); } -WebDOMString& WebDOMString::operator=(const WebCore::AtomicString& s) +WebDOMString& WebDOMString::operator=(const WTF::AtomicString& s) { assign(s.string()); return *this; } -WebDOMString::operator WebCore::AtomicString() const +WebDOMString::operator WTF::AtomicString() const { - return WebCore::AtomicString(static_cast<WebCore::StringImpl *>(m_private)); + return WTF::AtomicString(static_cast<WTF::StringImpl *>(m_private)); } bool WebDOMString::equals(const char* string) const diff --git a/WebCore/bindings/cpp/WebDOMString.h b/WebCore/bindings/cpp/WebDOMString.h index ca09ee8..0eea1ae 100644 --- a/WebCore/bindings/cpp/WebDOMString.h +++ b/WebCore/bindings/cpp/WebDOMString.h @@ -22,11 +22,7 @@ #define WebDOMString_h #include <WebDOMCString.h> - -namespace WebCore { -class String; -class AtomicString; -} +#include <wtf/Forward.h> class WebDOMStringPrivate; @@ -81,13 +77,13 @@ public: return *this; } - WebDOMString(const WebCore::String&); - WebDOMString& operator=(const WebCore::String&); - operator WebCore::String() const; + WebDOMString(const WTF::String&); + WebDOMString& operator=(const WTF::String&); + operator WTF::String() const; - WebDOMString(const WebCore::AtomicString&); - WebDOMString& operator=(const WebCore::AtomicString&); - operator WebCore::AtomicString() const; + WebDOMString(const WTF::AtomicString&); + WebDOMString& operator=(const WTF::AtomicString&); + operator WTF::AtomicString() const; bool equals(const char* string) const; diff --git a/WebCore/bindings/cpp/WebNativeEventListener.cpp b/WebCore/bindings/cpp/WebNativeEventListener.cpp index ddd7112..b781eb7 100644 --- a/WebCore/bindings/cpp/WebNativeEventListener.cpp +++ b/WebCore/bindings/cpp/WebNativeEventListener.cpp @@ -40,7 +40,7 @@ void WebNativeEventListener::handleEvent(WebCore::ScriptExecutionContext*, WebCo m_listener->handleEvent(toWebKit(event)); } -bool WebNativeEventListener::reportError(WebCore::ScriptExecutionContext*, const WebCore::String&, const WebCore::String&, int) +bool WebNativeEventListener::reportError(WebCore::ScriptExecutionContext*, const WTF::String&, const WTF::String&, int) { // FIXME: Implement error handling return false; diff --git a/WebCore/bindings/cpp/WebNativeEventListener.h b/WebCore/bindings/cpp/WebNativeEventListener.h index fff1b1c..13b4f5b 100644 --- a/WebCore/bindings/cpp/WebNativeEventListener.h +++ b/WebCore/bindings/cpp/WebNativeEventListener.h @@ -44,7 +44,7 @@ public: private: virtual void handleEvent(WebCore::ScriptExecutionContext*, WebCore::Event*); - virtual bool reportError(WebCore::ScriptExecutionContext*, const WebCore::String& message, const WebCore::String& url, int lineNumber); + virtual bool reportError(WebCore::ScriptExecutionContext*, const WTF::String& message, const WTF::String& url, int lineNumber); protected: WebNativeEventListener(WebUserEventListener*); |