Title: [108011] trunk/Source
- Revision
- 108011
- Author
- [email protected]
- Date
- 2012-02-16 18:08:15 -0800 (Thu, 16 Feb 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108010 => 108011)
--- trunk/Source/WebCore/ChangeLog 2012-02-17 01:56:13 UTC (rev 108010)
+++ trunk/Source/WebCore/ChangeLog 2012-02-17 02:08:15 UTC (rev 108011)
@@ -1,3 +1,20 @@
+2012-02-16 Leo Yang <[email protected]>
+
+ [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 <[email protected]>
Made Weak<T> single-owner, adding PassWeak<T>
Modified: trunk/Source/WebCore/platform/text/blackberry/StringBlackBerry.cpp (108010 => 108011)
--- trunk/Source/WebCore/platform/text/blackberry/StringBlackBerry.cpp 2012-02-17 01:56:13 UTC (rev 108010)
+++ trunk/Source/WebCore/platform/text/blackberry/StringBlackBerry.cpp 2012-02-17 02:08:15 UTC (rev 108011)
@@ -20,10 +20,8 @@
#include "PlatformString.h"
#include "WebString.h"
-#include "WebStringImpl.h"
using BlackBerry::WebKit::WebString;
-using BlackBerry::WebKit::WebStringImpl;
namespace WTF {
@@ -34,7 +32,7 @@
String::operator WebString() const
{
- WebString webString(static_cast<WebStringImpl*>(m_impl.get()));
+ WebString webString(m_impl.get());
return webString;
}
Modified: trunk/Source/WebKit/ChangeLog (108010 => 108011)
--- trunk/Source/WebKit/ChangeLog 2012-02-17 01:56:13 UTC (rev 108010)
+++ trunk/Source/WebKit/ChangeLog 2012-02-17 02:08:15 UTC (rev 108011)
@@ -1,3 +1,21 @@
+2012-02-16 Leo Yang <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] Style clean-up in WebPageCompositor
Modified: trunk/Source/WebKit/blackberry/Api/WebString.cpp (108010 => 108011)
--- trunk/Source/WebKit/blackberry/Api/WebString.cpp 2012-02-17 01:56:13 UTC (rev 108010)
+++ trunk/Source/WebKit/blackberry/Api/WebString.cpp 2012-02-17 02:08:15 UTC (rev 108011)
@@ -19,7 +19,6 @@
#include "config.h"
#include "WebString.h"
-#include "WebStringImpl.h"
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
@@ -27,21 +26,21 @@
namespace WebKit {
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)
{
if (m_impl)
@@ -109,7 +108,7 @@
bool WebString::equalIgnoringCase(const char* utf8) const
{
- return WTF::equalIgnoringCase(m_impl, utf8);
+ return WTF::equalIgnoringCase(utf8, WTF::String(m_impl));
}
} // namespace WebKit
Modified: trunk/Source/WebKit/blackberry/Api/WebString.h (108010 => 108011)
--- trunk/Source/WebKit/blackberry/Api/WebString.h 2012-02-17 01:56:13 UTC (rev 108010)
+++ trunk/Source/WebKit/blackberry/Api/WebString.h 2012-02-17 02:08:15 UTC (rev 108011)
@@ -22,11 +22,14 @@
#include "BlackBerryGlobal.h"
#include <string>
+// Not for public API purpose.
+namespace WTF {
+class StringImpl;
+}
+
namespace BlackBerry {
namespace WebKit {
-class WebStringImpl;
-
class BLACKBERRY_EXPORT WebString {
public:
WebString() : m_impl(0) { }
@@ -34,7 +37,6 @@
WebString(const char* latin1);
WebString(const char* latin1, unsigned length);
WebString(const unsigned short* utf16, unsigned length);
- WebString(WebStringImpl*);
WebString(const WebString&);
WebString& operator=(const WebString&);
std::string utf8() const;
@@ -44,9 +46,13 @@
bool isEmpty() const;
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
} // namespace BlackBerry
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
