Title: [193026] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193026
- Author
- [email protected]
- Date
- 2015-12-03 10:32:44 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r187465. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193025 => 193026)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:32:39 UTC (rev 193025)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:32:44 UTC (rev 193026)
@@ -1,5 +1,22 @@
2015-12-01 Timothy Hatcher <[email protected]>
+ Merge r187465. rdar://problem/23221163
+
+ 2015-07-27 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Revert change to DOMTreeElement.prototype.remove
+ https://bugs.webkit.org/show_bug.cgi?id=147336
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype.remove.removeNodeCallback):
+ This change was accidental, and just resulted in the function calling
+ itself again. It didn't infinite loops because another path would have
+ removed the DOMTreeElement, but lets correct this code.
+
+2015-12-01 Timothy Hatcher <[email protected]>
+
Merge r187450. rdar://problem/23221163
2015-07-27 Devin Rousso <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (193025 => 193026)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 18:32:39 UTC (rev 193025)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 18:32:44 UTC (rev 193026)
@@ -1266,7 +1266,7 @@
if (!self.parent)
return;
- self.remove();
+ parentElement.removeChild(self);
parentElement.adjustCollapsedRange();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
