[webkit-changes] cvs commit: WebKit/WebView.subproj WebHTMLView.m

[David]

harrison    05/12/06 14:06:02

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               WebView.subproj Tag: Safari-2-0-branch WebHTMLView.m
  Log:
          Reviewed by Darin.
  
          - fix <rdar://problem/4365308> Glendale Regression: Floating dictionary doesn't work well in Safari text areas/fields
  
          Add use of NSAccessibilityHitTest to the list of exceptions.
  
          * WebView.subproj/WebHTMLView.m:
          (-[WebHTMLView hitTest:]): check for NSFlagsChanged event.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3118.4.87 +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3118.4.86
  retrieving revision 1.3118.4.87
  diff -u -r1.3118.4.86 -r1.3118.4.87
  --- ChangeLog	5 Dec 2005 22:56:33 -0000	1.3118.4.86
  +++ ChangeLog	6 Dec 2005 22:05:46 -0000	1.3118.4.87
  @@ -1,3 +1,14 @@
  +2005-12-06  David Harrison  <harrison at apple.com>
  +
  +        Reviewed by Darin.
  +	
  +        - fix <rdar://problem/4365308> Glendale Regression: Floating dictionary doesn't work well in Safari text areas/fields
  +        
  +        Add use of NSAccessibilityHitTest to the list of exceptions.
  +
  +        * WebView.subproj/WebHTMLView.m:
  +        (-[WebHTMLView hitTest:]): check for NSFlagsChanged event. 
  +
   2005-12-04  Timothy Hatcher  <timothy at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.437.8.7 +8 -2      WebKit/WebView.subproj/WebHTMLView.m
  
  Index: WebHTMLView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
  retrieving revision 1.437.8.6
  retrieving revision 1.437.8.7
  diff -u -r1.437.8.6 -r1.437.8.7
  --- WebHTMLView.m	1 Dec 2005 23:25:58 -0000	1.437.8.6
  +++ WebHTMLView.m	6 Dec 2005 22:06:00 -0000	1.437.8.7
  @@ -849,7 +849,7 @@
       // WebHTMLView objects handle all events for objects inside them.
       // To get those events, we prevent hit testing from AppKit.
   
  -    // But there are three exceptions to this:
  +    // But there are four exceptions to this:
       //   1) For right mouse clicks and control clicks we don't yet have an implementation
       //      that works for nested views, so we let the hit testing go through the
       //      standard NSView code path (needs to be fixed, see bug 4361618).
  @@ -864,6 +864,11 @@
       //      right view. The global is forceNSViewHitTest and the method they use to
       //      do the hit testing is _hitViewForEvent:. (But this does not work correctly
       //      when there is HTML overlapping the view, see bug 4361626)
  +    //   4) NSAccessibilityHitTest relies on this for checking the cursor position.
  +    //      Our check for that is whether the event is NSFlagsChanged.  This works
  +    //      for VoiceOver's cntl-opt-f5 command (move focus to item under cursor)
  +    //      and Dictionary's cmd-cntl-D (open dictionary popup for item under cursor).
  +    //      This is of course a hack.
   
       BOOL captureHitsOnSubviews;
       if (forceNSViewHitTest)
  @@ -874,7 +879,8 @@
           NSEvent *event = [[self window] currentEvent];
           captureHitsOnSubviews = !([event type] == NSMouseMoved
               || [event type] == NSRightMouseDown
  -            || ([event type] == NSLeftMouseDown && ([event modifierFlags] & NSControlKeyMask) != 0));
  +            || ([event type] == NSLeftMouseDown && ([event modifierFlags] & NSControlKeyMask) != 0)
  +            || [event type] == NSFlagsChanged);
       }
   
       if (!captureHitsOnSubviews)