[cc-frame-viewer] Panoply of fixes

tools/cc-frame-viewer/src/model.js

 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 'use strict';
 
 base.require('model.layer_tree_host_impl');
 
 base.exportTo('ccfv', function() {
 
   function unquoteIfNeeded(val) {
+    if (typeof val !== 'string')
+      return val;
     if (val[0] == '{' && val[val.length - 1] == '}') {
       return JSON.parse(val);
     } else {
       return val;
     }
   }
 
   /**
    * A generic container for data from a cc trace.
    *
@@ skipping 26 matching lines @@
 
       var events = trace.traceEvents;
       for (var i = 0; i < events.length; i++) {
         var event = events[i];
         if (event.name == 'Frame')
           this.handleFrameEvent(event);
       }
     },
 
     handleFrameEvent: function(event) {
-      if (typeof event.args.frame !== 'string')
+      if (event.args.frame === 'undefined')
         throw new Error('Expected Frame to have args.frame of type string.');
       var frameData = unquoteIfNeeded(event.args.frame);
 
       var lthiID;
       if (frameData.lthi_id === undefined) {
         // Old versions used compositor_instance instead of lthiID.
         if (frameData.compositor_instance === undefined)
           throw new Error('Expected Frame to have a lthi_id field.');
         lthiID = frameData.compositor_instance;
       } else {
@@ skipping 37 matching lines @@
       tile.managedState = tileData.managed_state;
     }
   };
 
 
   return {
     Model: Model,
   }
 });