Fix ph error on about:tracnig startup.

BUG=116189 Review URL: http://codereview.chromium.org/9584022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124789 0039d316-1c4b-4281-b951-d872f2087c98

Fix ph error on about:tracnig startup.
BUG=116189 Review URL: http://codereview.chromium.org/9584022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124789 0039d316-1c4b-4281-b951-d872f2087c98
a6ecf5fd · nduca@chromium.org · ca9bc12c · a6ecf5fd · a6ecf5fd · a6ecf5fd
Commit a6ecf5fd authored Mar 03, 2012 by nduca@chromium.org
4 changed files
--- a/chrome/browser/resources/tracing/timeline_model.js
+++ b/chrome/browser/resources/tracing/timeline_model.js
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.

@@ -502,7 +502,28 @@ cr.define('tracing', function() {
   */
  TimelineModel.registerImporter = function(importerConstructor) {
    importerConstructors.push(importerConstructor);
-  }
+  };
+
+  function TimelineModelEmptyImporter(events) {
+  };
+
+  TimelineModelEmptyImporter.canImport = function(eventData) {
+    if (eventData instanceof Array && eventData.length == 0)
+      return true;
+    if (typeof(eventData) === 'string' || eventData instanceof String) {
+      return eventData.length == 0;
+    }
+    return false;
+  };
+
+  TimelineModelEmptyImporter.prototype = {
+    __proto__: Object.prototype,
+
+    importEvents : function() {
+    }
+  };
+
+  TimelineModel.registerImporter(TimelineModelEmptyImporter);

  TimelineModel.prototype = {
    __proto__: cr.EventTarget.prototype,
@@ -787,4 +808,5 @@ cr.define('tracing', function() {
    TimelineCpu: TimelineCpu,
    TimelineModel: TimelineModel
  };
+
 });
--- a/chrome/browser/resources/tracing/timeline_model_test.html
+++ b/chrome/browser/resources/tracing/timeline_model_test.html
 <!DOCTYPE html>
 <html>
 <!--
-Copyright (c) 2011 The Chromium Authors. All rights reserved.
+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.
 -->
@@ -115,6 +115,11 @@ function testModelBounds_OneCpu() {
 function testModelBounds_OneCpuOneThread() {
 }

+function testModelCanImportEmpty() {
+  var m;
+  m = new TimelineModel([]);
+  m = new TimelineModel("");
+}
 </script>
 </body>
 </html>
--- a/chrome/browser/resources/tracing/trace_event_importer.js
+++ b/chrome/browser/resources/tracing/trace_event_importer.js
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.

@@ -65,7 +65,7 @@ cr.define('tracing', function() {
    }

    // Might just be an array of events
-    if (eventData instanceof Array && eventData[0].ph)
+    if (eventData instanceof Array && eventData.length && eventData[0].ph)
      return true;

    // Might be an object with a traceEvents field in it.

--- a/chrome/browser/resources/tracing/trace_event_importer_test.html
+++ b/chrome/browser/resources/tracing/trace_event_importer_test.html
 <!DOCTYPE html>
 <html>
 <!--
-Copyright (c) 2011 The Chromium Authors. All rights reserved.
+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.
 -->
@@ -21,6 +21,11 @@ found in the LICENSE file.
 <body>
 <script>

+function testCanImportEmpty() {
+  self.assertFalse(tracing.TraceEventImporter.canImport([]));
+  self.assertFalse(tracing.TraceEventImporter.canImport(""));
+}
+
 function testBasicSingleThreadNonnestedParsing() {
  var events = [
    {name: 'a', args: {}, pid: 52, ts: 520, cat: 'foo', tid: 53, ph: 'B'},