Title: [98433] trunk
- Revision
- 98433
- Author
- [email protected]
- Date
- 2011-10-25 23:25:39 -0700 (Tue, 25 Oct 2011)
Log Message
Unreviewed, rolling out r98346.
http://trac.webkit.org/changeset/98346
https://bugs.webkit.org/show_bug.cgi?id=70874
Breaks JSC-based bots. (Requested by pfeldman on #webkit).
Patch by Sheriff Bot <[email protected]> on 2011-10-25
Source/WebCore:
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype.evaluateInSelectedCallFrame):
LayoutTests:
* inspector/debugger/error-in-watch-expressions.html:
* inspector/debugger/watch-expressions-panel-switch-expected.txt: Removed.
* inspector/debugger/watch-expressions-panel-switch.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (98432 => 98433)
--- trunk/LayoutTests/ChangeLog 2011-10-26 06:20:40 UTC (rev 98432)
+++ trunk/LayoutTests/ChangeLog 2011-10-26 06:25:39 UTC (rev 98433)
@@ -1,3 +1,15 @@
+2011-10-25 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98346.
+ http://trac.webkit.org/changeset/98346
+ https://bugs.webkit.org/show_bug.cgi?id=70874
+
+ Breaks JSC-based bots. (Requested by pfeldman on #webkit).
+
+ * inspector/debugger/error-in-watch-expressions.html:
+ * inspector/debugger/watch-expressions-panel-switch-expected.txt: Removed.
+ * inspector/debugger/watch-expressions-panel-switch.html: Removed.
+
2011-10-25 Ryosuke Niwa <[email protected]>
Flaky Test: editing/pasteboard/copy-standalone-image.html
Modified: trunk/LayoutTests/inspector/debugger/error-in-watch-expressions.html (98432 => 98433)
--- trunk/LayoutTests/inspector/debugger/error-in-watch-expressions.html 2011-10-26 06:20:40 UTC (rev 98432)
+++ trunk/LayoutTests/inspector/debugger/error-in-watch-expressions.html 2011-10-26 06:25:39 UTC (rev 98433)
@@ -7,24 +7,15 @@
var test = function()
{
- // We need to initialize scripts panel so that watch expressions section is created.
- WebInspector.showPanel("scripts");
-
var watchExpressionsSection = WebInspector.panels.scripts.sidebarPanes.watchExpressions.section;
- watchExpressionsSection.watchExpressions = [];
- watchExpressionsSection.watchExpressions.push("#$%");
+ watchExpressionsSection.addExpression();
+ watchExpressionsSection.watchExpressions[0] = "#$%";
watchExpressionsSection.update();
-
InspectorTest.runAfterPendingDispatches(step1);
function step1()
{
InspectorTest.addResult(watchExpressionsSection.element.innerHTML.indexOf("watch-expressions-error-level") !== -1 ? "SUCCESS" : "FAILED");
-
- // Clear watch expressions after execution.
- watchExpressionsSection.watchExpressions = [];
- watchExpressionsSection.update();
-
InspectorTest.completeTest();
}
}
Deleted: trunk/LayoutTests/inspector/debugger/watch-expressions-panel-switch-expected.txt (98432 => 98433)
--- trunk/LayoutTests/inspector/debugger/watch-expressions-panel-switch-expected.txt 2011-10-26 06:20:40 UTC (rev 98432)
+++ trunk/LayoutTests/inspector/debugger/watch-expressions-panel-switch-expected.txt 2011-10-26 06:25:39 UTC (rev 98433)
@@ -1,11 +0,0 @@
-Tests debugger does not fail when stopped while a panel other than scripts was opened. Both valid and invalid expressions are added to watch expressions.
-
-Bug 70718
-Script source was shown.
-Set timer for test function.
-Watch expressions updated.
-[expanded]
- window.document: HTMLDocument
- windowa.document: ReferenceError: windowa is not defined
-Debugger was disabled.
-
Deleted: trunk/LayoutTests/inspector/debugger/watch-expressions-panel-switch.html (98432 => 98433)
--- trunk/LayoutTests/inspector/debugger/watch-expressions-panel-switch.html 2011-10-26 06:20:40 UTC (rev 98432)
+++ trunk/LayoutTests/inspector/debugger/watch-expressions-panel-switch.html 2011-10-26 06:25:39 UTC (rev 98433)
@@ -1,65 +0,0 @@
-<html>
-<head>
-<script src=""
-<script src=""
-<script src=""
-<script>
-function testFunction()
-{
- var x = Math.sqrt(10);
- return x;
-}
-
-var test = function()
-{
- InspectorTest.setQuiet(true);
-
- // We need to initialize scripts panel so that watch expressions section is created.
- WebInspector.showPanel("scripts");
-
- var watchExpressionsSection = WebInspector.panels.scripts.sidebarPanes.watchExpressions.section;
- watchExpressionsSection.watchExpressions = [];
- watchExpressionsSection.watchExpressions.push("window.document");
- watchExpressionsSection.watchExpressions.push("windowa.document");
- watchExpressionsSection.update();
-
- var testName = WebInspector.mainResource.url;
- testName = testName.substring(testName.lastIndexOf('/') + 1);
- InspectorTest.showScriptSource(testName, didShowScriptSource);
-
- var currentSourceFrame;
- function didShowScriptSource(sourceFrame)
- {
- currentSourceFrame = sourceFrame;
- InspectorTest.addResult("Script source was shown.");
- InspectorTest.setBreakpoint(currentSourceFrame, 9, "", true);
- InspectorTest.addSniffer(WebInspector.WatchExpressionsSection.prototype, "update", watchExpressionsUpdated);
- // Switch to another panel to test how watch expressions evaluation together with panel switching.
- WebInspector.showPanel("network");
- InspectorTest.runTestFunctionAndWaitUntilPaused(didPaused);
- }
-
- function didPaused(callFrames)
- {
- }
-
- function watchExpressionsUpdated()
- {
- InspectorTest.addResult("Watch expressions updated.");
- InspectorTest.dumpObjectPropertySection(watchExpressionsSection, {});
-
- // Clear watch expressions after execution.
- watchExpressionsSection.watchExpressions = [];
- watchExpressionsSection.update();
-
- InspectorTest.completeDebuggerTest();
- }
-}
-
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests debugger does not fail when stopped while a panel other than scripts was opened. Both valid and invalid expressions are added to watch expressions.</p>
-<a href="" 70718</a>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (98432 => 98433)
--- trunk/Source/WebCore/ChangeLog 2011-10-26 06:20:40 UTC (rev 98432)
+++ trunk/Source/WebCore/ChangeLog 2011-10-26 06:25:39 UTC (rev 98433)
@@ -1,3 +1,14 @@
+2011-10-25 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98346.
+ http://trac.webkit.org/changeset/98346
+ https://bugs.webkit.org/show_bug.cgi?id=70874
+
+ Breaks JSC-based bots. (Requested by pfeldman on #webkit).
+
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype.evaluateInSelectedCallFrame):
+
2011-10-25 Nat Duca <[email protected]>
[chromium] Enable threaded compositing via CCThreadProxy::hasThread only
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (98432 => 98433)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-10-26 06:20:40 UTC (rev 98432)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-10-26 06:25:39 UTC (rev 98433)
@@ -467,8 +467,7 @@
callback(WebInspector.RemoteObject.fromPayload(result), wasThrown);
}
var selectedCallFrame = this._presentationModel.selectedCallFrame;
- if (selectedCallFrame)
- selectedCallFrame.evaluate(code, objectGroup, includeCommandLineAPI, returnByValue, didEvaluate.bind(this));
+ selectedCallFrame.evaluate(code, objectGroup, includeCommandLineAPI, returnByValue, didEvaluate.bind(this));
},
getSelectedCallFrameVariables: function(callback)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
