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

Unified Diff: third_party/WebKit/Source/devtools/front_end/ui_lazy/TimelineGrid.js

Issue 2470523003: [Devtools] Fixed dividers in new network canvas timeline (Closed)
Patch Set: Merge branch 'master' into NETWORK_TIMELINE_FIX_DIVIDERS Created 4 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/ui_lazy/FlameChart.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/devtools/front_end/ui_lazy/TimelineGrid.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui_lazy/TimelineGrid.js b/third_party/WebKit/Source/devtools/front_end/ui_lazy/TimelineGrid.js
index d673ddfb0b265ee5f41c9160da8fda8b0495bf54..d58d35bfde6ab791fcca33e93805306103ae5ee7 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui_lazy/TimelineGrid.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui_lazy/TimelineGrid.js
@@ -52,7 +52,6 @@ WebInspector.TimelineGrid = function()
*/
WebInspector.TimelineGrid.calculateDividerOffsets = function(calculator, freeZoneAtLeft)
{
- // TODO(allada) Remove this code out when timeline canvas experiment is over.
/** @const */ var minGridSlicePx = 64; // minimal distance between grid lines.
var clientWidth = calculator.computePosition(calculator.maximumBoundary());
@@ -95,17 +94,18 @@ WebInspector.TimelineGrid.calculateDividerOffsets = function(calculator, freeZon
};
/**
- * @param {!HTMLCanvasElement} canvas
+ * @param {!CanvasRenderingContext2D} context
* @param {!WebInspector.TimelineGrid.Calculator} calculator
+ * @param {number} paddingTop
+ * @param {number=} freeZoneAtLeft
*/
-WebInspector.TimelineGrid.drawCanvasGrid = function(canvas, calculator)
+WebInspector.TimelineGrid.drawCanvasGrid = function(context, calculator, paddingTop, freeZoneAtLeft)
{
- var context = canvas.getContext("2d");
context.save();
var ratio = window.devicePixelRatio;
context.scale(ratio, ratio);
- var width = canvas.width / window.devicePixelRatio;
- var height = canvas.height / window.devicePixelRatio;
+ var width = context.canvas.width / window.devicePixelRatio;
+ var height = context.canvas.height / window.devicePixelRatio;
var dividersData = WebInspector.TimelineGrid.calculateDividerOffsets(calculator);
var dividerOffsets = dividersData.offsets;
var precision = dividersData.precision;
@@ -121,14 +121,15 @@ WebInspector.TimelineGrid.drawCanvasGrid = function(canvas, calculator)
context.translate(0.5, 0.5);
const paddingRight = 4;
- const paddingTop = 3;
+ freeZoneAtLeft = freeZoneAtLeft || 0;
for (var i = 0; i < dividerOffsets.length; ++i) {
var time = dividerOffsets[i];
var position = calculator.computePosition(time);
var text = calculator.formatValue(time, precision);
var textWidth = context.measureText(text).width;
var textPosition = position - textWidth - paddingRight;
- context.fillText(text, textPosition, paddingTop);
+ if (freeZoneAtLeft < textPosition)
+ context.fillText(text, textPosition, paddingTop);
context.moveTo(position, 0);
context.lineTo(position, height);
}
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/ui_lazy/FlameChart.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698