Merge 142128

Source/WebCore/inspector/front-end/utilities.js

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  * 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 687 matching lines @@
             ++this._size;
         this._map[objectIdentifier] = [key, value];
     },
     
     /**
      * @param {Object} key
      */
     remove: function(key)
     {
         var result = this._map[key.__identifier];
+        if (!result)
+            return undefined;
+        --this._size;
         delete this._map[key.__identifier];
-        --this._size;
-        return result ? result[1] : undefined;
+        return result[1];
     },
 
     /**
      * @return {Array.<Object>}
      */
     keys: function()
     {
         return this._list(0);
     },
 
@@ skipping 132 matching lines @@
 function importScript(scriptName)
 {
     if (_importedScripts[scriptName])
         return;
     _importedScripts[scriptName] = true;
     var xhr = new XMLHttpRequest();
     xhr.open("GET", scriptName, false);
     xhr.send(null);
     window.eval(xhr.responseText + "\n//@ sourceURL=" + scriptName);
 }