Title: [88792] trunk
- Revision
- 88792
- Author
- pfeld...@chromium.org
- Date
- 2011-06-14 05:53:31 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Pavel Feldman <pfeld...@google.com>
Reviewed by Yury Semikhatsky.
Web Inspector: reload from within inspector window does not work while debugger is paused.
https://bugs.webkit.org/show_bug.cgi?id=62631
* inspector/debugger/debugger-reload-on-pause-expected.txt: Added.
* inspector/debugger/debugger-reload-on-pause.html: Added.
2011-06-14 Pavel Feldman <pfeld...@google.com>
Reviewed by Yury Semikhatsky.
Web Inspector: reload from within inspector window does not work while debugger is paused.
https://bugs.webkit.org/show_bug.cgi?id=62631
Test: inspector/debugger/debugger-reload-on-pause.html
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (88791 => 88792)
--- trunk/LayoutTests/ChangeLog 2011-06-14 12:32:08 UTC (rev 88791)
+++ trunk/LayoutTests/ChangeLog 2011-06-14 12:53:31 UTC (rev 88792)
@@ -1,3 +1,13 @@
+2011-06-14 Pavel Feldman <pfeld...@google.com>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: reload from within inspector window does not work while debugger is paused.
+ https://bugs.webkit.org/show_bug.cgi?id=62631
+
+ * inspector/debugger/debugger-reload-on-pause-expected.txt: Added.
+ * inspector/debugger/debugger-reload-on-pause.html: Added.
+
2011-06-14 Kent Tamura <tk...@chromium.org>
[Chromium] Test expectation update for r88757.
Added: trunk/LayoutTests/inspector/debugger/debugger-reload-on-pause-expected.txt (0 => 88792)
--- trunk/LayoutTests/inspector/debugger/debugger-reload-on-pause-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/debugger/debugger-reload-on-pause-expected.txt 2011-06-14 12:53:31 UTC (rev 88792)
@@ -0,0 +1,9 @@
+Tests "reload" from within inspector window while on pause.
+
+Debugger was enabled.
+Set timer for test function.
+Script execution paused.
+Script execution resumed.
+Page reloaded.
+Debugger was disabled.
+
Property changes on: trunk/LayoutTests/inspector/debugger/debugger-reload-on-pause-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/inspector/debugger/debugger-reload-on-pause.html (0 => 88792)
--- trunk/LayoutTests/inspector/debugger/debugger-reload-on-pause.html (rev 0)
+++ trunk/LayoutTests/inspector/debugger/debugger-reload-on-pause.html 2011-06-14 12:53:31 UTC (rev 88792)
@@ -0,0 +1,41 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+
+function testFunction()
+{
+ debugger;
+}
+
+var test = function()
+{
+ InspectorTest.startDebuggerTest(step1);
+
+ function step1()
+ {
+ InspectorTest.runTestFunctionAndWaitUntilPaused(step2);
+ }
+
+ function step2()
+ {
+ InspectorTest.reloadPage(step3);
+ }
+
+ function step3()
+ {
+ InspectorTest.completeDebuggerTest();
+ }
+}
+
+</script>
+</head>
+
+<body _onload_="runTest()">
+<p>
+Tests "reload" from within inspector window while on pause.
+</p>
+
+</body>
+</html>
Property changes on: trunk/LayoutTests/inspector/debugger/debugger-reload-on-pause.html
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebCore/ChangeLog (88791 => 88792)
--- trunk/Source/WebCore/ChangeLog 2011-06-14 12:32:08 UTC (rev 88791)
+++ trunk/Source/WebCore/ChangeLog 2011-06-14 12:53:31 UTC (rev 88792)
@@ -1,3 +1,15 @@
+2011-06-14 Pavel Feldman <pfeld...@google.com>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: reload from within inspector window does not work while debugger is paused.
+ https://bugs.webkit.org/show_bug.cgi?id=62631
+
+ Test: inspector/debugger/debugger-reload-on-pause.html
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
+
2011-06-14 Gyuyoung Kim <gyuyoung....@samsung.com>
Reviewed by Kent Tamura.
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (88791 => 88792)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2011-06-14 12:32:08 UTC (rev 88791)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2011-06-14 12:53:31 UTC (rev 88792)
@@ -2839,7 +2839,7 @@
if (!m_frame->page())
return;
-#if ENABLE(_javascript__DEBUGGER) && USE(JSC) && ENABLE(INSPECTOR)
+#if ENABLE(_javascript__DEBUGGER) && ENABLE(INSPECTOR)
if (Page* page = m_frame->page()) {
if (page->mainFrame() == m_frame)
m_frame->page()->inspectorController()->resume();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
