Title: [160718] trunk/Source/WebKit2
- Revision
- 160718
- Author
- [email protected]
- Date
- 2013-12-17 11:46:32 -0800 (Tue, 17 Dec 2013)
Log Message
Fixed an assertion failure seen running some mixed-content tests.
https://bugs.webkit.org/show_bug.cgi?id=125862
Reviewed by Alexey Proskuryakov.
* UIProcess/PageLoadState.cpp:
(WebKit::PageLoadState::didDisplayOrRunInsecureContent): Removed an assertion about the URL
of the main frame when dealing with a notification that could have come from any frame.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160717 => 160718)
--- trunk/Source/WebKit2/ChangeLog 2013-12-17 18:46:04 UTC (rev 160717)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-17 19:46:32 UTC (rev 160718)
@@ -1,5 +1,16 @@
2013-12-17 Dan Bernstein <[email protected]>
+ Fixed an assertion failure seen running some mixed-content tests.
+ https://bugs.webkit.org/show_bug.cgi?id=125862
+
+ Reviewed by Alexey Proskuryakov.
+
+ * UIProcess/PageLoadState.cpp:
+ (WebKit::PageLoadState::didDisplayOrRunInsecureContent): Removed an assertion about the URL
+ of the main frame when dealing with a notification that could have come from any frame.
+
+2013-12-17 Dan Bernstein <[email protected]>
+
[Cocoa] Add properties related to the user agent string
https://bugs.webkit.org/show_bug.cgi?id=125856
Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.cpp (160717 => 160718)
--- trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2013-12-17 18:46:04 UTC (rev 160717)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2013-12-17 19:46:32 UTC (rev 160718)
@@ -272,7 +272,6 @@
void PageLoadState::didDisplayOrRunInsecureContent(const Transaction::Token& token)
{
ASSERT_UNUSED(token, &token.m_pageLoadState == this);
- ASSERT(m_uncommittedState.url.startsWith("https:", false));
m_uncommittedState.hasInsecureContent = true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
