[webkit-changes] cvs commit: WebCore/khtml khtmlview.cpp

[Adele]

adele       05/08/17 17:11:42

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml    Tag: Safari-1-3-branch khtmlview.cpp
  Log:
         Merged fix from TOT to branch
  
      2005-08-17  Justin Garcia  <justin.garcia at apple.com>
  
          Reviewed by darin, adele
  
          Fixes <rdar://problem/4219869> REGRESSION (OC): First frame never draws if it's delayed
              A recent change uncovered a bug where on early returns from KHTMLView::layout(), layoutSchedulingEnabled
              was not reset to true, preventing later layouts from occuring.
  
          * khtml/khtmlview.cpp:
          (KHTMLView::layout):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4108.4.49 +15 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4108.4.48
  retrieving revision 1.4108.4.49
  diff -u -r1.4108.4.48 -r1.4108.4.49
  --- ChangeLog	17 Aug 2005 23:25:43 -0000	1.4108.4.48
  +++ ChangeLog	18 Aug 2005 00:11:29 -0000	1.4108.4.49
  @@ -1,3 +1,18 @@
  +2005-08-17  Adele Peterson  <adele at apple.com>
  +
  +       Merged fix from TOT to branch
  +
  +    2005-08-17  Justin Garcia  <justin.garcia at apple.com>
  +
  +        Reviewed by darin, adele
  +        
  +        Fixes <rdar://problem/4219869> REGRESSION (OC): First frame never draws if it's delayed
  +            A recent change uncovered a bug where on early returns from KHTMLView::layout(), layoutSchedulingEnabled 
  +            was not reset to true, preventing later layouts from occuring. 
  +
  +        * khtml/khtmlview.cpp:
  +        (KHTMLView::layout):
  +
   2005-08-17  Vicki Murley  <vicki at apple.com>
   
           Reviewed by Darin.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.128.6.1 +3 -1      WebCore/khtml/khtmlview.cpp
  
  Index: khtmlview.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtmlview.cpp,v
  retrieving revision 1.128
  retrieving revision 1.128.6.1
  diff -u -r1.128 -r1.128.6.1
  --- khtmlview.cpp	23 Feb 2005 17:42:36 -0000	1.128
  +++ khtmlview.cpp	18 Aug 2005 00:11:42 -0000	1.128.6.1
  @@ -571,7 +571,6 @@
       if (d->layoutSuppressed)
           return;
       
  -    d->layoutSchedulingEnabled=false;
       killTimer(d->layoutTimerId);
       d->layoutTimerId = 0;
       d->delayedLayout = false;
  @@ -590,6 +589,8 @@
           return;
       }
   
  +    d->layoutSchedulingEnabled = false;
  +
       // Always ensure our style info is up-to-date.  This can happen in situations where
       // the layout beats any sort of style recalc update that needs to occur.
       if (document->hasChangedChild())
  @@ -598,6 +599,7 @@
       khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas*>(document->renderer());
       if (!root) {
           // FIXME: Do we need to set _width or _height here?
  +        d->layoutSchedulingEnabled = true;
           return;
       }