Merge branch 'profiler-zooming' into cutting-edge

operasoftware · Dec 12, 2012 · 6975d98 · 6975d98
2 parents c89a13b + 5c62faa
commit 6975d98
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/profiler/profiler_view.js b/src/profiler/profiler_view.js
@@ -443,8 +443,11 @@ var ProfilerView = function(id, name, container_class, html, default_handler)
     var timeline_list = this._timeline_list;
     var interval = timeline_list.interval;
     var visible_event_list = timeline_list.eventList.filter(function(event) {
-      return (event.interval.start <= x1 || event.interval.end >= x0)
-             && event.time > this._min_event_time;
+      var start = event.interval.start;
+      var end = event.interval.end;
+      return ((start <= x0 && end >= x0) ||
+              (start >= x0 && start <= x1)) &&
+             event.time > this._min_event_time;
     }, this);
     var aggregated_event_list = this._get_aggregated_event_list(visible_event_list);
     var width = this._timeline_width;