Changeset 154087 in webkit

Timestamp:

Aug 14, 2013 5:53:02 PM (11 years ago)

Author:

weinig@apple.com

Message:

Update binding test results. Follow up fix for <​https://webkit.org/b/119664>

• bindings/scripts/test/JS/JSTestCallback.cpp:

(WebCore::JSTestCallback::JSTestCallback):

• bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:

(WebCore::jsTestMediaQueryListListenerPrototypeFunctionMethod):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/test/JS/JSTestCallback.cpp (modified) (2 diffs)
• bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-14  Sam Weinig  <sam@webkit.org>
+
+        Update binding test results.  Follow up fix for <https://webkit.org/b/119664>
+
+        * bindings/scripts/test/JS/JSTestCallback.cpp:
+        (WebCore::JSTestCallback::JSTestCallback):
+        * bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
+        (WebCore::jsTestMediaQueryListListenerPrototypeFunctionMethod):
+
 2013-08-14  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp

@@ -37 +37 @@
 
 JSTestCallback::JSTestCallback(JSObject* callback, JSDOMGlobalObject* globalObject)
-    : ActiveDOMCallback(globalObject->scriptExecutionContext())
+    : TestCallback()
+    , ActiveDOMCallback(globalObject->scriptExecutionContext())
     , m_data(new JSCallbackData(callback, globalObject))
 {
@@ -55 +56 @@
 #endif
 }
+
 
 // Functions

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp

@@ -24 +24 @@
 #include "ExceptionCode.h"
 #include "JSDOMBinding.h"
-#include "MediaQueryListListener.h"
+#include "JSMediaQueryListListener.h"
 #include "TestMediaQueryListListener.h"
 #include <runtime/Error.h>
@@ -168 +168 @@
     if (exec->argumentCount() < 1)
         return throwVMError(exec, createNotEnoughArgumentsError(exec));
-    RefPtr<MediaQueryListListener> listener(MediaQueryListListener::create(ScriptValue(exec->vm(), exec->argument(0))));
-    if (exec->hadException())
-        return JSValue::encode(jsUndefined());
+    if (exec->argumentCount() <= 0 || !exec->argument(0).isFunction())
+        return throwVMTypeError(exec);
+    RefPtr<MediaQueryListListener> listener = JSMediaQueryListListener::create(asObject(exec->argument(0)), castedThis->globalObject());
     impl->method(listener);
     return JSValue::encode(jsUndefined());