2011-03-09 Ilya Tikhonovsky <loislo@chromium.org>

        Reviewed by Yury Semikhatsky.

        Web Inspector: Web Inspector: we don't need to transfer objectId and hasChildren for primitive values.
        https://bugs.webkit.org/show_bug.cgi?id=55998

        * inspector/protocol/console-agent-expected.txt:
        * inspector/protocol/runtime-agent-expected.txt:
2011-03-09  Ilya Tikhonovsky  <loislo@chromium.org>

        Reviewed by Yury Semikhatsky.

        Web Inspector: Web Inspector: we don't need to transfer objectId and hasChildren for primitive values.
        https://bugs.webkit.org/show_bug.cgi?id=55998

        * inspector/InjectedScriptSource.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@80630 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c14bf9bb8947ac82b74e0455a24d46fdf442d748..bc4758f770827737eec320994139a5186d9fbce9 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-09  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Web Inspector: we don't need to transfer objectId and hasChildren for primitive values.
+        https://bugs.webkit.org/show_bug.cgi?id=55998
+
+        * inspector/protocol/console-agent-expected.txt:
+        * inspector/protocol/runtime-agent-expected.txt:
+
 2011-03-09  Pavel Feldman  <pfeldman@chromium.org>
 
         Reviewed by Yury Semikhatsky.

diff --git a/LayoutTests/inspector/protocol/console-agent-expected.txt b/LayoutTests/inspector/protocol/console-agent-expected.txt
index 562f992c1abb1eee87cc5bd61e3528b64682c0e9..3714dd63de07ab5e0294033289500cc8b98e4ad4 100644 (file)
--- a/LayoutTests/inspector/protocol/console-agent-expected.txt
+++ b/LayoutTests/inspector/protocol/console-agent-expected.txt
@@ -75,10 +75,8 @@ event ConsoleAgent.addConsoleMessage
             message : "test"
             parameters : {
                 0 : {
-                    objectId : null
                     type : "string"
                     description : "test"
-                    hasChildren : false
                 }
             }
             stackTrace : <object>
@@ -101,10 +99,8 @@ response:
     seq : <number>
     body : {
         result : {
-            objectId : null
             type : "undefined"
             description : "undefined"
-            hasChildren : false
         }
     }
 }

diff --git a/LayoutTests/inspector/protocol/runtime-agent-expected.txt b/LayoutTests/inspector/protocol/runtime-agent-expected.txt
index dbdbbb71ed1d26652a3f8118c156e5284534c782..5e607c7f2fdaf1177af1d118a1268dad2ab5de07 100644 (file)
--- a/LayoutTests/inspector/protocol/runtime-agent-expected.txt
+++ b/LayoutTests/inspector/protocol/runtime-agent-expected.txt
@@ -24,9 +24,9 @@ response:
                 injectedScriptId : <number>
                 id : <number>
             }
+            hasChildren : true
             type : "object"
             description : "TestObject"
-            hasChildren : true
         }
     }
 }
@@ -53,10 +53,8 @@ response:
     seq : <number>
     body : {
         result : {
-            objectId : null
             type : "undefined"
             description : "undefined"
-            hasChildren : false
         }
     }
 }
@@ -139,19 +137,15 @@ response:
             0 : {
                 name : "assignedByEvaluateOn"
                 value : {
-                    objectId : null
                     type : "string"
                     description : "evaluateOn function works fine"
-                    hasChildren : false
                 }
             }
             1 : {
                 name : "assignedBySetPropertyValue"
                 value : {
-                    objectId : null
                     type : "boolean"
                     description : "true"
-                    hasChildren : false
                 }
             }
             2 : {
@@ -161,9 +155,9 @@ response:
                         injectedScriptId : <number>
                         id : <number>
                     }
+                    hasChildren : true
                     type : "object"
                     description : "TestObject"
-                    hasChildren : true
                 }
             }
         }

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index fa2996b1be2055de501e23e24838a455bb20e58a..01cb26f46643b540185c4926b4bf8019af7cb6de 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-09  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Web Inspector: we don't need to transfer objectId and hasChildren for primitive values.
+        https://bugs.webkit.org/show_bug.cgi?id=55998
+
+        * inspector/InjectedScriptSource.js:
+
 2011-03-09  Pavel Feldman  <pfeldman@chromium.org>
 
         Reviewed by Yury Semikhatsky.

diff --git a/Source/WebCore/inspector/InjectedScriptSource.js b/Source/WebCore/inspector/InjectedScriptSource.js
index 337a9e03a775e38009b2c0969f98331d13d06dbf..5d383501a9a030fba0fbb249fc75a59bc2618d97 100644 (file)
--- a/Source/WebCore/inspector/InjectedScriptSource.js
+++ b/Source/WebCore/inspector/InjectedScriptSource.js
@@ -456,10 +456,12 @@ var injectedScript = new InjectedScript();
 
 InjectedScript.RemoteObject = function(objectId, type, description, hasChildren)
 {
-    this.objectId = objectId;
+    if (objectId) {
+        this.objectId = objectId;
+        this.hasChildren = hasChildren;
+    }
     this.type = type;
     this.description = description;
-    this.hasChildren = hasChildren;
 }
 
 InjectedScript.RemoteObject.fromException = function(e)