Title: [205432] releases/WebKitGTK/webkit-2.12/Source/WebKit2
- Revision
- 205432
- Author
- [email protected]
- Date
- 2016-09-05 01:31:11 -0700 (Mon, 05 Sep 2016)
Log Message
Merge r202940 - Followup to r202939.
https://bugs.webkit.org/show_bug.cgi?id=159526
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::didFailLoading):
We need the correct destination id when sending a message.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (205431 => 205432)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-09-05 07:57:57 UTC (rev 205431)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-09-05 08:31:11 UTC (rev 205432)
@@ -1,3 +1,12 @@
+2016-07-07 Alex Christensen <[email protected]>
+
+ Followup to r202939.
+ https://bugs.webkit.org/show_bug.cgi?id=159526
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::didFailLoading):
+ We need the correct destination id when sending a message.
+
2016-08-24 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.12.4 release.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (205431 => 205432)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-09-05 07:57:57 UTC (rev 205431)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-09-05 08:31:11 UTC (rev 205432)
@@ -378,7 +378,7 @@
m_synchronousLoadData->error = error;
sendReplyToSynchronousRequest(*m_synchronousLoadData, nullptr);
} else if (auto* connection = messageSenderConnection())
- connection->send(Messages::WebResourceLoader::DidFailResourceLoad(error), 0, 0);
+ connection->send(Messages::WebResourceLoader::DidFailResourceLoad(error), messageSenderDestinationID(), 0);
cleanup();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes