X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Ftrace-viewer%2Ftrace_viewer%2Ftracing%2Ftimeline_view.html;h=1bb1eeaf4cf479c1d8b265d13b812c3d5fb10739;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=2d70860f518464140a898bc63fc518050cb3dec8;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/trace-viewer/trace_viewer/tracing/timeline_view.html b/src/third_party/trace-viewer/trace_viewer/tracing/timeline_view.html
index 2d70860..1bb1eea 100644
--- a/src/third_party/trace-viewer/trace_viewer/tracing/timeline_view.html
+++ b/src/third_party/trace-viewer/trace_viewer/tracing/timeline_view.html
@@ -35,7 +35,7 @@ found in the LICENSE file.
     <x-timeline-view-side-panel-container></x-timeline-view-side-panel-container>
   </middle-container>
   <x-drag-handle></x-drag-handle>
-  <div id="analysis"></div>
+  <tracing-analysis-view id="analysis"></tracing-analysis-view>
 </template>
 
 <template id="help-btn-template">
@@ -230,9 +230,7 @@ tvcm.exportTo('tracing', function() {
       tvcm.ui.decorate(this.dragEl_, tvcm.ui.DragHandle);
 
       this.analysisEl_ = this.querySelector('#analysis');
-      tvcm.ui.decorate(this.analysisEl_, tracing.analysis.AnalysisView);
 
-      this.appendChild(this.analysisEl_);
       this.addEventListener('requestSelectionChange',
                             this.onRequestSelectionChange_.bind(this));
 
@@ -243,6 +241,10 @@ tvcm.exportTo('tracing', function() {
       document.addEventListener('keypress', this.onKeypress_.bind(this), true);
 
       this.dragEl_.target = this.analysisEl_;
+
+      // State management on selection change.
+      this.selections_ = {};
+      window.addEventListener('popstate', this.onPopState_.bind(this));
     },
 
     createHelpButton_: function() {
@@ -373,13 +375,13 @@ tvcm.exportTo('tracing', function() {
             'selectionChange', this.onSelectionChanged_);
         this.trackView_.viewport.addEventListener(
             'change', this.onViewportChanged_);
-        this.analysisEl_.clearSelectionHistory();
       }
 
       // Set the model.
       if (modelValid) {
         this.trackView_.model = model;
         this.timelineViewSidePanelContainer_.model = model;
+        this.clearSelectionHistory_();
       }
       tvcm.dispatchSimpleEvent(this, 'modelChange');
 
@@ -469,10 +471,32 @@ tvcm.exportTo('tracing', function() {
     },
 
     onRequestSelectionChange_: function(e) {
+      // Save the selection so that when back button is pressed,
+      // it could be retrieved.
+      this.selections_[e.selection.guid] = e.selection;
+      var state = {
+        selection_guid: e.selection.guid
+      };
+      window.history.pushState(state);
+
       this.trackView_.selection = e.selection;
       e.stopPropagation();
     },
 
+    onPopState_: function(e) {
+      if (e.state === null)
+        return;
+
+      var selection = this.selections_[e.state.selection_guid];
+      if (selection)
+        this.trackView_.selection = selection;
+      e.stopPropagation();
+    },
+
+    clearSelectionHistory_: function() {
+      this.selections_ = {};
+    },
+
     onViewportChanged_: function(e) {
       var spc = this.timelineViewSidePanelContainer_;
       if (!this.trackView_) {