Changeset 143437 in webkit

Timestamp:

Feb 20, 2013 1:21:09 AM (11 years ago)

Author:

eustas@chromium.org

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/Drawer.js (modified) (1 diff)
• inspector/front-end/View.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-20  Eugene Klyuchnikov  <eustas@chromium.org>
+
+        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  <nbarth@google.com>
 

trunk/Source/WebCore/inspector/front-end/Drawer.js

@@ -87 +87 @@
         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);

trunk/Source/WebCore/inspector/front-end/View.js

@@ -48 +48 @@
     markAsRoot: function()
     {
+        WebInspector.View._assert(!this.element.parentElement, "Attempt to mark as root attached node");
         this._isRoot = true;
     },