From 21939df44de1705786c545cd1bf519d47250322d Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 11 May 2010 18:35:50 +0100
Subject: Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
---
 JavaScriptCore/wtf/text/StringImpl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'JavaScriptCore/wtf/text/StringImpl.cpp')

diff --git a/JavaScriptCore/wtf/text/StringImpl.cpp b/JavaScriptCore/wtf/text/StringImpl.cpp
index 287e529..ff69737 100644
--- a/JavaScriptCore/wtf/text/StringImpl.cpp
+++ b/JavaScriptCore/wtf/text/StringImpl.cpp
@@ -42,7 +42,7 @@ StringImpl::~StringImpl()
 {
     ASSERT(!isStatic());
 
-    if (inTable())
+    if (isAtomic())
         AtomicString::remove(this);
 #if USE(JSC)
     if (isIdentifier())
@@ -879,7 +879,7 @@ Vector<char> StringImpl::ascii()
     for (unsigned i = 0; i != m_length; ++i) {
         UChar c = m_data[i];
         if ((c >= 0x20 && c < 0x7F) || c == 0x00)
-            buffer[i] = c;
+            buffer[i] = static_cast<char>(c);
         else
             buffer[i] = '?';
     }
-- 
cgit v1.1