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: https://svn.webkit.org/repository/webkit/trunk@16093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e28a83299b92ef1d1dc6b14bc48a5d37d51550fb..ef076b538045e3566c0755fbb47d5a9085f6bfbd 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+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>
 
         Reviewed by Maciej.

diff --git a/WebCore/bridge/mac/FrameMac.mm b/WebCore/bridge/mac/FrameMac.mm
index 86ad2acf54b7560b808e212f3501c513e36eb9c3..81f83c00b84e0ca33e191b70a7a334ad984a3774 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.mm
+++ b/WebCore/bridge/mac/FrameMac.mm
@@ -1505,12 +1505,17 @@ bool FrameMac::passMouseDownEventToWidget(Widget* widget)
     BOOL wasDeferringLoading = [_bridge defersLoading];
     if (!wasDeferringLoading)
         [_bridge setDefersLoading:YES];
+    BOOL wasDeferringTimers = isDeferringTimers();
+    if (!wasDeferringTimers)
+        setDeferringTimers(true);
 
     ASSERT(!_sendingEventToSubview);
     _sendingEventToSubview = true;
     [view mouseDown:_currentEvent];
     _sendingEventToSubview = false;
     
+    if (!wasDeferringTimers)
+        setDeferringTimers(false);
     if (!wasDeferringLoading)
         [_bridge setDefersLoading:NO];
 

diff --git a/WebCore/platform/mac/SharedTimerMac.cpp b/WebCore/platform/mac/SharedTimerMac.cpp
index 1349ea291a6323e6318374ab5f871acfce9a938a..4b5f21a1007c65f3f1d255642799e210a2a6c8b5 100644 (file)
--- a/WebCore/platform/mac/SharedTimerMac.cpp
+++ b/WebCore/platform/mac/SharedTimerMac.cpp
@@ -57,7 +57,7 @@ void setSharedTimerFireTime(double fireTime)
 
     CFAbsoluteTime fireDate = fireTime - kCFAbsoluteTimeIntervalSince1970;
     sharedTimer = CFRunLoopTimerCreate(0, fireDate, 0, 0, 0, timerFired, 0);
-    CFRunLoopAddTimer(CFRunLoopGetCurrent(), sharedTimer, kCFRunLoopCommonModes);
+    CFRunLoopAddTimer(CFRunLoopGetCurrent(), sharedTimer, kCFRunLoopDefaultMode);
 }
 
 void stopSharedTimer()