Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Unified Diff: third_party/WebKit/Source/devtools/front_end/ui/SplitWidget.js

Issue 2170993002: Revert of DevTools: keep widgets in widget hierarchy upon hide, split attach/detach cycle from show/hide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/ui/SplitWidget.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/SplitWidget.js b/third_party/WebKit/Source/devtools/front_end/ui/SplitWidget.js
index b21d03e4e858b67f8c4aec2b41a25a4fbe7b8d3c..6a52c0c667567db40dae131251d5d99ebb83c2d0 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/SplitWidget.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/SplitWidget.js
@@ -152,18 +152,15 @@
{
if (this._mainWidget === widget)
return;
- this.suspendInvalidations();
if (this._mainWidget)
this._mainWidget.detach();
this._mainWidget = widget;
if (widget) {
widget.element.classList.add("insertion-point-main");
widget.element.classList.remove("insertion-point-sidebar");
- widget.attach(this.element, this._sidebarWidget ? this._sidebarWidget.element : null);
if (this._showMode === WebInspector.SplitWidget.ShowMode.OnlyMain || this._showMode === WebInspector.SplitWidget.ShowMode.Both)
- widget.showWidget();
- }
- this.resumeInvalidations();
+ widget.show(this.element);
+ }
},
/**
@@ -173,18 +170,15 @@
{
if (this._sidebarWidget === widget)
return;
- this.suspendInvalidations();
if (this._sidebarWidget)
this._sidebarWidget.detach();
this._sidebarWidget = widget;
if (widget) {
widget.element.classList.add("insertion-point-sidebar");
widget.element.classList.remove("insertion-point-main");
- widget.attach(this.element);
if (this._showMode === WebInspector.SplitWidget.ShowMode.OnlySidebar || this._showMode === WebInspector.SplitWidget.ShowMode.Both)
- widget.showWidget();
- }
- this.resumeInvalidations();
+ widget.show(this.element);
+ }
},
/**
@@ -209,6 +203,8 @@
*/
childWasDetached: function(widget)
{
+ if (this._detaching)
+ return;
if (this._mainWidget === widget)
delete this._mainWidget;
if (this._sidebarWidget === widget)
@@ -320,12 +316,15 @@
if (sideToShow) {
// Make sure main is first in the children list.
if (sideToShow === this._mainWidget)
- this._mainWidget.showWidget();
+ this._mainWidget.show(this.element, this._sidebarWidget ? this._sidebarWidget.element : null);
else
- this._sidebarWidget.showWidget();
+ this._sidebarWidget.show(this.element);
}
- if (sideToHide)
- sideToHide.hideWidget();
+ if (sideToHide) {
+ this._detaching = true;
+ sideToHide.detach();
+ delete this._detaching;
+ }
this._resizerElement.classList.add("hidden");
shadowToShow.classList.remove("hidden");
@@ -380,12 +379,10 @@
this.setResizable(true);
// Make sure main is the first in the children list.
- this.suspendInvalidations();
if (this._sidebarWidget)
- this._sidebarWidget.showWidget();
+ this._sidebarWidget.show(this.element);
if (this._mainWidget)
- this._mainWidget.showWidget();
- this.resumeInvalidations();
+ this._mainWidget.show(this.element, this._sidebarWidget ? this._sidebarWidget.element : null);
// Order widgets in DOM properly.
this.setSecondIsSidebar(this._secondIsSidebar);

Powered by Google App Engine
This is Rietveld 408576698