[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 4120916683de7b137ddac326f1cbe5f986b8ce34
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 28 10:46:26 2010 +0000

    2010-01-28  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Simplify isActivation method.
    
            https://bugs.webkit.org/show_bug.cgi?id=34161
    
            Test: WebCore/manual-tests/inspector/debugger-scopes-inspection.html
    
            * bindings/js/JSInjectedScriptHostCustom.cpp:
            (WebCore::JSInjectedScriptHost::isActivation):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b36e94a..6afcb7c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-28  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Simplify isActivation method.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34161
+
+        Test: WebCore/manual-tests/inspector/debugger-scopes-inspection.html
+
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        (WebCore::JSInjectedScriptHost::isActivation):
+
 2010-01-27  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp b/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
index 9cf9bf0..d38d8ee 100644
--- a/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
+++ b/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
@@ -126,17 +126,10 @@ JSValue JSInjectedScriptHost::currentCallFrame(ExecState* exec, const ArgList&)
     return toJS(exec, callFrame);
 }
 
-JSValue JSInjectedScriptHost::isActivation(ExecState* exec, const ArgList& args)
+JSValue JSInjectedScriptHost::isActivation(ExecState*, const ArgList& args)
 {
-    if (args.size() < 1)
-        return jsUndefined();
-
-    JSValue value = args.at(0);
-    if (!value.isObject())
-        return jsBoolean(false);
-
-    JSObject* object = value.toObject(exec);
-    return jsBoolean(object->isActivationObject());
+    JSObject* object = args.at(0).getObject();
+    return jsBoolean(object && object->isActivationObject());
 }
 
 #endif

-- 
WebKit Debian packaging