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

[Timothy]

thatcher    05/12/01 16:04:30

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               kwq      Tag: Safari-2-0-branch KWQButton.mm KWQSlider.mm
  Log:
          Merged fix from TOT to Safari-2-0-branch
          More fixes NULL checks for button and slider that were not on TOT.
  
      2005-10-28  Beth Dakin  <bdakin at apple.com>
  
          Reviewed by John
  
          Fix for <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/KWQButton.mm:
          (-[KWQButton becomeFirstResponder]): Added nil check.
          (-[KWQButton resignFirstResponder]): Added nil check.
          * kwq/KWQSlider.mm:
          (-[KWQSlider becomeFirstResponder]): Added nil check.
          (-[KWQSlider resignFirstResponder]): Added nil check.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.85  +26 -1     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.84
  retrieving revision 1.1.2.85
  diff -u -r1.1.2.84 -r1.1.2.85
  --- ChangeLog	1 Dec 2005 23:15:38 -0000	1.1.2.84
  +++ ChangeLog	2 Dec 2005 00:04:24 -0000	1.1.2.85
  @@ -1,6 +1,31 @@
   2005-12-01  Timothy Hatcher  <timothy at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  +        More fixes NULL checks for button and slider that were not on TOT.
  +
  +    2005-10-28  Beth Dakin  <bdakin at apple.com>
  +
  +        Reviewed by John
  +
  +        Fix for <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/KWQButton.mm:
  +        (-[KWQButton becomeFirstResponder]): Added nil check.
  +        (-[KWQButton resignFirstResponder]): Added nil check.
  +        * kwq/KWQSlider.mm:
  +        (-[KWQSlider becomeFirstResponder]): Added nil check.
  +        (-[KWQSlider resignFirstResponder]): Added nil check.
  +
  +2005-12-01  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
   
       2005-07-30  Darin Adler  <darin at apple.com>
   
  @@ -18,7 +43,7 @@
           - <rdar://problem/4352697> Glendale Regression: Some widgets don't get
             keyboard input (also affects Scrabble website)
   
  -        * khtml/xml/dom2_eventsimpl.cpp: add beforeonload to the event names
  +        * khtml/xml/dom2_eventsimpl.cpp: add beforeunload to the event names
   
   2005-12-01  Timothy Hatcher  <timothy at apple.com>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.40.8.3  +4 -2      WebCore/kwq/Attic/KWQButton.mm
  
  Index: KWQButton.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/Attic/KWQButton.mm,v
  retrieving revision 1.40.8.2
  retrieving revision 1.40.8.3
  diff -u -r1.40.8.2 -r1.40.8.3
  --- KWQButton.mm	12 Nov 2005 01:57:17 -0000	1.40.8.2
  +++ KWQButton.mm	2 Dec 2005 00:04:29 -0000	1.40.8.3
  @@ -132,7 +132,8 @@
           }
           if (button) {
               QFocusEvent event(QEvent::FocusIn);
  -            const_cast<QObject *>(button->eventFilterObject())->eventFilter(button, &event);
  +            if (button->eventFilterObject())
  +                const_cast<QObject *>(button->eventFilterObject())->eventFilter(button, &event);
           }
       }
       return become;
  @@ -143,7 +144,8 @@
       BOOL resign = [super resignFirstResponder];
       if (resign && button) {
           QFocusEvent event(QEvent::FocusOut);
  -        const_cast<QObject *>(button->eventFilterObject())->eventFilter(button, &event);
  +        if (button->eventFilterObject())
  +            const_cast<QObject *>(button->eventFilterObject())->eventFilter(button, &event);
       }
       return resign;
   }
  
  
  
  1.8.8.2   +4 -2      WebCore/kwq/KWQSlider.mm
  
  Index: KWQSlider.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQSlider.mm,v
  retrieving revision 1.8.8.1
  retrieving revision 1.8.8.2
  diff -u -r1.8.8.1 -r1.8.8.2
  --- KWQSlider.mm	12 Nov 2005 01:57:18 -0000	1.8.8.1
  +++ KWQSlider.mm	2 Dec 2005 00:04:30 -0000	1.8.8.2
  @@ -110,7 +110,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;
  @@ -121,7 +122,8 @@
       BOOL resign = [super resignFirstResponder];
       if (resign && slider) {
           QFocusEvent event(QEvent::FocusOut);
  -        const_cast<QObject *>(slider->eventFilterObject())->eventFilter(slider, &event);
  +        if (slider->eventFilterObject())
  +            const_cast<QObject *>(slider->eventFilterObject())->eventFilter(slider, &event);
       }
       return resign;
   }