From 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 8 Oct 2009 17:19:54 +0100 Subject: Merge webkit.org at R49305 : Automatic merge by git. Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 --- JavaScriptGlue/JSUtils.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'JavaScriptGlue/JSUtils.cpp') diff --git a/JavaScriptGlue/JSUtils.cpp b/JavaScriptGlue/JSUtils.cpp index e6078fe..862ae2e 100644 --- a/JavaScriptGlue/JSUtils.cpp +++ b/JavaScriptGlue/JSUtils.cpp @@ -104,7 +104,7 @@ JSUserObject* KJSValueToJSObject(JSValue inValue, ExecState *exec) { JSUserObject* result = 0; - if (inValue.isObject(&UserObjectImp::info)) { + if (inValue.inherits(&UserObjectImp::info)) { UserObjectImp* userObjectImp = static_cast(asObject(inValue)); result = userObjectImp->GetJSUserObject(); if (result) @@ -237,8 +237,8 @@ CFTypeRef KJSValueToCFTypeInternal(JSValue inValue, ExecState *exec, ObjectImpLi if (inValue.isObject()) { - if (inValue.isObject(&UserObjectImp::info)) { - UserObjectImp* userObjectImp = static_cast(asObject(inValue)); + if (inValue.inherits(&UserObjectImp::info)) { + UserObjectImp* userObjectImp = static_cast(asObject(inValue)); JSUserObject* ptr = userObjectImp->GetJSUserObject(); if (ptr) { -- cgit v1.1