Merge 144463

Source/WebCore/inspector/front-end/NavigatorView.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:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 224 matching lines @@
         var data = { uiSourceCode: uiSourceCode, name: newTitle };
         this.dispatchEventToListeners(WebInspector.NavigatorView.Events.FileRenamed, data);
     },
 
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
      * @param {function(boolean)=} callback
      */
     rename: function(uiSourceCode, callback)
     {
-        var scriptTreeElement = this._getScriptTreeElement[uiSourceCode.uri()];
+        var scriptTreeElement = this._getScriptTreeElement(uiSourceCode);
         if (!scriptTreeElement)
             return;
 
         // Tree outline should be marked as edited as well as the tree element to prevent search from starting.
         var treeOutlineElement = scriptTreeElement.treeOutline.element;
         WebInspector.markBeingEdited(treeOutlineElement, true);
 
         function commitHandler(element, newTitle, oldTitle)
         {
             if (newTitle && newTitle !== oldTitle)
@@ skipping 423 matching lines @@
     /**
      * @param {Event} event
      */
     _handleContextMenuEvent: function(event)
     {
         this._navigatorView.handleContextMenu(event, this._uiSourceCode);
     },
 
     __proto__: WebInspector.BaseNavigatorTreeElement.prototype
 }