Title: [128638] trunk/Tools
- Revision
- 128638
- Author
- [email protected]
- Date
- 2012-09-14 12:08:29 -0700 (Fri, 14 Sep 2012)
Log Message
[WK2] webarchive/loading/_javascript_-url-iframe-crash.html fails
https://bugs.webkit.org/show_bug.cgi?id=96817
Reviewed by Kenneth Rohde Christiansen.
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame): This callback
got overlooked when adding logging elsewhere.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128637 => 128638)
--- trunk/Tools/ChangeLog 2012-09-14 19:04:17 UTC (rev 128637)
+++ trunk/Tools/ChangeLog 2012-09-14 19:08:29 UTC (rev 128638)
@@ -1,3 +1,14 @@
+2012-09-14 Alexey Proskuryakov <[email protected]>
+
+ [WK2] webarchive/loading/_javascript_-url-iframe-crash.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=96817
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame): This callback
+ got overlooked when adding logging elsewhere.
+
2012-09-14 Peter Beverloo <[email protected]>
[Chromium] Build fix for DumpRenderTree following r128628
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (128637 => 128638)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-09-14 19:04:17 UTC (rev 128637)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-09-14 19:08:29 UTC (rev 128638)
@@ -774,6 +774,11 @@
if (!InjectedBundle::shared().isTestRunning())
return;
+ if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
+ dumpFrameDescriptionSuitableForTestResult(frame);
+ InjectedBundle::shared().stringBuilder()->appendLiteral(" - didFailProvisionalLoadWithError\n");
+ }
+
if (frame != InjectedBundle::shared().topLoadingFrame())
return;
InjectedBundle::shared().setTopLoadingFrame(0);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
