[DevTools] Eliminate frameId and isContentScript from js protocol.

third_party/WebKit/Source/platform/v8_inspector/DebuggerScript.js

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 134 matching lines @@
     if (firstComma === -1)
         return 0;
     var secondComma = contextData.indexOf(",", firstComma + 1);
     if (secondComma === -1)
         return 0;
 
     return parseInt(contextData.substring(firstComma + 1, secondComma), 10) || 0;
 }
 
 /**
+ * @param {string|undefined} contextData
+ * @return {string}
+ */
+DebuggerScript._executionContextAuxData = function(contextData)
+{
+    if (!contextData)
+        return "";
+    var firstComma = contextData.indexOf(",");

[kozy, 2016/08/05 02:35:41]

Can we use regexp here?
var matches = contextData.match(/[^,]+,[^,]+,(.+)/)
return matches ? matches[1] : "";

[dgozman, 2016/08/05 18:00:38]

Done.

+    if (firstComma === -1)
+        return "";
+    var secondComma = contextData.indexOf(",", firstComma + 1);
+    if (secondComma === -1)
+        return "";
+
+    return contextData.substring(secondComma + 1);
+}
+
+/**
  * @param {string} contextGroupId
  * @return {!Array<!FormattedScript>}
  */
 DebuggerScript.getScripts = function(contextGroupId)
 {
     var result = [];
     var scripts = Debug.scripts();
     var contextDataPrefix = null;
     if (contextGroupId)
         contextDataPrefix = contextGroupId + ",";
     for (var i = 0; i < scripts.length; ++i) {
         var script = scripts[i];
         if (contextDataPrefix) {
             if (!script.context_data)
                 continue;
             // Context data is a string in the following format:
-            // <contextGroupId>,<contextId>,("default"|"nondefault")
+            // <contextGroupId>,<contextId>,<auxData>
             if (script.context_data.indexOf(contextDataPrefix) !== 0)
                 continue;
         }
         result.push(DebuggerScript._formatScript(script));
     }
     return result;
 }
 
 /**
  * @param {!Script} script
@@ skipping 19 matching lines @@
         id: script.id,
         name: script.nameOrSourceURL(),
         sourceURL: script.source_url,
         sourceMappingURL: script.source_mapping_url,
         source: script.source,
         startLine: script.line_offset,
         startColumn: script.column_offset,
         endLine: endLine,
         endColumn: endColumn,
         executionContextId: DebuggerScript._executionContextId(script.context_data),
-        isContentScript: !!script.context_data && script.context_data.endsWith(",nondefault"),
+        // Note that we cannot derive aux data from context id because of compilation cache.
+        executionContextAuxData: DebuggerScript._executionContextAuxData(script.context_data),
         isInternalScript: script.is_debugger_script
     };
 }
 
 /**
  * @param {!ExecutionState} execState
  * @param {!BreakpointInfo} info
  * @return {string|undefined}
  */
 DebuggerScript.setBreakpoint = function(execState, info)
@@ skipping 469 matching lines @@
         break;
     }
     return result;
 }
 
 // We never resolve Mirror by its handle so to avoid memory leaks caused by Mirrors in the cache we disable it.
 ToggleMirrorCache(false);
 
 return DebuggerScript;
 })();