Changeset 108011 in webkit

Timestamp:

Feb 16, 2012 6:08:15 PM (12 years ago)

Author:

leo.yang@torchmobile.com.cn

Message:

[BlackBerry] Adapt to the removal of WebStringIml.h
​https://bugs.webkit.org/show_bug.cgi?id=78784

Reviewed by Antonio Gomes.

Source/WebCore:

WebKit/blackberry/WebCoreSupport/WebStringImpl.h which hasn't been upstreamed
has been removed internally. We should adapt to this removal for the
upstreamed part of the BlackBerry port. Actually WebStringImpl is not necessary
because it just inherits from WTF::StringImpl but adding nothing.

No functionalities changed, no new tests.

• platform/text/blackberry/StringBlackBerry.cpp:

(WTF::String::operator WebString):

Source/WebKit:

blackberry/WebCoreSupport/WebStringImpl.h which hasn't been upstreamed
has been removed internally. We should adapt to this removal for the
upstreamed part of the BlackBerry port. Actually WebStringImpl is not necessary
because it just inherits from WTF::StringImpl but adding nothing.

• blackberry/Api/WebString.cpp:

(BlackBerry::WebKit::WebString::WebString):
(BlackBerry::WebKit::WebString::equalIgnoringCase):

• blackberry/Api/WebString.h:

(WTF):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/text/blackberry/StringBlackBerry.cpp (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/blackberry/Api/WebString.cpp (modified) (3 diffs)
• WebKit/blackberry/Api/WebString.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-16  Leo Yang  <leo.yang@torchmobile.com.cn>
+
+        [BlackBerry] Adapt to the removal of WebStringIml.h
+        https://bugs.webkit.org/show_bug.cgi?id=78784
+
+        Reviewed by Antonio Gomes.
+
+        WebKit/blackberry/WebCoreSupport/WebStringImpl.h which hasn't been upstreamed
+        has been removed internally. We should adapt to this removal for the
+        upstreamed part of the BlackBerry port. Actually WebStringImpl is not necessary
+        because it just inherits from WTF::StringImpl but adding nothing.
+
+        No functionalities changed, no new tests.
+
+        * platform/text/blackberry/StringBlackBerry.cpp:
+        (WTF::String::operator WebString):
+
 2012-02-15  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/platform/text/blackberry/StringBlackBerry.cpp

@@ -21 +21 @@
 
 #include "WebString.h"
-#include "WebStringImpl.h"
 
 using BlackBerry::WebKit::WebString;
-using BlackBerry::WebKit::WebStringImpl;
 
 namespace WTF {
@@ -35 +33 @@
 String::operator WebString() const
 {
-    WebString webString(static_cast<WebStringImpl*>(m_impl.get()));
+    WebString webString(m_impl.get());
     return webString;
 }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-02-16  Leo Yang  <leo.yang@torchmobile.com.cn>
+
+        [BlackBerry] Adapt to the removal of WebStringIml.h
+        https://bugs.webkit.org/show_bug.cgi?id=78784
+
+        Reviewed by Antonio Gomes.
+
+        blackberry/WebCoreSupport/WebStringImpl.h which hasn't been upstreamed
+        has been removed internally. We should adapt to this removal for the
+        upstreamed part of the BlackBerry port. Actually WebStringImpl is not necessary
+        because it just inherits from WTF::StringImpl but adding nothing.
+
+        * blackberry/Api/WebString.cpp:
+        (BlackBerry::WebKit::WebString::WebString):
+        (BlackBerry::WebKit::WebString::equalIgnoringCase):
+        * blackberry/Api/WebString.h:
+        (WTF):
+
 2012-02-16  Nima Ghanavatian  <nghanavatian@rim.com>
 

trunk/Source/WebKit/blackberry/Api/WebString.cpp

@@ -20 +20 @@
 #include "WebString.h"
 
-#include "WebStringImpl.h"
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
@@ -28 +27 @@
 
 WebString::WebString(const char* latin1)
-    : m_impl(static_cast<WebStringImpl*>(WTF::StringImpl::create(latin1).releaseRef()))
+    : m_impl(StringImpl::create(latin1).leakRef())
 {
 }
 
 WebString::WebString(const char* latin1, unsigned length)
-    : m_impl(static_cast<WebStringImpl*>(WTF::StringImpl::create(latin1, length).releaseRef()))
+    : m_impl(StringImpl::create(latin1, length).leakRef())
 {
 }
 
 WebString::WebString(const unsigned short* utf16, unsigned length)
-    : m_impl(static_cast<WebStringImpl*>(WTF::StringImpl::create(utf16, length).releaseRef()))
+    : m_impl(StringImpl::create(utf16, length).leakRef())
 {
 }
 
-WebString::WebString(WebStringImpl* impl)
+WebString::WebString(StringImpl* impl)
     : m_impl(impl)
 {
@@ -110 +109 @@
 bool WebString::equalIgnoringCase(const char* utf8) const
 {
-    return WTF::equalIgnoringCase(m_impl, utf8);
+    return WTF::equalIgnoringCase(utf8, WTF::String(m_impl));
 }
 

trunk/Source/WebKit/blackberry/Api/WebString.h

@@ -23 +23 @@
 #include <string>
 
+// Not for public API purpose.
+namespace WTF {
+class StringImpl;
+}
+
 namespace BlackBerry {
 namespace WebKit {
-
-class WebStringImpl;
 
 class BLACKBERRY_EXPORT WebString {
@@ -35 +38 @@
     WebString(const char* latin1, unsigned length);
     WebString(const unsigned short* utf16, unsigned length);
-    WebString(WebStringImpl*);
     WebString(const WebString&);
     WebString& operator=(const WebString&);
@@ -45 +47 @@
     bool equal(const char* utf8) const;
     bool equalIgnoringCase(const char* utf8) const;
-    WebStringImpl* impl() const { return m_impl; }
+
+    // Not for public API purpose.
+    WebString(WTF::StringImpl*);
+    WTF::StringImpl* impl() const { return m_impl; }
+
 private:
-    WebStringImpl* m_impl;
+    WTF::StringImpl* m_impl;
 };
 } // namespace WebKit