Changeset 154741 in webkit

Timestamp:

Aug 28, 2013 7:03:38 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

REGRESSION(r154708): It broke all plugin tests on GTK and Qt WK1
​https://bugs.webkit.org/show_bug.cgi?id=120398

Reviewed by Anders Carlsson.

• bridge/c/c_class.cpp:

(JSC::Bindings::CClass::methodNamed): Keep the pointer of the new CMethod object
to return it after it's adopted by the new HashMap entry.
(JSC::Bindings::CClass::fieldNamed): The pointer to the newly created CField object
should be returned in this branch, matching the behavior before r154708.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/c/c_class.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-28  Zan Dobersek  <zdobersek@igalia.com>
+
+        REGRESSION(r154708): It broke all plugin tests on GTK and Qt WK1
+        https://bugs.webkit.org/show_bug.cgi?id=120398
+
+        Reviewed by Anders Carlsson.
+
+        * bridge/c/c_class.cpp:
+        (JSC::Bindings::CClass::methodNamed): Keep the pointer of the new CMethod object
+        to return it after it's adopted by the new HashMap entry.
+        (JSC::Bindings::CClass::fieldNamed): The pointer to the newly created CField object
+        should be returned in this branch, matching the behavior before r154708.
+
 2013-08-28  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/bridge/c/c_class.cpp

@@ -79 +79 @@
     NPObject* obj = inst->getObject();
     if (m_isa->hasMethod && m_isa->hasMethod(obj, ident)) {
-        OwnPtr<Method> method = adoptPtr(new CMethod(ident));
-        m_methods.set(name.impl(), method.release());
-        return method.get();
+        Method* method = new CMethod(ident);
+        m_methods.set(name.impl(), adoptPtr(method));
+        return method;
     }
     
@@ -98 +98 @@
     NPObject* obj = inst->getObject();
     if (m_isa->hasProperty && m_isa->hasProperty(obj, ident)) {
-        OwnPtr<Field> field = adoptPtr(new CField(ident));
-        m_fields.set(name.impl(), field.release());
+        Field* field = new CField(ident);
+        m_fields.set(name.impl(), adoptPtr(field));
+        return field;
     }