Title: [185751] trunk/Source/WebKit2
- Revision
- 185751
- Author
- [email protected]
- Date
- 2015-06-19 10:08:28 -0700 (Fri, 19 Jun 2015)
Log Message
Disable SpinTracer detection while loading sync XHR
https://bugs.webkit.org/show_bug.cgi?id=146150
rdar://problem/21462023
Reviewed by Dan Bernstein.
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::loadResourceSynchronously):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185750 => 185751)
--- trunk/Source/WebKit2/ChangeLog 2015-06-19 16:58:14 UTC (rev 185750)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-19 17:08:28 UTC (rev 185751)
@@ -1,5 +1,16 @@
2015-06-19 Anders Carlsson <[email protected]>
+ Disable SpinTracer detection while loading sync XHR
+ https://bugs.webkit.org/show_bug.cgi?id=146150
+ rdar://problem/21462023
+
+ Reviewed by Dan Bernstein.
+
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::loadResourceSynchronously):
+
+2015-06-19 Anders Carlsson <[email protected]>
+
Spintracer treats the web process as hung when it's showing _javascript_ dialogs in the UI process
https://bugs.webkit.org/show_bug.cgi?id=146124
rdar://problem/21449395
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (185750 => 185751)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-06-19 16:58:14 UTC (rev 185750)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-06-19 17:08:28 UTC (rev 185751)
@@ -28,6 +28,7 @@
#include "BlockingResponseMap.h"
#include "DataReference.h"
+#include "HangDetectionDisabler.h"
#include "NetworkResourceLoadParameters.h"
#include "PluginInfoStore.h"
#include "SessionTracker.h"
@@ -239,6 +240,8 @@
data.resize(0);
+ HangDetectionDisabler hangDetectionDisabler;
+
if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
response = ResourceResponse();
error = internalError(request.url());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
