Title: [181915] trunk/Source/WebCore
- Revision
- 181915
- Author
- [email protected]
- Date
- 2015-03-24 16:10:03 -0700 (Tue, 24 Mar 2015)
Log Message
Regression(r181671): Caused Timer-related crashes on iOS / WK1
https://bugs.webkit.org/show_bug.cgi?id=143025
Reviewed by Andy Estes.
Call CFRunLoopAddTimer() on WebThreadRunLoop() instead of
CFRunLoopGetCurrent() for iOS, as we did before r181671.
I inadvertently changed this in r181671 when merging the Mac
and iOS implementations.
No new tests, already covered by existing tests.
* platform/cf/SharedTimerCF.mm:
(WebCore::setSharedTimerFireInterval):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181914 => 181915)
--- trunk/Source/WebCore/ChangeLog 2015-03-24 22:56:03 UTC (rev 181914)
+++ trunk/Source/WebCore/ChangeLog 2015-03-24 23:10:03 UTC (rev 181915)
@@ -1,3 +1,21 @@
+2015-03-24 Chris Dumez <[email protected]>
+
+ Regression(r181671): Caused Timer-related crashes on iOS / WK1
+ https://bugs.webkit.org/show_bug.cgi?id=143025
+
+ Reviewed by Andy Estes.
+
+ Call CFRunLoopAddTimer() on WebThreadRunLoop() instead of
+ CFRunLoopGetCurrent() for iOS, as we did before r181671.
+
+ I inadvertently changed this in r181671 when merging the Mac
+ and iOS implementations.
+
+ No new tests, already covered by existing tests.
+
+ * platform/cf/SharedTimerCF.mm:
+ (WebCore::setSharedTimerFireInterval):
+
2015-03-24 Dan Bernstein <[email protected]>
WebCore part of <rdar://problem/20282863> Transforms are flattened in snapshots of on-screen WKWebViews
Modified: trunk/Source/WebCore/platform/cf/SharedTimerCF.mm (181914 => 181915)
--- trunk/Source/WebCore/platform/cf/SharedTimerCF.mm 2015-03-24 22:56:03 UTC (rev 181914)
+++ trunk/Source/WebCore/platform/cf/SharedTimerCF.mm 2015-03-24 23:10:03 UTC (rev 181915)
@@ -29,6 +29,7 @@
#if PLATFORM(MAC)
#import "PowerObserverMac.h"
#elif PLATFORM(IOS)
+#import "WebCoreThread.h"
#import "WebCoreThreadRun.h"
#endif
@@ -106,7 +107,11 @@
CFAbsoluteTime fireDate = CFAbsoluteTimeGetCurrent() + interval;
if (!sharedTimer) {
sharedTimer = CFRunLoopTimerCreate(nullptr, fireDate, kCFTimeIntervalDistantFuture, 0, 0, timerFired, nullptr);
+#if PLATFORM(IOS)
+ CFRunLoopAddTimer(WebThreadRunLoop(), sharedTimer, kCFRunLoopCommonModes);
+#else
CFRunLoopAddTimer(CFRunLoopGetCurrent(), sharedTimer, kCFRunLoopCommonModes);
+#endif
setupPowerObserver();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
