Title: [159586] trunk
- Revision
- 159586
- Author
- [email protected]
- Date
- 2013-11-20 15:22:37 -0800 (Wed, 20 Nov 2013)
Log Message
Enable PageLoadTest assertions again
https://bugs.webkit.org/show_bug.cgi?id=124681
Reviewed by Tim Horton.
Source/WebKit2:
Remove an overzealous assertion and re-enable assertions in PageLoadState again.
* UIProcess/PageLoadState.cpp:
(WebKit::PageLoadState::didCommitLoad):
Remove assertion - it's fine for a page to have a null URL.
(WebKit::PageLoadState::didFinishLoad):
Ditto.
(WebKit::PageLoadState::didFailLoad):
Update the state.
Tools:
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
Actually install all-content-in-one-iframe.html, noticed while debugging this assertion.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159585 => 159586)
--- trunk/Source/WebKit2/ChangeLog 2013-11-20 22:55:20 UTC (rev 159585)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-20 23:22:37 UTC (rev 159586)
@@ -1,5 +1,24 @@
2013-11-20 Anders Carlsson <[email protected]>
+ Enable PageLoadTest assertions again
+ https://bugs.webkit.org/show_bug.cgi?id=124681
+
+ Reviewed by Tim Horton.
+
+ Remove an overzealous assertion and re-enable assertions in PageLoadState again.
+
+ * UIProcess/PageLoadState.cpp:
+ (WebKit::PageLoadState::didCommitLoad):
+ Remove assertion - it's fine for a page to have a null URL.
+
+ (WebKit::PageLoadState::didFinishLoad):
+ Ditto.
+
+ (WebKit::PageLoadState::didFailLoad):
+ Update the state.
+
+2013-11-20 Anders Carlsson <[email protected]>
+
PageLoadState should keep track of unreachable URLs
https://bugs.webkit.org/show_bug.cgi?id=124677
Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.cpp (159585 => 159586)
--- trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2013-11-20 22:55:20 UTC (rev 159585)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2013-11-20 23:22:37 UTC (rev 159586)
@@ -26,9 +26,6 @@
#include "config.h"
#include "PageLoadState.h"
-#undef ASSERT
-#define ASSERT(x) ((void)0)
-
namespace WebKit {
PageLoadState::PageLoadState()
@@ -95,7 +92,6 @@
void PageLoadState::didCommitLoad()
{
ASSERT(m_state == State::Provisional);
- ASSERT(!m_provisionalURL.isEmpty());
m_state = State::Committed;
m_url = m_provisionalURL;
@@ -106,7 +102,6 @@
{
ASSERT(m_state == State::Committed);
ASSERT(m_provisionalURL.isEmpty());
- ASSERT(!m_url.isEmpty());
m_state = State::Finished;
}
@@ -114,7 +109,8 @@
void PageLoadState::didFailLoad()
{
ASSERT(m_provisionalURL.isEmpty());
- ASSERT(!m_url.isEmpty());
+
+ m_state = State::Finished;
}
void PageLoadState::didSameDocumentNavigation(const String& url)
Modified: trunk/Tools/ChangeLog (159585 => 159586)
--- trunk/Tools/ChangeLog 2013-11-20 22:55:20 UTC (rev 159585)
+++ trunk/Tools/ChangeLog 2013-11-20 23:22:37 UTC (rev 159586)
@@ -1,3 +1,13 @@
+2013-11-20 Anders Carlsson <[email protected]>
+
+ Enable PageLoadTest assertions again
+ https://bugs.webkit.org/show_bug.cgi?id=124681
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ Actually install all-content-in-one-iframe.html, noticed while debugging this assertion.
+
2013-11-20 Mark Rowe <[email protected]>
Remove some obsolete logic from WebKit.app.
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (159585 => 159586)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2013-11-20 22:55:20 UTC (rev 159585)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2013-11-20 23:22:37 UTC (rev 159586)
@@ -19,6 +19,7 @@
1A02C84F125D4A8400E3F4BD /* Find.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A02C84E125D4A8400E3F4BD /* Find.cpp */; };
1A02C870125D4CFD00E3F4BD /* find.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A02C84B125D4A5E00E3F4BD /* find.html */; };
1A5FEFDD1270E2A3000E2921 /* EvaluateJavaScript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5FEFDC1270E2A3000E2921 /* EvaluateJavaScript.cpp */; };
+ 1A63479F183D72A4005B1707 /* all-content-in-one-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
1A7BFC0C171A0BDB00BC5F64 /* WillSendSubmitEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7BFC0A171A0BDB00BC5F64 /* WillSendSubmitEvent.mm */; };
1A7E8B34181208DE00AEB74A /* FragmentNavigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */; };
1A7E8B3618120B2F00AEB74A /* FragmentNavigation.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A7E8B351812093600AEB74A /* FragmentNavigation.html */; };
@@ -282,6 +283,7 @@
F6B7BE9717469B96008A3445 /* associate-form-controls.html in Copy Resources */,
379028B914FAC24C007E6B43 /* acceptsFirstMouse.html in Copy Resources */,
B55F11BE15191A0600915916 /* Ahem.ttf in Copy Resources */,
+ 1A63479F183D72A4005B1707 /* all-content-in-one-iframe.html in Copy Resources */,
B55F11B71517D03300915916 /* attributedStringCustomFont.html in Copy Resources */,
7C9ED98B17A19F4B00E4DC33 /* attributedStringStrikethrough.html in Copy Resources */,
76E182DF154767E600F1FADD /* auto-submitting-form.html in Copy Resources */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
