Changeset 23582 in webkit

Timestamp:

Jun 18, 2007, 9:56:27 PM (18 years ago)

Author:

kdecker

Message:

Reviewed by Kevin Decker

• Carbon/HIWebView.m: (WindowHandler): HIObjectIsOfClass requires non-NULL input on Tiger. Reworked Kevin Decker's patch to remove the conditional compilation for Tiger, yet still avoid crashing BBEdit.

Location:

trunk/WebKit

Files:

• Carbon/HIWebView.m (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKit/Carbon/HIWebView.m

@@ -756 +756 @@
                             SetEventParameter(inEvent, kEventParamWindowMouseLocation, typeQDPoint, sizeof(Point), &where);
 
-                            HIViewRef view;
-                            HIViewGetViewForMouseEvent(HIViewGetRoot(window), inEvent, &view);
-#ifndef BUILDING_ON_TIGER
-                            if (HIObjectIsOfClass((HIObjectRef)view, kHIWebViewClassID))
-#else
-                            ControlKind kind;
-                            GetControlKind(view, &kind);
-                            if (kind.signature == 'appl' && kind.kind == 'wbvw')
-#endif
+                            OSStatus err = noErr;
+                            HIViewRef view = NULL;
+
+                            err = HIViewGetViewForMouseEvent(HIViewGetRoot(window), inEvent, &view);
+                            if (err == noErr && view && HIObjectIsOfClass((HIObjectRef)view, kHIWebViewClassID))
                                 result = SendEventToEventTargetWithOptions(inEvent, HIObjectGetEventTarget((HIObjectRef)view), kEventTargetDontPropagate);
                         }
@@ -774 +770 @@
                 case kEventMouseWheelMoved:
                     {
-                        HIViewRef view;
-                        HIViewGetViewForMouseEvent(HIViewGetRoot(window), inEvent, &view);
-#ifndef BUILDING_ON_TIGER
-                        if (HIObjectIsOfClass((HIObjectRef)view, kHIWebViewClassID))
-#else
-                        ControlKind kind;
-                        GetControlKind(view, &kind);
-                        if (kind.signature == 'appl' && kind.kind == 'wbvw')
-#endif                        
+                        OSStatus err = noErr;
+                        HIViewRef view = NULL;
+
+                        err = HIViewGetViewForMouseEvent(HIViewGetRoot(window), inEvent, &view);
+                        if (err == noErr && view && HIObjectIsOfClass((HIObjectRef)view, kHIWebViewClassID))
                             result = SendEventToEventTargetWithOptions(inEvent, HIObjectGetEventTarget((HIObjectRef)view), kEventTargetDontPropagate);
                     }

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-06-19  Jim Correia  <jim.correia@pobox.com>
+
+        Reviewed by Kevin Decker
+        
+        * Carbon/HIWebView.m:
+        (WindowHandler): HIObjectIsOfClass requires non-NULL input on Tiger. Reworked Kevin Decker's patch to remove the conditional compilation for Tiger, yet still avoid crashing BBEdit.
+
 2007-06-18  Sam Weinig  <sam@webkit.org>