Fix incorrect usage of StringImpl::sizeInBytes.

third_party/WebKit/Source/bindings/core/v8/V8StringResource.h

 /*
  * 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 30 matching lines @@
     USING_FAST_MALLOC(WebCoreStringResourceBase);
     WTF_MAKE_NONCOPYABLE(WebCoreStringResourceBase);
 public:
     explicit WebCoreStringResourceBase(const String& string)
         : m_plainString(string)
     {
 #if ENABLE(ASSERT)
         m_threadId = WTF::currentThread();
 #endif
         ASSERT(!string.isNull());
-        v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(memoryConsumption(string));
+        v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(string.charactersSizeInBytes());
     }
 
     explicit WebCoreStringResourceBase(const AtomicString& string)
         : m_plainString(string.getString())
         , m_atomicString(string)
     {
 #if ENABLE(ASSERT)
         m_threadId = WTF::currentThread();
 #endif
         ASSERT(!string.isNull());
-        v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(memoryConsumption(string));
+        v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(string.charactersSizeInBytes());
     }
 
     virtual ~WebCoreStringResourceBase()
     {
 #if ENABLE(ASSERT)
         ASSERT(m_threadId == WTF::currentThread());
 #endif
-        int reducedExternalMemory = -memoryConsumption(m_plainString);
+        int64_t reducedExternalMemory = m_plainString.charactersSizeInBytes();
         if (m_plainString.impl() != m_atomicString.impl() && !m_atomicString.isNull())
-            reducedExternalMemory -= memoryConsumption(m_atomicString);
-        v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(reducedExternalMemory);
+            reducedExternalMemory += m_atomicString.charactersSizeInBytes();
+        v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(-reducedExternalMemory);
     }
 
     const String& webcoreString() { return m_plainString; }
 
     const AtomicString& getAtomicString()
     {
 #if ENABLE(ASSERT)
         ASSERT(m_threadId == WTF::currentThread());
 #endif
         if (m_atomicString.isNull()) {
             m_atomicString = AtomicString(m_plainString);
             ASSERT(!m_atomicString.isNull());
             if (m_plainString.impl() != m_atomicString.impl())
-                v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(memoryConsumption(m_atomicString.getString()));
+                v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(m_atomicString.charactersSizeInBytes());
         }
         return m_atomicString;
     }
 
 protected:
     // A shallow copy of the string. Keeps the string buffer alive until the V8 engine garbage collects it.
     String m_plainString;
     // If this string is atomic or has been made atomic earlier the
     // atomic string is held here. In the case where the string starts
     // off non-atomic and becomes atomic later it is necessary to keep
     // the original string alive because v8 may keep derived pointers
     // into that string.
     AtomicString m_atomicString;
 
 private:
-    static int memoryConsumption(const String& string)
-    {
-        return string.length() * (string.is8Bit() ? sizeof(LChar) : sizeof(UChar));
-    }
 #if ENABLE(ASSERT)
     WTF::ThreadIdentifier m_threadId;
 #endif
 };
 
 class WebCoreStringResource16 final : public WebCoreStringResourceBase, public v8::String::ExternalStringResource {
     WTF_MAKE_NONCOPYABLE(WebCoreStringResource16);
 public:
     explicit WebCoreStringResource16(const String& string)
         : WebCoreStringResourceBase(string)
@@ skipping 203 matching lines @@
 }
 
 template<> inline String V8StringResource<TreatNullAndUndefinedAsNullString>::fallbackString() const
 {
     return String();
 }
 
 } // namespace blink
 
 #endif // V8StringResource_h