[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8f68c3f4d4d1dbe5b627268155448c2399ef6287
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 19 12:40:14 2010 +0000

    2010-02-19  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed. Chromium tests fix: update devtools code to match new
            web inspector object proxy format.
    
            * src/js/DebuggerAgent.js:
            (devtools.DebuggerAgent.prototype.formatCallFrame_):
            (devtools.DebuggerAgent.formatObjectProxy_):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 969fbb8..cc71398 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-19  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed. Chromium tests fix: update devtools code to match new
+        web inspector object proxy format.
+
+        * src/js/DebuggerAgent.js:
+        (devtools.DebuggerAgent.prototype.formatCallFrame_):
+        (devtools.DebuggerAgent.formatObjectProxy_):
+
 2010-02-12  Kent Tamura  <tkent at chromium.org>
 
         Unreviewed. Fix Chromium build.
diff --git a/WebKit/chromium/src/js/DebuggerAgent.js b/WebKit/chromium/src/js/DebuggerAgent.js
index b98685d..bb655c7 100644
--- a/WebKit/chromium/src/js/DebuggerAgent.js
+++ b/WebKit/chromium/src/js/DebuggerAgent.js
@@ -1053,7 +1053,7 @@ devtools.DebuggerAgent.prototype.formatCallFrame_ = function(stackFrame)
     for (var i = 0; i < stackFrame.scopes.length; i++) {
         var scope = stackFrame.scopes[i];
         scope.frameNumber = stackFrame.index;
-        var scopeObjectProxy = new WebInspector.ObjectProxy(0, scope, [], 0, "", true);
+        var scopeObjectProxy = new WebInspector.ObjectProxy(0, scope, [], "", true);
         scopeObjectProxy.isScope = true;
         switch(scope.type) {
             case ScopeType.Global:
@@ -1149,7 +1149,7 @@ devtools.DebuggerAgent.formatObjectProxy_ = function(v)
     } else
         description = "<unresolved ref: " + v.ref + ", type: " + v.type + ">";
 
-    var proxy = new WebInspector.ObjectProxy(0, v, [], 0, description, hasChildren);
+    var proxy = new WebInspector.ObjectProxy(0, v, [], description, hasChildren);
     proxy.type = v.type;
     proxy.isV8Ref = true;
     return proxy;

-- 
WebKit Debian packaging