From e78cbe89e6f337f2f1fe40315be88f742b547151 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 26 May 2010 10:11:43 +0100
Subject: Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
---
 JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp')

diff --git a/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp b/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
index 7e6bb63..9beeb82 100644
--- a/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
+++ b/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
@@ -58,7 +58,7 @@ void JSWeakObjectMapSet(JSContextRef ctx, JSWeakObjectMapRef map, void* key, JSO
     JSObject* obj = toJS(object);
     if (!obj)
         return;
-    ASSERT(obj->inherits(&JSCallbackObject<JSGlobalObject>::info) || obj->inherits(&JSCallbackObject<JSObject>::info));
+    ASSERT(obj->inherits(&JSCallbackObject<JSGlobalObject>::info) || obj->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::info));
     map->map().set(key, obj);
 }
 
-- 
cgit v1.1