Title: [121084] trunk/Source/WebCore
- Revision
- 121084
- Author
- [email protected]
- Date
- 2012-06-22 18:35:16 -0700 (Fri, 22 Jun 2012)
Log Message
Web Inspector: Fix negative time interval on zoom-in
https://bugs.webkit.org/show_bug.cgi?id=89798
Patch by Eugene Klyuchnikov <[email protected]> on 2012-06-22
Reviewed by Pavel Feldman.
Steps to reproduce:
1) Record timeline
2) Select small range with left tick close to zero
3) Move pointer to the right end of the ruler
4) Zoom-in with mouse-wheel
Result: right tick goes below the zero.
* inspector/front-end/TimelineOverviewPane.js:
(WebInspector.TimelineOverviewWindow.prototype._zoom):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121083 => 121084)
--- trunk/Source/WebCore/ChangeLog 2012-06-23 01:23:48 UTC (rev 121083)
+++ trunk/Source/WebCore/ChangeLog 2012-06-23 01:35:16 UTC (rev 121084)
@@ -1,3 +1,21 @@
+2012-06-22 Eugene Klyuchnikov <[email protected]>
+
+ Web Inspector: Fix negative time interval on zoom-in
+ https://bugs.webkit.org/show_bug.cgi?id=89798
+
+ Reviewed by Pavel Feldman.
+
+ Steps to reproduce:
+ 1) Record timeline
+ 2) Select small range with left tick close to zero
+ 3) Move pointer to the right end of the ruler
+ 4) Zoom-in with mouse-wheel
+
+ Result: right tick goes below the zero.
+
+ * inspector/front-end/TimelineOverviewPane.js:
+ (WebInspector.TimelineOverviewWindow.prototype._zoom):
+
2012-06-22 Alexandru Chiculita <[email protected]>
[CSS Shaders] Re-enable the CSS Shaders compile time flag on Safari Mac
Modified: trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js (121083 => 121084)
--- trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js 2012-06-23 01:23:48 UTC (rev 121083)
+++ trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js 2012-06-23 01:35:16 UTC (rev 121084)
@@ -583,10 +583,12 @@
var left = this._leftResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset;
var right = this._rightResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset;
- if (factor < 1 && factor * (right - left) < WebInspector.TimelineOverviewPane.MinSelectableSize)
+ var delta = factor * (right - left);
+ if (factor < 1 && delta < WebInspector.TimelineOverviewPane.MinSelectableSize)
return;
- left = Math.max(0, referencePoint + (left - referencePoint) * factor);
- right = Math.min(this._parentElement.clientWidth, referencePoint + (right - referencePoint) * factor);
+ var max = this._parentElement.clientWidth;
+ left = Math.max(0, Math.min(max - delta, referencePoint + (left - referencePoint) * factor));
+ right = Math.min(max, left + delta);
this._setWindowPosition(left, right);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
