Title: [135386] trunk
- Revision
- 135386
- Author
- pfeld...@chromium.org
- Date
- 2012-11-21 04:37:04 -0800 (Wed, 21 Nov 2012)
Log Message
Web Inspector: reparenting view does not detach from the previous parent.
https://bugs.webkit.org/show_bug.cgi?id=102902
Reviewed by Vsevolod Vlasov.
Source/WebCore:
* inspector/front-end/View.js:
(WebInspector.View.prototype.show):
LayoutTests:
* inspector/view-events.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (135385 => 135386)
--- trunk/LayoutTests/ChangeLog 2012-11-21 12:30:47 UTC (rev 135385)
+++ trunk/LayoutTests/ChangeLog 2012-11-21 12:37:04 UTC (rev 135386)
@@ -1,3 +1,12 @@
+2012-11-21 Pavel Feldman <pfeld...@chromium.org>
+
+ Web Inspector: reparenting view does not detach from the previous parent.
+ https://bugs.webkit.org/show_bug.cgi?id=102902
+
+ Reviewed by Vsevolod Vlasov.
+
+ * inspector/view-events.html:
+
2012-11-21 Csaba Osztrogonác <o...@webkit.org>
[Qt] Unreviewed gardening, unskip now passing tests.
Modified: trunk/LayoutTests/inspector/view-events-expected.txt (135385 => 135386)
--- trunk/LayoutTests/inspector/view-events-expected.txt 2012-11-21 12:30:47 UTC (rev 135385)
+++ trunk/LayoutTests/inspector/view-events-expected.txt 2012-11-21 12:37:04 UTC (rev 135386)
@@ -191,3 +191,22 @@
Parent.willHide()
Child.detach()
+Running: testShowDetachesFromPrevious
+Parent1()
+Parent2()
+Child()
+Parent1.show()
+ Parent1.wasShown()
+ Parent1.onResize()
+Parent2.show()
+ Parent2.wasShown()
+ Parent2.onResize()
+Child.show()
+ Child.wasShown()
+ Child.onResize()
+Child.show()
+Child.detach()
+ Child.willHide()
+ Child.wasShown()
+ Child.onResize()
+
Modified: trunk/LayoutTests/inspector/view-events.html (135385 => 135386)
--- trunk/LayoutTests/inspector/view-events.html 2012-11-21 12:30:47 UTC (rev 135385)
+++ trunk/LayoutTests/inspector/view-events.html 2012-11-21 12:37:04 UTC (rev 135386)
@@ -287,6 +287,18 @@
parentView.detachOnWillHide = childView;
parentView.detach();
next();
+ },
+
+ function testShowDetachesFromPrevious(next)
+ {
+ var parentView1 = new TestView("Parent1");
+ var parentView2 = new TestView("Parent2");
+ var childView = new TestView("Child");
+ parentView1.show(WebInspector.inspectorView.element);
+ parentView2.show(WebInspector.inspectorView.element);
+ childView.show(parentView1.element);
+ childView.show(parentView2.element);
+ next();
}
]);
}
Modified: trunk/Source/WebCore/ChangeLog (135385 => 135386)
--- trunk/Source/WebCore/ChangeLog 2012-11-21 12:30:47 UTC (rev 135385)
+++ trunk/Source/WebCore/ChangeLog 2012-11-21 12:37:04 UTC (rev 135386)
@@ -1,3 +1,13 @@
+2012-11-21 Pavel Feldman <pfeld...@chromium.org>
+
+ Web Inspector: reparenting view does not detach from the previous parent.
+ https://bugs.webkit.org/show_bug.cgi?id=102902
+
+ Reviewed by Vsevolod Vlasov.
+
+ * inspector/front-end/View.js:
+ (WebInspector.View.prototype.show):
+
2012-11-21 Ilya Tikhonovsky <loi...@chromium.org>
Web Inspector: NMI add instrumentation to widely used ActiveDOMObjects. XMLHttpRequest, Prerenderer, HTMLMediaElement and DOMTimer.
Modified: trunk/Source/WebCore/inspector/front-end/View.js (135385 => 135386)
--- trunk/Source/WebCore/inspector/front-end/View.js 2012-11-21 12:30:47 UTC (rev 135385)
+++ trunk/Source/WebCore/inspector/front-end/View.js 2012-11-21 12:37:04 UTC (rev 135386)
@@ -166,6 +166,9 @@
// Update view hierarchy
if (this.element.parentElement !== parentElement) {
+ if (this.element.parentElement)
+ this.detach();
+
var currentParent = parentElement;
while (currentParent && !currentParent.__view)
currentParent = currentParent.parentElement;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
