Title: [184705] branches/safari-601.1.32.2-branch/Source/WebKit2
- Revision
- 184705
- Author
- matthew_han...@apple.com
- Date
- 2015-05-20 23:39:32 -0700 (Wed, 20 May 2015)
Log Message
Merge r184679. rdar://problem/20990162
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184704 => 184705)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-21 06:39:27 UTC (rev 184704)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-21 06:39:32 UTC (rev 184705)
@@ -1,5 +1,22 @@
2015-05-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r184679. rdar://problem/20990162
+
+ 2015-05-20 Tim Horton <timothy_hor...@apple.com>
+
+ Allow overriding the waitForDidUpdateViewState timeout
+ https://bugs.webkit.org/show_bug.cgi?id=145230
+ <rdar://problem/20990162>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::waitForDidUpdateViewState):
+ Use the value from NSUserDefaults, if it exists.
+ We'll only check once, so changing the default requires a restart of the UI process.
+
+2015-05-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r184681. rdar://problem/20924495
2015-05-20 Enrica Casucci <enr...@apple.com>
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (184704 => 184705)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2015-05-21 06:39:27 UTC (rev 184704)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2015-05-21 06:39:32 UTC (rev 184705)
@@ -393,11 +393,16 @@
void RemoteLayerTreeDrawingAreaProxy::waitForDidUpdateViewState()
{
+ static std::chrono::milliseconds viewStateUpdateTimeout = [] {
+ if (id value = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitOverrideViewStateUpdateTimeout"])
+ return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::duration<double>([value doubleValue]));
+
#if PLATFORM(IOS)
- auto viewStateUpdateTimeout = std::chrono::milliseconds(500);
+ return std::chrono::milliseconds(500);
#else
- auto viewStateUpdateTimeout = std::chrono::milliseconds(250);
+ return std::chrono::milliseconds(250);
#endif
+ }();
m_webPageProxy.process().connection()->waitForAndDispatchImmediately<Messages::RemoteLayerTreeDrawingAreaProxy::CommitLayerTree>(m_webPageProxy.pageID(), viewStateUpdateTimeout, InterruptWaitingIfSyncMessageArrives);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
