Title: [179681] branches/safari-600.1.4.15-branch/LayoutTests
- Revision
- 179681
- Author
- [email protected]
- Date
- 2015-02-05 00:58:14 -0800 (Thu, 05 Feb 2015)
Log Message
Merged r178795. rdar://problem/19651478
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (179680 => 179681)
--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-02-05 08:55:50 UTC (rev 179680)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-02-05 08:58:14 UTC (rev 179681)
@@ -1,5 +1,16 @@
2015-02-05 Lucas Forschler <[email protected]>
+ Merge r178795
+
+ 2015-01-20 Joseph Pecoraro <[email protected]>
+
+ Unreviewed gardening. Remove variable objectId from output.
+
+ * inspector/model/remote-object-get-properties-expected.txt:
+ * inspector/model/remote-object-get-properties.html:
+
+2015-02-05 Lucas Forschler <[email protected]>
+
Merge r178768
2015-01-20 Joseph Pecoraro <[email protected]>
Modified: branches/safari-600.1.4.15-branch/LayoutTests/inspector/model/remote-object-get-properties-expected.txt (179680 => 179681)
--- branches/safari-600.1.4.15-branch/LayoutTests/inspector/model/remote-object-get-properties-expected.txt 2015-02-05 08:55:50 UTC (rev 179680)
+++ branches/safari-600.1.4.15-branch/LayoutTests/inspector/model/remote-object-get-properties-expected.txt 2015-02-05 08:58:14 UTC (rev 179681)
@@ -1,7 +1,6 @@
-----------------------------------------------------
_expression_: window.simpleObject
-objectId: {"injectedScriptId":1,"id":1}
type: object
description: Object
@@ -34,7 +33,6 @@
-----------------------------------------------------
_expression_: window.loadEvent
-objectId: {"injectedScriptId":1,"id":16}
type: object
description: Event
@@ -110,7 +108,6 @@
-----------------------------------------------------
_expression_: window.complexObject
-objectId: {"injectedScriptId":1,"id":41}
type: object
description: SuperFoo
@@ -155,7 +152,6 @@
-----------------------------------------------------
_expression_: window.badGetterObject
-objectId: {"injectedScriptId":1,"id":60}
type: object
description: ClassWithBadGetter
Modified: branches/safari-600.1.4.15-branch/LayoutTests/inspector/model/remote-object-get-properties.html (179680 => 179681)
--- branches/safari-600.1.4.15-branch/LayoutTests/inspector/model/remote-object-get-properties.html 2015-02-05 08:55:50 UTC (rev 179680)
+++ branches/safari-600.1.4.15-branch/LayoutTests/inspector/model/remote-object-get-properties.html 2015-02-05 08:58:14 UTC (rev 179681)
@@ -71,7 +71,6 @@
WebInspector.runtimeManager.evaluateInInspectedWindow(step._expression_, "test", false, true, false, function(remoteObject, wasThrown) {
InspectorTest.assert(remoteObject instanceof WebInspector.RemoteObject);
- InspectorTest.log("objectId: " + remoteObject.objectId);
InspectorTest.log("type: " + remoteObject.type);
if (remoteObject.subtype)
InspectorTest.log("subtype: " + remoteObject.subtype);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
