DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js

 /*
  * Copyright (C) 2011 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 94 matching lines @@
     {
         if (!this.uiSourceCode().contentType().isScript())
             return;
 
         if (this._divergedInfobar)
             this._divergedInfobar.dispose();
 
         var infobar = new WebInspector.UISourceCodeFrame.Infobar(WebInspector.Infobar.Type.Warning, WebInspector.UIString("Workspace mapping mismatch"));
         this._divergedInfobar = infobar;
 
-        var fileURL = this.uiSourceCode().originURL();
+        var fileURL = this.uiSourceCode().url();
         infobar.createDetailsRowMessage(WebInspector.UIString("The content of this file on the file system:\u00a0")).appendChild(
             WebInspector.linkifyURLAsNode(fileURL, fileURL, "source-frame-infobar-details-url", true));
 
         var scriptURL = WebInspector.networkMapping.networkURL(this.uiSourceCode());
         infobar.createDetailsRowMessage(WebInspector.UIString("does not match the loaded script:\u00a0")).appendChild(
             WebInspector.linkifyURLAsNode(scriptURL, scriptURL, "source-frame-infobar-details-url", true));
 
         infobar.createDetailsRowMessage();
         infobar.createDetailsRowMessage(WebInspector.UIString("Possible solutions are:"));
 
@@ skipping 15 matching lines @@
     },
 
     _showBlackboxInfobarIfNeeded: function()
     {
         if (!this.uiSourceCode().contentType().hasScripts())
             return;
         var projectType = this.uiSourceCode().project().type();
         if (projectType === WebInspector.projectTypes.Snippets)
             return;
         var networkURL = WebInspector.networkMapping.networkURL(this.uiSourceCode());
-        var url = projectType === WebInspector.projectTypes.Formatter ? this.uiSourceCode().originURL() : networkURL;
+        var url = projectType === WebInspector.projectTypes.Formatter ? this.uiSourceCode().url() : networkURL;
         var isContentScript = projectType === WebInspector.projectTypes.ContentScripts;
         if (!WebInspector.BlackboxSupport.isBlackboxed(url, isContentScript)) {
             this._hideBlackboxInfobar();
             return;
         }
 
         if (this._blackboxInfobar)
             this._blackboxInfobar.dispose();
 
         var infobar = new WebInspector.UISourceCodeFrame.Infobar(WebInspector.Infobar.Type.Warning, WebInspector.UIString("This script is blackboxed in debugger"));
@@ skipping 908 matching lines @@
         this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
         this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
         this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events.TitleChanged, this._showBlackboxInfobarIfNeeded, this);
         WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListener(this._showBlackboxInfobarIfNeeded, this);
         WebInspector.moduleSetting("skipContentScripts").removeChangeListener(this._showBlackboxInfobarIfNeeded, this);
         WebInspector.UISourceCodeFrame.prototype.dispose.call(this);
     },
 
     __proto__: WebInspector.UISourceCodeFrame.prototype
 }