Changeset 142907 in webkit
- Timestamp:
- Feb 14, 2013 1:34:00 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r142904 r142907 1 2013-02-14 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r142825. 4 http://trac.webkit.org/changeset/142825 5 https://bugs.webkit.org/show_bug.cgi?id=109856 6 7 Causes some inspector tests to time out (Requested by anttik 8 on #webkit). 9 10 * platform/mac/SharedTimerMac.mm: 11 (WebCore): 12 (WebCore::PowerObserver::restartSharedTimer): 13 (WebCore::setSharedTimerFireInterval): 14 (WebCore::stopSharedTimer): 15 1 16 2013-02-14 Lamarque V. Souza <Lamarque.Souza@basyskom.com> 2 17 -
trunk/Source/WebCore/platform/mac/SharedTimerMac.mm
r142825 r142907 43 43 namespace WebCore { 44 44 45 static const CFTimeInterval distantFuture = 60 * 60 * 24 * 365 * 10; // Decade. 46 45 static CFRunLoopTimerRef sharedTimer; 47 46 static void (*sharedTimerFiredFunction)(); 48 47 static void timerFired(CFRunLoopTimerRef, void*); … … 145 144 ASSERT(CFRunLoopGetCurrent() == CFRunLoopGetMain()); 146 145 146 if (!sharedTimer) 147 return; 148 147 149 stopSharedTimer(); 148 150 timerFired(0, 0); 149 151 } 150 152 151 static CFRunLoopTimerRef sharedTimer() 152 { 153 static CFRunLoopTimerRef timer; 154 static dispatch_once_t onceToken; 155 dispatch_once(&onceToken, ^{ 156 timer = CFRunLoopTimerCreate(0, CFAbsoluteTimeGetCurrent() + distantFuture, distantFuture, 0, 0, timerFired, 0); 157 CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopCommonModes); 158 159 static PowerObserver* powerObserver; 160 powerObserver = PowerObserver::create().leakPtr(); 161 }); 162 return timer; 163 }; 153 static PowerObserver* PowerObserver; 164 154 165 155 void setSharedTimerFiredFunction(void (*f)()) … … 181 171 { 182 172 ASSERT(sharedTimerFiredFunction); 173 174 if (sharedTimer) { 175 CFRunLoopTimerInvalidate(sharedTimer); 176 CFRelease(sharedTimer); 177 } 178 183 179 CFAbsoluteTime fireDate = CFAbsoluteTimeGetCurrent() + interval; 184 CFRunLoopTimerSetNextFireDate(sharedTimer(), fireDate); 180 sharedTimer = CFRunLoopTimerCreate(0, fireDate, 0, 0, 0, timerFired, 0); 181 CFRunLoopAddTimer(CFRunLoopGetCurrent(), sharedTimer, kCFRunLoopCommonModes); 182 183 if (!PowerObserver) 184 PowerObserver = PowerObserver::create().leakPtr(); 185 185 } 186 186 187 187 void stopSharedTimer() 188 188 { 189 CFRunLoopTimerSetNextFireDate(sharedTimer(), CFAbsoluteTimeGetCurrent() + distantFuture); 189 if (sharedTimer) { 190 CFRunLoopTimerInvalidate(sharedTimer); 191 CFRelease(sharedTimer); 192 sharedTimer = 0; 193 } 190 194 } 191 195
Note: See TracChangeset
for help on using the changeset viewer.