Changeset 136188 in webkit

Timestamp:

Nov 29, 2012, 5:13:33 PM (14 years ago)

Author:

haraken@chromium.org

Message:

Unreviewed, rolling out r135862.
​http://trac.webkit.org/changeset/135862
​https://bugs.webkit.org/show_bug.cgi?id=103367

We've been observing 'Fatal error in
v8::V8::AddMessageListener()' in bots

• bindings/v8/V8Binding.cpp:

(WebCore::v8NonStringValueToWebCoreString):

• bindings/v8/V8StringResource.cpp:

(WebCore::int32ToWebCoreStringFast):
(WebCore::int32ToWebCoreString):

• bindings/v8/V8StringResource.h:

(WebCore::V8StringResource::V8StringResource):
(WebCore::V8StringResource::prepareBase):
(WebCore::V8StringResource::setString):
(V8StringResource):
(WebCore::V8StringResource::toString):
(WebCore::::prepare):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8Binding.cpp (modified) (1 diff)
• bindings/v8/V8StringResource.cpp (modified) (3 diffs)
• bindings/v8/V8StringResource.h (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-29  Kentaro Hara  <haraken@chromium.org>
+
+        Unreviewed, rolling out r135862.
+        http://trac.webkit.org/changeset/135862
+        https://bugs.webkit.org/show_bug.cgi?id=103367
+
+        We've been observing 'Fatal error in
+        v8::V8::AddMessageListener()' in bots
+
+        * bindings/v8/V8Binding.cpp:
+        (WebCore::v8NonStringValueToWebCoreString):
+        * bindings/v8/V8StringResource.cpp:
+        (WebCore::int32ToWebCoreStringFast):
+        (WebCore::int32ToWebCoreString):
+        * bindings/v8/V8StringResource.h:
+        (WebCore::V8StringResource::V8StringResource):
+        (WebCore::V8StringResource::prepareBase):
+        (WebCore::V8StringResource::setString):
+        (V8StringResource):
+        (WebCore::V8StringResource::toString):
+        (WebCore::::prepare):
+
 2012-11-29  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/bindings/v8/V8Binding.cpp

@@ -101 +101 @@
     ASSERT(!object->IsString());
     if (object->IsInt32())
-        return int32ToWebCoreString<String>(object->Int32Value());
+        return int32ToWebCoreString(object->Int32Value());
 
     v8::TryCatch block;

trunk/Source/WebCore/bindings/v8/V8StringResource.cpp

@@ -191 +191 @@
     // Most numbers used are <= 100. Even if they aren't used there's very little cost in using the space.
     const int kLowNumbers = 100;
-
-    // FIXME: Store lowNumbers in V8PerIsolateData so that workers can also use them.
     DEFINE_STATIC_LOCAL(Vector<AtomicString>, lowNumbers, (kLowNumbers + 1));
     String webCoreString;
@@ -207 +205 @@
 }
 
-template<> String int32ToWebCoreString<String>(int value)
+String int32ToWebCoreString(int value)
 {
     // If we are on the main thread (this should always true for non-workers), call the faster one.
@@ -215 +213 @@
 }
 
-template<> AtomicString int32ToWebCoreString<AtomicString>(int value)
-{
-    return AtomicString(int32ToWebCoreString<String>(value));
-}
-
 } // namespace WebCore

trunk/Source/WebCore/bindings/v8/V8StringResource.h

@@ -143 +143 @@
 template <typename StringType>
 StringType v8StringToWebCoreString(v8::Handle<v8::String>, ExternalMode);
-template <typename StringType>
-StringType int32ToWebCoreString(int value);
+String int32ToWebCoreString(int value);
 
 // V8StringResource is an adapter class that converts V8 values to Strings
@@ -160 +159 @@
         : m_v8Object(object)
         , m_mode(Externalize)
+        , m_string()
     {
     }
@@ -170 +170 @@
     bool prepareBase()
     {
-        ASSERT(!m_v8Object.IsEmpty());
-        if (LIKELY(m_v8Object->IsString() || m_v8Object->IsInt32()))
+        if (m_v8Object.IsEmpty())
             return true;
+
+        if (LIKELY(m_v8Object->IsString()))
+            return true;
+
+        if (LIKELY(m_v8Object->IsInt32())) {
+            setString(int32ToWebCoreString(m_v8Object->Int32Value()));
+            return true;
+        }
 
         m_mode = DoNotExternalize;
@@ -185 +192 @@
     }
 
+    void setString(const String& string)
+    {
+        m_string = string;
+        m_v8Object.Clear(); // To signal that String is ready.
+    }
+
     template <class StringType>
     StringType toString()
     {
-        if (m_v8Object.IsEmpty())
-            return StringType();
-        if (m_v8Object->IsInt32())
-            return int32ToWebCoreString<StringType>(m_v8Object->Int32Value());
-        ASSERT(m_v8Object->IsString());
-        return v8StringToWebCoreString<StringType>(m_v8Object.As<v8::String>(), m_mode);
+        if (LIKELY(!m_v8Object.IsEmpty()))
+            return v8StringToWebCoreString<StringType>(m_v8Object.As<v8::String>(), m_mode);
+
+        return StringType(m_string);
     }
 
     v8::Local<v8::Value> m_v8Object;
     ExternalMode m_mode;
+    String m_string;
 };
 
 template<> inline bool V8StringResource<DefaultMode>::prepare()
 {
-    if (m_v8Object.IsEmpty())
-        return true;
     return prepareBase();
 }
@@ -210 +220 @@
 {
     if (m_v8Object.IsEmpty() || m_v8Object->IsNull()) {
-        m_v8Object.Clear();
+        setString(String());
         return true;
     }
@@ -219 +229 @@
 {
     if (m_v8Object.IsEmpty() || m_v8Object->IsNull() || m_v8Object->IsUndefined()) {
-        m_v8Object.Clear();
+        setString(String());
         return true;
     }