Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172780 => 172781)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 23:33:33 UTC (rev 172780)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 23:33:42 UTC (rev 172781)
@@ -1,5 +1,39 @@
2014-08-19 Dana Burkart <[email protected]>
+ Merge r172682. <rdar://problem/18038767>
+
+ 2014-08-15 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Remove forced layouts during recording caused by striped background element resizing
+ https://bugs.webkit.org/show_bug.cgi?id=136009
+
+ Reviewed by Timothy Hatcher.
+
+ We used to manually resize and a custom striped background behind
+ the timeline tree outline content area. This can happen frequently
+ during timeline recordings causing forced layouts. We can eliminate
+ the hack and instead put the stripe background on the tree outline.
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype.updateCustomContentOverflow): Deleted.
+ * UserInterface/Views/TimelineSidebarPanel.css:
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .content .item > .status > .status-button):
+ (.sidebar > .panel.navigation.timeline > .content > .stripe-background): Deleted.
+ (.sidebar > .panel.navigation.timeline.timeline-content-view-showing > .content > .stripe-background): Deleted.
+ Eliminate the striped background element.
+
+ * UserInterface/Views/TimelineView.css:
+ (.panel.navigation.timeline > .content > .navigation-sidebar-panel-content-tree-outline):
+ (.panel.navigation.timeline.timeline-content-view-showing > .content > .navigation-sidebar-panel-content-tree-outline):
+ Give the timeline content tree outlines the striped background.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype._updateContentOverflowShadowVisibility):
+ (WebInspector.NavigationSidebarPanel.prototype.updateCustomContentOverflow): Deleted.
+ Remove the now unused updateCustomContentOverflow method.
+
+2014-08-19 Dana Burkart <[email protected]>
+
Merge r172662. <rdar://problem/17971908>
2014-08-15 Jono Wells <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (172780 => 172781)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2014-08-19 23:33:33 UTC (rev 172780)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2014-08-19 23:33:42 UTC (rev 172781)
@@ -297,11 +297,6 @@
}
},
- updateCustomContentOverflow: function()
- {
- // Implemented by subclasses if needed.
- },
-
updateFilter: function()
{
this._updateFilter();
@@ -441,8 +436,6 @@
{
delete this._updateContentOverflowShadowVisibilityIdentifier;
- this.updateCustomContentOverflow();
-
var scrollHeight = this._contentElement.scrollHeight;
var offsetHeight = this._contentElement.offsetHeight;
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css (172780 => 172781)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2014-08-19 23:33:33 UTC (rev 172780)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2014-08-19 23:33:42 UTC (rev 172781)
@@ -251,21 +251,3 @@
height: 12px;
margin-top: 2px;
}
-
-.sidebar > .panel.navigation.timeline > .content > .stripe-background {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- min-height: 100%;
-
- background-image: linear-gradient(to bottom, transparent, transparent 50%, rgba(0, 0, 0, 0.03) 50%, rgba(0, 0, 0, 0.03));
- background-size: 100% 40px;
-
- pointer-events: none;
- display: none;
-}
-
-.sidebar > .panel.navigation.timeline.timeline-content-view-showing > .content > .stripe-background {
- display: block;
-}
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (172780 => 172781)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2014-08-19 23:33:33 UTC (rev 172780)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2014-08-19 23:33:42 UTC (rev 172781)
@@ -125,10 +125,6 @@
this._timelineOverviewTreeElement = new WebInspector.GeneralTreeElement(WebInspector.TimelineSidebarPanel.StopwatchIconStyleClass, WebInspector.UIString("Timelines"), null, WebInspector.timelineManager.activeRecording);
this._timelineOverviewTreeElement.addEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this.showTimelineOverview, this);
- this._stripeBackgroundElement = document.createElement("div");
- this._stripeBackgroundElement.className = WebInspector.TimelineSidebarPanel.StripeBackgroundStyleClass;
- this.contentElement.insertBefore(this._stripeBackgroundElement, this.contentElement.firstChild);
-
WebInspector.contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingStarted, this._capturingStarted, this);
WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingStopped, this._capturingStopped, this);
@@ -144,7 +140,6 @@
WebInspector.TimelineSidebarPanel.TimelinesTitleBarStyleClass = "timelines";
WebInspector.TimelineSidebarPanel.TimelineEventsTitleBarStyleClass = "timeline-events";
WebInspector.TimelineSidebarPanel.TimelinesContentContainerStyleClass = "timelines-content";
-WebInspector.TimelineSidebarPanel.StripeBackgroundStyleClass = "stripe-background";
WebInspector.TimelineSidebarPanel.CloseButtonStyleClass = "close-button";
WebInspector.TimelineSidebarPanel.LargeIconStyleClass = "large";
WebInspector.TimelineSidebarPanel.StopwatchIconStyleClass = "stopwatch-icon";
@@ -268,17 +263,6 @@
// Protected
- updateCustomContentOverflow: function()
- {
- if (!this._stripeBackgroundElement)
- return;
-
- var contentHeight = this.contentTreeOutline.element.offsetHeight;
- var currentHeight = parseInt(this._stripeBackgroundElement.style.height);
- if (currentHeight !== contentHeight)
- this._stripeBackgroundElement.style.height = contentHeight + "px";
- },
-
hasCustomFilters: function()
{
return true;
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.css (172780 => 172781)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.css 2014-08-19 23:33:33 UTC (rev 172780)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.css 2014-08-19 23:33:42 UTC (rev 172781)
@@ -30,3 +30,13 @@
right: 0;
bottom: 0;
}
+
+.panel.navigation.timeline > .content > .navigation-sidebar-panel-content-tree-outline {
+ min-height: 100%;
+ background-image: none;
+}
+
+.panel.navigation.timeline.timeline-content-view-showing > .content > .navigation-sidebar-panel-content-tree-outline {
+ background-image: linear-gradient(to bottom, transparent, transparent 50%, rgba(0, 0, 0, 0.03) 50%, rgba(0, 0, 0, 0.03));
+ background-size: 100% 40px;
+}
