Commit 9f74ac02 authored by ggaren's avatar ggaren

Rolling out a change I included by accident in my last commit.

        
        * bridge/mac/FrameMac.mm:
        (WebCore::FrameMac::passMouseDownEventToWidget):
        * platform/mac/SharedTimerMac.cpp:
        (WebCore::setSharedTimerFireTime):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@16093 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5fee66cd
2006-08-29 Geoffrey Garen <ggaren@apple.com>
Rolling out a change I included by accident in my last commit.
* bridge/mac/FrameMac.mm:
(WebCore::FrameMac::passMouseDownEventToWidget):
* platform/mac/SharedTimerMac.cpp:
(WebCore::setSharedTimerFireTime):
2006-08-28 Geoffrey Garen <ggaren@apple.com> 2006-08-28 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej. Reviewed by Maciej.
......
...@@ -1505,12 +1505,17 @@ bool FrameMac::passMouseDownEventToWidget(Widget* widget) ...@@ -1505,12 +1505,17 @@ bool FrameMac::passMouseDownEventToWidget(Widget* widget)
BOOL wasDeferringLoading = [_bridge defersLoading]; BOOL wasDeferringLoading = [_bridge defersLoading];
if (!wasDeferringLoading) if (!wasDeferringLoading)
[_bridge setDefersLoading:YES]; [_bridge setDefersLoading:YES];
BOOL wasDeferringTimers = isDeferringTimers();
if (!wasDeferringTimers)
setDeferringTimers(true);
ASSERT(!_sendingEventToSubview); ASSERT(!_sendingEventToSubview);
_sendingEventToSubview = true; _sendingEventToSubview = true;
[view mouseDown:_currentEvent]; [view mouseDown:_currentEvent];
_sendingEventToSubview = false; _sendingEventToSubview = false;
if (!wasDeferringTimers)
setDeferringTimers(false);
if (!wasDeferringLoading) if (!wasDeferringLoading)
[_bridge setDefersLoading:NO]; [_bridge setDefersLoading:NO];
......
...@@ -57,7 +57,7 @@ void setSharedTimerFireTime(double fireTime) ...@@ -57,7 +57,7 @@ void setSharedTimerFireTime(double fireTime)
CFAbsoluteTime fireDate = fireTime - kCFAbsoluteTimeIntervalSince1970; CFAbsoluteTime fireDate = fireTime - kCFAbsoluteTimeIntervalSince1970;
sharedTimer = CFRunLoopTimerCreate(0, fireDate, 0, 0, 0, timerFired, 0); sharedTimer = CFRunLoopTimerCreate(0, fireDate, 0, 0, 0, timerFired, 0);
CFRunLoopAddTimer(CFRunLoopGetCurrent(), sharedTimer, kCFRunLoopCommonModes); CFRunLoopAddTimer(CFRunLoopGetCurrent(), sharedTimer, kCFRunLoopDefaultMode);
} }
void stopSharedTimer() void stopSharedTimer()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment