[polymer] Merge of master into polymer10-migration

tracing/tracing/extras/importer/linux_perf/ftrace_importer.html

Index: tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
diff --git a/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html b/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
index 477223b164054a8830b4d06b5ad45b82f1d107ca..32ef08ca75bfcad553190af85fffd1df456b6c5a 100644
--- a/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
+++ b/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
@@ -152,7 +152,7 @@ tr.exportTo('tr.e.importer.linux_perf', function() {
   TestExports.traceEventClockSyncRE = traceEventClockSyncRE;
 
   var realTimeClockSyncRE = /trace_event_clock_sync: realtime_ts=(\d+)/;
-  var genericClockSyncRE = /trace_event_clock_sync: name=(\w+)/;
+  var genericClockSyncRE = /trace_event_clock_sync: name=([\w\-]+)/;
 
   // Some kernel trace events are manually classified in slices and
   // hand-assigned a pseudo PID.
@@ -729,6 +729,8 @@ tr.exportTo('tr.e.importer.linux_perf', function() {
       // sync ID and the current time according to the "ftrace global" clock.
       var event = /name=(\w+?)\s(.+)/.exec(eventBase.details);
       if (event) {
+        // TODO(alexandermont): This section of code seems to be broken. It
+        // creates an "args" variable, but doesn't seem to do anything with it.
         var name = event[1];
         var pieces = event[2].split(' ');
         var args = {
@@ -746,6 +748,15 @@ tr.exportTo('tr.e.importer.linux_perf', function() {
         return true;
       }
 
+      // Check to see if we have a "new style" clock sync marker that contains
+      // only a sync ID.
+      var event = /name=([\w\-]+)/.exec(eventBase.details);
+      if (event) {
+        this.model_.clockSyncManager.addClockSyncMarker(
+            tr.model.ClockDomainId.LINUX_FTRACE_GLOBAL, event[1], ts);
+        return true;
+      }
+
       // Check to see if we have a special clock sync marker that contains both
       // the current "ftrace global" time and the current CLOCK_MONOTONIC time.
       event = /parent_ts=(\d+\.?\d*)/.exec(eventBase.details);