Title: [93362] branches/safari-534.51-branch/Source/WebKit2
- Revision
- 93362
- Author
- [email protected]
- Date
- 2011-08-18 15:49:44 -0700 (Thu, 18 Aug 2011)
Log Message
Merge r92729. Needed for <rdar://problem/9966800>
Modified Paths
Diff
Modified: branches/safari-534.51-branch/Source/WebKit2/ChangeLog (93361 => 93362)
--- branches/safari-534.51-branch/Source/WebKit2/ChangeLog 2011-08-18 22:46:42 UTC (rev 93361)
+++ branches/safari-534.51-branch/Source/WebKit2/ChangeLog 2011-08-18 22:49:44 UTC (rev 93362)
@@ -1,3 +1,19 @@
+2011-08-18 Lucas Forschler <[email protected]>
+
+ Merged 92729
+
+ 2011-08-09 John Sullivan <[email protected]>
+
+ WKPageCopyPendingAPIRequestURL returns stale result if policy decision set to Ignore
+ https://bugs.webkit.org/show_bug.cgi?id=65950
+ <rdar://problem/9925931>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::receivedPolicyDecision):
+ Call clearPendingAPIRequestURL() if the policy decision is PolicyIgnore.
+
2011-08-11 Lucas Forschler <[email protected]>
Merged 92384
Modified: branches/safari-534.51-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (93361 => 93362)
--- branches/safari-534.51-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-08-18 22:46:42 UTC (rev 93361)
+++ branches/safari-534.51-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-08-18 22:49:44 UTC (rev 93362)
@@ -947,6 +947,9 @@
{
if (!isValid())
return;
+
+ if (action == PolicyIgnore)
+ clearPendingAPIRequestURL();
uint64_t downloadID = 0;
if (action == PolicyDownload) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
