Merge 102699 - Web Inspector: Network item view does not correctly decode "+" in request parameters.

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

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) IBM Corp. 2009  All rights reserved.
  * 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 109 matching lines @@
         var fragment = document.createDocumentFragment();
         fragment.createChild("div", "header-name").textContent = name + ":";
         fragment.createChild("div", "header-value source-code").textContent = value;
 
         return fragment;
     },
 
     /**
      * @param {string} value
      * @param {string} className
+     * @param {boolean} decodeParameters
      */
-    _formatParameter: function(value, className)
+    _formatParameter: function(value, className, decodeParameters)
     {
         var errorDecoding = false;
 
-        if (this._decodeRequestParameters) {
+        if (decodeParameters) {
+            value = value.replace(/\+/g, " ");
             if (value.indexOf("%") >= 0) {
                 try {
                     value = decodeURIComponent(value);
                 } catch(e) {
                     errorDecoding = true;
                 }
             }
-            value = value.replace(/\+/g, " ");
         }
         var div = document.createElement("div");
         div.className = className;
         if (errorDecoding)
             div.createChild("span", "error-message").textContent = WebInspector.UIString("(unable to decode value)");
         else
             div.textContent = value;
         return div;
     },
 
@@ skipping 75 matching lines @@
         parmsTreeElement.listItemElement.appendChild(headerCount);
 
         var toggleTitle = this._decodeRequestParameters ? WebInspector.UIString("view URL encoded") : WebInspector.UIString("view decoded");
         var toggleButton = this._createToggleButton(toggleTitle);
         toggleButton.addEventListener("click", this._toggleURLdecoding.bind(this));
         parmsTreeElement.listItemElement.appendChild(toggleButton);
 
 
         for (var i = 0; i < parms.length; ++i) {
             var paramNameValue = document.createDocumentFragment();
-            var name = this._formatParameter(parms[i].name + ":", "header-name");
-            var value = this._formatParameter(parms[i].value, "header-name source-code");
+            var name = this._formatParameter(parms[i].name + ":", "header-name", this._decodeRequestParameters);
+            var value = this._formatParameter(parms[i].value, "header-value source-code", this._decodeRequestParameters);
             paramNameValue.appendChild(name);
             paramNameValue.appendChild(value);
 
             var parmTreeElement = new TreeElement(paramNameValue, null, false);
             parmTreeElement.selectable = false;
             parmsTreeElement.appendChild(parmTreeElement);
         }
     },
 
     _toggleURLdecoding: function(event)
@@ skipping 151 matching lines @@
     },
 
     _createHeadersToggleButton: function(isHeadersTextShown)
     {
         var toggleTitle = isHeadersTextShown ? WebInspector.UIString("view parsed") : WebInspector.UIString("view source");
         return this._createToggleButton(toggleTitle);
     }
 }
 
 WebInspector.ResourceHeadersView.prototype.__proto__ = WebInspector.View.prototype;