Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

1 files changed, 7 insertions, 7 deletions

diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index 5563b93..3c4a0be 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -25,9 +25,7 @@
 
 WebInspector.ScriptsPanel = function()
 {
-    WebInspector.Panel.call(this);
-
-    this.element.addStyleClass("scripts");
+    WebInspector.Panel.call(this, "scripts");
 
     this.topStatusBar = document.createElement("div");
     this.topStatusBar.className = "status-bar";
@@ -184,8 +182,6 @@ WebInspector.ScriptsPanel.PauseOnExceptionsState = {
 };
 
 WebInspector.ScriptsPanel.prototype = {
-    toolbarItemClass: "scripts",
-
     get toolbarItemLabel()
     {
         return WebInspector.UIString("Scripts");
@@ -794,15 +790,20 @@ WebInspector.ScriptsPanel.prototype = {
     _endSidebarResizeDrag: function(event)
     {
         WebInspector.elementDragEnd(event);
-
         delete this._dragOffset;
+        this.saveSidebarWidth();
     },
 
     _sidebarResizeDrag: function(event)
     {
         var x = event.pageX + this._dragOffset;
         var newWidth = Number.constrain(window.innerWidth - x, Preferences.minScriptsSidebarWidth, window.innerWidth * 0.66);
+        this.setSidebarWidth(newWidth);
+        event.preventDefault();
+    },
 
+    setSidebarWidth: function(newWidth)
+    {
         this.sidebarElement.style.width = newWidth + "px";
         this.sidebarButtonsElement.style.width = newWidth + "px";
         this.viewsContainerElement.style.right = newWidth + "px";
@@ -810,7 +811,6 @@ WebInspector.ScriptsPanel.prototype = {
         this.sidebarResizeElement.style.right = (newWidth - 3) + "px";
 
         this.resize();
-        event.preventDefault();
     },
     
     updatePauseOnExceptionsState: function(pauseOnExceptionsState)