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

[Timothy]

thatcher    05/11/30 14:24:18

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               kwq      Tag: Safari-2-0-branch KWQWidget.mm
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-11-29  Beth Dakin  <bdakin at apple.com>
  
          Reviewed by Darin
  
          Fix for <rdar://problem/4098083> REGRESSION (125-312): crash
          in [KWQTableView resignFirstResponder] selecting from JS menu
          (car4you.at, etc.)
  
          Though this crash is only currently reproducible on the branch
          and not on TOT, the fix should be in both.
  
          * kwq/KWQWidget.mm:
          (QWidget::removeFromSuperview): The call to removeFromSuperview
          could destroy data, so we should only reference it before the
          call.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.79  +20 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.78
  retrieving revision 1.1.2.79
  diff -u -r1.1.2.78 -r1.1.2.79
  --- ChangeLog	30 Nov 2005 22:14:33 -0000	1.1.2.78
  +++ ChangeLog	30 Nov 2005 22:24:09 -0000	1.1.2.79
  @@ -2,6 +2,26 @@
   
           Merged fix from TOT to Safari-2-0-branch
   
  +    2005-11-29  Beth Dakin  <bdakin at apple.com>
  +
  +        Reviewed by Darin
  +
  +        Fix for <rdar://problem/4098083> REGRESSION (125-312): crash 
  +        in [KWQTableView resignFirstResponder] selecting from JS menu 
  +        (car4you.at, etc.)
  +
  +        Though this crash is only currently reproducible on the branch
  +        and not on TOT, the fix should be in both. 
  +
  +        * kwq/KWQWidget.mm:
  +        (QWidget::removeFromSuperview): The call to removeFromSuperview
  +        could destroy data, so we should only reference it before the 
  +        call.
  +
  +2005-11-29  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
       2005-11-29  Vicki Murley  <vicki at apple.com>
   
   	Changes by Mitz Pettel, reviewed by Maciej.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.106.8.2 +1 -1      WebCore/kwq/KWQWidget.mm
  
  Index: KWQWidget.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQWidget.mm,v
  retrieving revision 1.106.8.1
  retrieving revision 1.106.8.2
  diff -u -r1.106.8.1 -r1.106.8.2
  --- KWQWidget.mm	22 Jul 2005 01:18:36 -0000	1.106.8.1
  +++ KWQWidget.mm	30 Nov 2005 22:24:17 -0000	1.106.8.2
  @@ -569,10 +569,10 @@
       if (data->mustStayInWindow)
           data->removeFromSuperviewSoon = true;
       else {
  +        data->removeFromSuperviewSoon = false;
           KWQ_BLOCK_EXCEPTIONS;
           [getOuterView() removeFromSuperview];
           KWQ_UNBLOCK_EXCEPTIONS;
  -        data->removeFromSuperviewSoon = false;
       }
   }