[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 632ab6a1d9a39f1c9bf9a5413a0b5abb13a6cf7a
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 4 22:12:01 2003 +0000

            Reviewed by John.
    
            - fixed 3277675 -- REGRESSION: mouse wheel events not coalesced
    
            * WebView.subproj/WebHTMLViewPrivate.m: (-[WebNSWindow nextEventMatchingMask:untilDate:inMode:dequeue:]):
            When the mask is scroll wheel mask, instead of getting no events, do some tricks to get the next
            event if it is a scroll wheel event, and nothing otherwise. Also ifdef the fix so we don't compile
            it on Panther, since the underlying bug was fixed on Panther.
    
            - other changes
    
            * WebCoreSupport.subproj/WebImageRenderer.m: (-[WebImageRenderer copyWithZone:]):
            Remove unneeded line of code. The super function copies all simple fields for us.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView setMIMEType:]): Use copy instead of retain, do it in the right order
            to avoid "same object release/retain" disease.
            (-[WebBaseNetscapePluginView setBaseURL:]): Do retain before release (same reason as above).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4480 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f2a1fad..99ba6db 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,24 @@
+2003-06-04  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3277675 -- REGRESSION: mouse wheel events not coalesced
+
+        * WebView.subproj/WebHTMLViewPrivate.m: (-[WebNSWindow nextEventMatchingMask:untilDate:inMode:dequeue:]):
+        When the mask is scroll wheel mask, instead of getting no events, do some tricks to get the next
+        event if it is a scroll wheel event, and nothing otherwise. Also ifdef the fix so we don't compile
+        it on Panther, since the underlying bug was fixed on Panther.
+    
+        - other changes
+
+        * WebCoreSupport.subproj/WebImageRenderer.m: (-[WebImageRenderer copyWithZone:]):
+        Remove unneeded line of code. The super function copies all simple fields for us.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView setMIMEType:]): Use copy instead of retain, do it in the right order
+        to avoid "same object release/retain" disease.
+        (-[WebBaseNetscapePluginView setBaseURL:]): Do retain before release (same reason as above).
+
 2003-06-03  Chris Blumenberg  <cblu at apple.com>
 
         Fixed: 3278496 - <rdar://problem/3278496>:	NSURLDownload: initWithSource and source should be renamed to initWithRequest and request
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index ee2c975..dc9b875 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -902,14 +902,16 @@ typedef struct {
 
 - (void)setMIMEType:(NSString *)theMIMEType
 {
+    NSString *type = [theMIMEType copy];
     [MIMEType release];
-    MIMEType = [theMIMEType retain];
+    MIMEType = type;
 }
 
 - (void)setBaseURL:(NSURL *)theBaseURL
 {
+    [theBaseURL retain];
     [baseURL release];
-    baseURL = [theBaseURL retain];
+    baseURL = theBaseURL;
 }
 
 - (void)setAttributeKeys:(NSArray *)keys andValues:(NSArray *)values;
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index a44041b..0abd9e9 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -141,7 +141,6 @@ static NSMutableArray *activeImageRenderers;
     copy->frameView = nil;
     copy->patternColor = nil;
     copy->MIMEType = [MIMEType copy];
-    copy->isNull = isNull;
         
     return copy;
 }
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 9e8f50e..10348b0 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -734,13 +734,19 @@ static BOOL inNSTextViewDrawRect;
     [super sendEvent:event];
 }
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
+
 // Workaround for bug 3245425 - nextEventMatchingMask:NSScrollWheelMask allows any kind of event.
-// Better to just not return any events (and not coalesce scroll wheel events) than to consume and
-// return other types of events.
 - (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)deqFlag
 {
     if (mask == NSScrollWheelMask) {
-        return nil;
+        NSEvent *event = [super nextEventMatchingMask:mask untilDate:expiration inMode:mode dequeue:NO];
+        if (event == nil || [event type] != NSScrollWheel) {
+            return nil;
+        }
+        if (!deqFlag) {
+            return event;
+        }
     }
 
     NSEvent *event = [super nextEventMatchingMask:mask untilDate:expiration inMode:mode dequeue:deqFlag];
@@ -752,6 +758,8 @@ static BOOL inNSTextViewDrawRect;
     return event;
 }
 
+#endif // version <= 10.2
+
 @end
 
 @implementation NSMutableDictionary (WebHTMLViewExtras)

-- 
WebKit Debian packaging