DevTools: prepare Navigator and Network Project for merging uiSourceCodes

third_party/WebKit/Source/devtools/front_end/bindings/CompilerScriptMapping.js

 /*
  * Copyright (C) 2012 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 226 matching lines @@
    * @param {?SDK.SourceMap} sourceMap
    */
   _sourceMapAttachedForTest(sourceMap) {
   }
 
   /**
    * @param {!SDK.Script} script
    * @param {!SDK.SourceMap} sourceMap
    */
   _populateSourceMapSources(script, sourceMap) {
-    var executionContext = script.executionContext();
-    var frameId = executionContext ? executionContext.frameId || '' : '';
+    var frameId = Bindings.frameIdForScript(script);
     script[Bindings.CompilerScriptMapping._frameIdSymbol] = frameId;
     for (var sourceURL of sourceMap.sourceURLs()) {
       var contentProvider = sourceMap.sourceContentProvider(sourceURL, Common.resourceTypes.SourceMapScript);
       var embeddedContent = sourceMap.embeddedContentByURL(sourceURL);
       var embeddedContentLength = typeof embeddedContent === 'string' ? embeddedContent.length : null;
       var uiSourceCode = this._networkProject.addSourceMapFile(
           contentProvider, frameId, script.isContentScript(), embeddedContentLength);
       uiSourceCode[Bindings.CompilerScriptMapping._scriptSymbol] = script;
       this._scriptSources.set(script, uiSourceCode);
       this._debuggerWorkspaceBinding.setSourceMapping(this._debuggerModel, uiSourceCode, this);
@@ skipping 24 matching lines @@
   }
 
   dispose() {
     Common.EventTarget.removeEventListeners(this._eventListeners);
     this._stubProject.dispose();
   }
 };
 
 Bindings.CompilerScriptMapping._scriptSymbol = Symbol('Bindings.CompilerScriptMapping._scriptSymbol');
 Bindings.CompilerScriptMapping._frameIdSymbol = Symbol('Bindings.CompilerScriptMapping._frameIdSymbol');