Title: [143437] trunk/Source/WebCore
- Revision
- 143437
- Author
- [email protected]
- Date
- 2013-02-20 01:21:09 -0800 (Wed, 20 Feb 2013)
Log Message
Web Inspector: View.markAsRoot should never be invoked on attached view.
https://bugs.webkit.org/show_bug.cgi?id=110224
Reviewed by Pavel Feldman.
This will cause CSS loading problems after "show".
* inspector/front-end/Drawer.js:
Ensure child view is detached before marked as root.
* inspector/front-end/View.js:
(WebInspector.View.prototype.markAsRoot): Added assertion.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143436 => 143437)
--- trunk/Source/WebCore/ChangeLog 2013-02-20 09:17:34 UTC (rev 143436)
+++ trunk/Source/WebCore/ChangeLog 2013-02-20 09:21:09 UTC (rev 143437)
@@ -1,3 +1,17 @@
+2013-02-20 Eugene Klyuchnikov <[email protected]>
+
+ Web Inspector: View.markAsRoot should never be invoked on attached view.
+ https://bugs.webkit.org/show_bug.cgi?id=110224
+
+ Reviewed by Pavel Feldman.
+
+ This will cause CSS loading problems after "show".
+
+ * inspector/front-end/Drawer.js:
+ Ensure child view is detached before marked as root.
+ * inspector/front-end/View.js:
+ (WebInspector.View.prototype.markAsRoot): Added assertion.
+
2013-02-20 Nils Barth <[email protected]>
File upload control doesn't apply CSS vertical padding or border to file name
Modified: trunk/Source/WebCore/inspector/front-end/Drawer.js (143436 => 143437)
--- trunk/Source/WebCore/inspector/front-end/Drawer.js 2013-02-20 09:17:34 UTC (rev 143436)
+++ trunk/Source/WebCore/inspector/front-end/Drawer.js 2013-02-20 09:21:09 UTC (rev 143437)
@@ -86,6 +86,7 @@
document.body.addStyleClass("drawer-visible");
this._floatingStatusBarContainer.insertBefore(document.getElementById("panel-status-bar"), this._floatingStatusBarContainer.firstElementChild);
this._bottomStatusBar.appendChild(this._viewStatusBar);
+ this._view.detach();
this._view.markAsRoot();
this._view.show(this._drawerContentsElement);
Modified: trunk/Source/WebCore/inspector/front-end/View.js (143436 => 143437)
--- trunk/Source/WebCore/inspector/front-end/View.js 2013-02-20 09:17:34 UTC (rev 143436)
+++ trunk/Source/WebCore/inspector/front-end/View.js 2013-02-20 09:21:09 UTC (rev 143437)
@@ -47,6 +47,7 @@
WebInspector.View.prototype = {
markAsRoot: function()
{
+ WebInspector.View._assert(!this.element.parentElement, "Attempt to mark as root attached node");
this._isRoot = true;
},
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
