Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234

3 files changed, 17 insertions, 7 deletions

diff --git a/WebKit/chromium/src/js/DebuggerScript.js b/WebKit/chromium/src/js/DebuggerScript.js
index 7c4d126..7e5b430 100644
--- a/WebKit/chromium/src/js/DebuggerScript.js
+++ b/WebKit/chromium/src/js/DebuggerScript.js
@@ -43,9 +43,9 @@ DebuggerScript._pauseOnExceptionsState = DebuggerScript.PauseOnExceptionsState.D
 Debug.clearBreakOnException();
 Debug.clearBreakOnUncaughtException();
 
-DebuggerScript.getAfterCompileScript = function(execState, args)
+DebuggerScript.getAfterCompileScript = function(eventData)
 {
-    return DebuggerScript._formatScript(args.eventData.script_.script_);
+    return DebuggerScript._formatScript(eventData.script_.script_);
 }
 
 DebuggerScript.getScripts = function(contextData)
@@ -137,17 +137,17 @@ DebuggerScript.currentCallFrame = function(execState, args)
     return topFrame;
 }
 
-DebuggerScript.stepIntoStatement = function(execState, args)
+DebuggerScript.stepIntoStatement = function(execState)
 {
     execState.prepareStep(Debug.StepAction.StepIn, 1);
 }
 
-DebuggerScript.stepOverStatement = function(execState, args)
+DebuggerScript.stepOverStatement = function(execState)
 {
     execState.prepareStep(Debug.StepAction.StepNext, 1);
 }
 
-DebuggerScript.stepOutOfFunction = function(execState, args)
+DebuggerScript.stepOutOfFunction = function(execState)
 {
     execState.prepareStep(Debug.StepAction.StepOut, 1);
 }
diff --git a/WebKit/chromium/src/js/InspectorControllerImpl.js b/WebKit/chromium/src/js/InspectorControllerImpl.js
index 5c3e8bd..86f885a 100644
--- a/WebKit/chromium/src/js/InspectorControllerImpl.js
+++ b/WebKit/chromium/src/js/InspectorControllerImpl.js
@@ -56,6 +56,8 @@ devtools.InspectorBackendImpl = function()
     this.installInspectorControllerDelegate_("getEventListenersForNode");
     this.installInspectorControllerDelegate_("getProfile");
     this.installInspectorControllerDelegate_("getProfileHeaders");
+    this.installInspectorControllerDelegate_("removeProfile");
+    this.installInspectorControllerDelegate_("clearProfiles");
     this.installInspectorControllerDelegate_("getResourceContent");
     this.installInspectorControllerDelegate_("highlightDOMNode");
     this.installInspectorControllerDelegate_("hideDOMNodeHighlight");
@@ -80,6 +82,8 @@ devtools.InspectorBackendImpl = function()
     this.installInspectorControllerDelegate_("getStyles");
     this.installInspectorControllerDelegate_("getComputedStyle");
     this.installInspectorControllerDelegate_("getInlineStyle");
+    this.installInspectorControllerDelegate_("getStyleSheet");
+    this.installInspectorControllerDelegate_("getRuleRangesForStyleSheetId");
     this.installInspectorControllerDelegate_("applyStyleText");
     this.installInspectorControllerDelegate_("setStyleText");
     this.installInspectorControllerDelegate_("setStyleProperty");
@@ -94,7 +98,6 @@ devtools.InspectorBackendImpl = function()
     this.installInspectorControllerDelegate_("removeBreakpoint");
     this.installInspectorControllerDelegate_("activateBreakpoints");
     this.installInspectorControllerDelegate_("deactivateBreakpoints");
-    this.installInspectorControllerDelegate_("pauseInDebugger");
     this.installInspectorControllerDelegate_("resumeDebugger");
     this.installInspectorControllerDelegate_("stepIntoStatementInDebugger");
     this.installInspectorControllerDelegate_("stepOutOfFunctionInDebugger");
@@ -217,6 +220,13 @@ devtools.InspectorBackendImpl.prototype.setPauseOnExceptions = function(value)
     return devtools.tools.getDebuggerAgent().setPauseOnExceptions(value);
 };
 
+} else {
+
+devtools.InspectorBackendImpl.prototype.pauseInDebugger = function()
+{
+    RemoteDebuggerCommandExecutor.DebuggerPauseScript();
+};
+
 }
 
 
diff --git a/WebKit/chromium/src/js/devTools.css b/WebKit/chromium/src/js/devTools.css
index 6b4b3e5..2cb4ab3 100755
--- a/WebKit/chromium/src/js/devTools.css
+++ b/WebKit/chromium/src/js/devTools.css
@@ -237,6 +237,6 @@ select.status-bar-item {
     -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.0);
 }
 
-.timeline-category-tree-item input {
+.timeline-category-statusbar-item input {
     vertical-align: middle;
 }