[webkit-changes] cvs commit: WebCore/kwq KWQSlider.mm

[Timothy]

thatcher    05/12/01 15:50:36

  Modified:    .        ChangeLog
               kwq      KWQSlider.mm
  Log:
          Reviewed by Beth.
  
          Another fix for 4098083 to apply to sliders.
  
          <rdar://problem/4098083> REGRESSION (125-312): crash
          in [KWQTableView resignFirstResponder] selecting from JS menu
          (car4you.at, etc.)
  
          Since it is possible that a render widget's eventFilterObject
          has been destroyed even though the render widget is still ref-ed,
          we need to nil-check the eventFilterObject before we use it to get
          the eventFilter.
  
          * kwq/KWQSlider.mm:
          (-[KWQSlider becomeFirstResponder]): Added nil check.
          (-[KWQSlider resignFirstResponder]): Added nil check.
  
  Revision  Changes    Path
  1.446     +19 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.445
  retrieving revision 1.446
  diff -u -r1.445 -r1.446
  --- ChangeLog	1 Dec 2005 23:45:14 -0000	1.445
  +++ ChangeLog	1 Dec 2005 23:50:32 -0000	1.446
  @@ -1,3 +1,22 @@
  +2005-12-01  Timothy Hatcher  <timothy at apple.com>
  +
  +        Reviewed by Beth.
  +        
  +        Another fix for 4098083 to apply to sliders.
  +
  +        <rdar://problem/4098083> REGRESSION (125-312): crash 
  +        in [KWQTableView resignFirstResponder] selecting from JS menu 
  +        (car4you.at, etc.)
  +
  +        Since it is possible that a render widget's eventFilterObject
  +        has been destroyed even though the render widget is still ref-ed,
  +        we need to nil-check the eventFilterObject before we use it to get
  +        the eventFilter.
  +
  +        * kwq/KWQSlider.mm:
  +        (-[KWQSlider becomeFirstResponder]): Added nil check.
  +        (-[KWQSlider resignFirstResponder]): Added nil check.
  +
   2005-12-01  Adele Peterson  <adele at apple.com>
   
           Reviewed by Vicki and Dave Harrsion.
  
  
  
  1.14      +6 -3      WebCore/kwq/KWQSlider.mm
  
  Index: KWQSlider.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQSlider.mm,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- KWQSlider.mm	25 Oct 2005 21:14:49 -0000	1.13
  +++ KWQSlider.mm	1 Dec 2005 23:50:36 -0000	1.14
  @@ -111,7 +111,8 @@
   
           if (slider) {
               QFocusEvent event(QEvent::FocusIn);
  -            const_cast<QObject *>(slider->eventFilterObject())->eventFilter(slider, &event);
  +            if (slider->eventFilterObject())
  +                const_cast<QObject *>(slider->eventFilterObject())->eventFilter(slider, &event);
           }
       }
       return become;
  @@ -122,8 +123,10 @@
       BOOL resign = [super resignFirstResponder];
       if (resign && slider) {
           QFocusEvent event(QEvent::FocusOut);
  -        const_cast<QObject *>(slider->eventFilterObject())->eventFilter(slider, &event);
  -        [KWQKHTMLPart::bridgeForWidget(slider) formControlIsResigningFirstResponder:self];
  +        if (slider->eventFilterObject()) {
  +            const_cast<QObject *>(slider->eventFilterObject())->eventFilter(slider, &event);
  +            [KWQKHTMLPart::bridgeForWidget(slider) formControlIsResigningFirstResponder:self];
  +        }
       }
       return resign;
   }