Title: [222334] trunk/Source/WebKit
- Revision
- 222334
- Author
- [email protected]
- Date
- 2017-09-21 11:20:03 -0700 (Thu, 21 Sep 2017)
Log Message
[WK2] Add API to get the redirect chain of a WKDownload
https://bugs.webkit.org/show_bug.cgi?id=176628
<rdar://problem/34338279>
Reviewed by Alex Christensen.
Re-enable assertion initially added in r222308 and later disabled in
r222320. The assertion was hit because we failed to clear the redirect
chain in WebFrameProxy::didFailProvisionalLoad().
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::didStartProvisionalLoad):
(WebKit::WebFrameProxy::didFailProvisionalLoad):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (222333 => 222334)
--- trunk/Source/WebKit/ChangeLog 2017-09-21 18:16:56 UTC (rev 222333)
+++ trunk/Source/WebKit/ChangeLog 2017-09-21 18:20:03 UTC (rev 222334)
@@ -1,3 +1,19 @@
+2017-09-21 Chris Dumez <[email protected]>
+
+ [WK2] Add API to get the redirect chain of a WKDownload
+ https://bugs.webkit.org/show_bug.cgi?id=176628
+ <rdar://problem/34338279>
+
+ Reviewed by Alex Christensen.
+
+ Re-enable assertion initially added in r222308 and later disabled in
+ r222320. The assertion was hit because we failed to clear the redirect
+ chain in WebFrameProxy::didFailProvisionalLoad().
+
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::didStartProvisionalLoad):
+ (WebKit::WebFrameProxy::didFailProvisionalLoad):
+
2017-09-21 Alex Christensen <[email protected]>
REGRESSION(r221465) WKWebViews without WebGL delegate callbacks crash when WebGL contexts are created
Modified: trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp (222333 => 222334)
--- trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp 2017-09-21 18:16:56 UTC (rev 222333)
+++ trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp 2017-09-21 18:20:03 UTC (rev 222334)
@@ -132,8 +132,7 @@
void WebFrameProxy::didStartProvisionalLoad(const URL& url)
{
- // FIXME: Re-enable this assertion.
- // ASSERT(m_provisionalLoadRedirectChain.isEmpty());
+ ASSERT(m_provisionalLoadRedirectChain.isEmpty());
m_provisionalLoadRedirectChain = { url };
m_frameLoadState.didStartProvisionalLoad(url);
@@ -150,6 +149,7 @@
void WebFrameProxy::didFailProvisionalLoad()
{
+ m_provisionalLoadRedirectChain.clear();
m_frameLoadState.didFailProvisionalLoad();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
