Changeset 160718 in webkit

Timestamp:

Dec 17, 2013 11:46:32 AM (10 years ago)

Author:

mitz@apple.com

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/PageLoadState.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-17  Dan Bernstein  <mitz@apple.com>
+
+        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  <mitz@apple.com>
 

trunk/Source/WebKit2/UIProcess/PageLoadState.cpp

@@ -273 +273 @@
 {
     ASSERT_UNUSED(token, &token.m_pageLoadState == this);
-    ASSERT(m_uncommittedState.url.startsWith("https:", false));
 
     m_uncommittedState.hasInsecureContent = true;