diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/platform/text/haiku/StringHaiku.cpp | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/platform/text/haiku/StringHaiku.cpp')
| -rw-r--r-- | WebCore/platform/text/haiku/StringHaiku.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/WebCore/platform/text/haiku/StringHaiku.cpp b/WebCore/platform/text/haiku/StringHaiku.cpp index fe32215..7436ce2 100644 --- a/WebCore/platform/text/haiku/StringHaiku.cpp +++ b/WebCore/platform/text/haiku/StringHaiku.cpp @@ -20,30 +20,24 @@ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "config.h" #include "PlatformString.h" +#include <wtf/text/CString.h> -#include "CString.h" #include <String.h> namespace WebCore { // String conversions -String::String(const BString& bstring) +String::String(const BString& string) { - const UChar* str = reinterpret_cast<const UChar*>(bstring.String()); - const size_t size = bstring.Length(); - - if (!str) - return; - - if (!size) - m_impl = StringImpl::empty(); + if (string.Length()) + m_impl = String::fromUTF8(string.String(), string.Length()).impl(); else - m_impl = StringImpl::create(str, size); + m_impl = StringImpl::empty(); } String::operator BString() const |