X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=Source%2FWebKit2%2FChangeLog;h=e41168e8acb1aae2101c33b0368093bb6d44e4fe;hp=2cb4dafc753b53d16b2cfc93b34ba8cf2570ada2;hb=173907ec430a2a4b500d8d58e6e141e8454686b9;hpb=3c5f3caa21f7e95e36aabb4c7bc3d1ca4af9fcf6;ds=sidebyside

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 2cb4dafc753b..e41168e8acb1 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,25 @@
+2014-07-21  Timothy Horton  <timothy_horton@apple.com>
+
+        Random crashes on the Web Thread due to Timers firing on the wrong thread in the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=135132
+        <rdar://problem/17719832>
+
+        Reviewed by Simon Fraser.
+
+        * UIProcess/ProcessThrottler.cpp:
+        (WebKit::ProcessThrottler::ProcessThrottler):
+        (WebKit::ProcessThrottler::suspendTimerFired):
+        * UIProcess/ProcessThrottler.h:
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        (WebKit::ViewGestureController::ViewGestureController):
+        (WebKit::ViewGestureController::swipeSnapshotWatchdogTimerFired):
+        * UIProcess/mac/ViewGestureController.h:
+        * UIProcess/mac/ViewGestureControllerMac.mm:
+        (WebKit::ViewGestureController::ViewGestureController):
+        (WebKit::ViewGestureController::swipeSnapshotWatchdogTimerFired):
+        We can't use WebCore timers in the UI process because of coexistence concerns
+        (they fire on the Web Thread if there is one!), so use RunLoop::Timer instead.
+
 2014-07-21  Andy Estes  <aestes@apple.com>
 
         [iOS] Handle QuickLook ResourceLoaders in the web process