Title: [200142] trunk/Source/WebKit2
- Revision
- 200142
- Author
- [email protected]
- Date
- 2016-04-27 12:30:01 -0700 (Wed, 27 Apr 2016)
Log Message
Fix assertion when downloading with NSURLSession after r198955
https://bugs.webkit.org/show_bug.cgi?id=157051
Patch by Alex Christensen <[email protected]> on 2016-04-27
Reviewed by Brady Eidson.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::continueDecidePendingDownloadDestination):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (200141 => 200142)
--- trunk/Source/WebKit2/ChangeLog 2016-04-27 19:01:21 UTC (rev 200141)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-27 19:30:01 UTC (rev 200142)
@@ -1,3 +1,13 @@
+2016-04-27 Alex Christensen <[email protected]>
+
+ Fix assertion when downloading with NSURLSession after r198955
+ https://bugs.webkit.org/show_bug.cgi?id=157051
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::continueDecidePendingDownloadDestination):
+
2016-04-27 Carlos Garcia Campos <[email protected]>
REGRESSION(r200094): [FreeType] Vertical text is broken after r200094
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (200141 => 200142)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-04-27 19:01:21 UTC (rev 200141)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-04-27 19:30:01 UTC (rev 200142)
@@ -523,7 +523,10 @@
void NetworkProcess::continueDecidePendingDownloadDestination(DownloadID downloadID, String destination, const SandboxExtension::Handle& sandboxExtensionHandle, bool allowOverwrite)
{
- downloadManager().continueDecidePendingDownloadDestination(downloadID, destination, sandboxExtensionHandle, allowOverwrite);
+ if (destination.isEmpty())
+ downloadManager().cancelDownload(downloadID);
+ else
+ downloadManager().continueDecidePendingDownloadDestination(downloadID, destination, sandboxExtensionHandle, allowOverwrite);
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
