Mobile Gmail should use 1.3 MB less memory

Source/bindings/v8/V8StringResource.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 34 matching lines @@
 
 void WebCoreStringResourceBase::visitStrings(ExternalStringVisitor* visitor)
 {
     visitor->visitJSExternalString(m_plainString.impl());
     if (m_plainString.impl() != m_atomicString.impl() && !m_atomicString.isNull())
         visitor->visitJSExternalString(m_atomicString.impl());
 }
 
 template<class StringClass> struct StringTraits {
     static const StringClass& fromStringResource(WebCoreStringResourceBase*);
-    static bool is16BitAtomicString(StringClass&);
     template<bool oneByte>
     static StringClass fromV8String(v8::Handle<v8::String>, int);
 };
 
 template<>
 struct StringTraits<String> {
     static const String& fromStringResource(WebCoreStringResourceBase* resource)
     {
         return resource->webcoreString();
     }
-    static bool is16BitAtomicString(String& string)
-    {
-        return false;
-    }
     template<bool oneByte>
     static String fromV8String(v8::Handle<v8::String>, int);
 };
 
 template<>
 struct StringTraits<AtomicString> {
     static const AtomicString& fromStringResource(WebCoreStringResourceBase* resource)
     {
         return resource->atomicString();
     }
-    static bool is16BitAtomicString(AtomicString& string)
-    {
-        return !string.string().is8Bit();
-    }
     template<bool oneByte>
     static AtomicString fromV8String(v8::Handle<v8::String>, int);
 };
 
 template<>
 String StringTraits<String>::fromV8String<false>(v8::Handle<v8::String> v8String, int length)
 {
     ASSERT(v8String->Length() == length);
     UChar* buffer;
     String result = String::createUninitialized(length, buffer);
@@ skipping 58 matching lines @@
             else
                 base = static_cast<WebCoreStringResource16*>(resource);
             return StringTraits<StringType>::fromStringResource(base);
         }
     }
 
     int length = v8String->Length();
     if (UNLIKELY(!length))
         return String("");
 
-    bool oneByte = v8String->IsOneByte();
+    bool oneByte = v8String->ContainsOnlyOneByte();
     StringType result(oneByte ? StringTraits<StringType>::template fromV8String<true>(v8String, length) : StringTraits<StringType>::template fromV8String<false>(v8String, length));
 
     if (external != Externalize || !v8String->CanMakeExternal())
         return result;
 
-    if (oneByte && !StringTraits<StringType>::is16BitAtomicString(result)) {
+    if (result.is8Bit()) {
         WebCoreStringResource8* stringResource = new WebCoreStringResource8(result);
         if (UNLIKELY(!v8String->MakeExternal(stringResource)))
             delete stringResource;
     } else {
         WebCoreStringResource16* stringResource = new WebCoreStringResource16(result);
         if (UNLIKELY(!v8String->MakeExternal(stringResource)))
             delete stringResource;
     }
     return result;
 }
-    
+
 // Explicitly instantiate the above template with the expected parameterizations,
 // to ensure the compiler generates the code; otherwise link errors can result in GCC 4.4.
 template String v8StringToWebCoreString<String>(v8::Handle<v8::String>, ExternalMode);
 template AtomicString v8StringToWebCoreString<AtomicString>(v8::Handle<v8::String>, ExternalMode);
 
 // Fast but non thread-safe version.
 String int32ToWebCoreStringFast(int value)
 {
     // Caching of small strings below is not thread safe: newly constructed AtomicString
     // are not safely published.
@@ skipping 17 matching lines @@
 
 String int32ToWebCoreString(int value)
 {
     // If we are on the main thread (this should always true for non-workers), call the faster one.
     if (isMainThread())
         return int32ToWebCoreStringFast(value);
     return String::number(value);
 }
 
 } // namespace WebCore