[webkit-changes] cvs commit: WebCore/manual-tests/resources frame1.html frame2.html

Sat Dec 17 21:01:36 PST 2005

darin       05/12/17 21:01:35

  Modified:    khtml/rendering render_frames.cpp
               .        ChangeLog
  Added:       manual-tests bugzilla-5768.html
               manual-tests/resources frame1.html frame2.html
  Log:
          Reviewed and landed by Darin.
  
          - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5768
            pages with frames that are all "fixed" get no layout and are blank (like www.farnell.nl)
  
          * khtml/rendering/render_frames.cpp: (RenderFrameSet::layout):
          * manual-tests/bugzilla-5768.html: Added. Can't seem to get it to work (fail) as an automated test.
          * manual-tests/resources/frame1.html: Added.
          * manual-tests/resources/frame2.html: Added.
  
  Revision  Changes    Path
  1.88      +3 -1      WebCore/khtml/rendering/render_frames.cpp
  
  Index: render_frames.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_frames.cpp,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- render_frames.cpp	15 Dec 2005 22:31:46 -0000	1.87
  +++ render_frames.cpp	18 Dec 2005 05:01:30 -0000	1.88
  @@ -376,7 +376,8 @@
                           m_hSplitVar[r] = false;
                       }
                       child = child->nextSibling();
  -                    if(!child) goto end2;
  +                    if(!child)
  +                        goto end1;
                   }
   #ifdef DEBUG_LAYOUT
                   else
  @@ -386,6 +387,7 @@
           }
   
       }
  + end1:
       RenderContainer::layout();
    end2:
       setNeedsLayout(false);
  
  
  
  1.558     +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.557
  retrieving revision 1.558
  diff -u -r1.557 -r1.558
  --- ChangeLog	17 Dec 2005 20:12:31 -0000	1.557
  +++ ChangeLog	18 Dec 2005 05:01:31 -0000	1.558
  @@ -1,3 +1,15 @@
  +2005-12-17  Mitz Pettel  <opendarwin.org at mitzpettel.com>
  +
  +        Reviewed and landed by Darin.
  +
  +        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5768
  +          pages with frames that are all "fixed" get no layout and are blank (like www.farnell.nl)
  +
  +        * khtml/rendering/render_frames.cpp: (RenderFrameSet::layout):
  +        * manual-tests/bugzilla-5768.html: Added. Can't seem to get it to work (fail) as an automated test.
  +        * manual-tests/resources/frame1.html: Added.
  +        * manual-tests/resources/frame2.html: Added.
  +
   2005-12-17  Anders Carlsson  <andersca at mac.com>
   
           Reviewed by Darin.
  
  
  
  1.1                  WebCore/manual-tests/bugzilla-5768.html
  
  Index: bugzilla-5768.html
  ===================================================================
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" 
  "http://www.w3.org/TR/html4/frameset.dtd">
  <html>
  <head>
  <title>No relayout when all frames are fixed</title>
  <script type="text/javascript">
  if (window.layoutTestController)
      layoutTestController.waitUntilDone();
  var i = 0;
  function test()
  {
      i++;
      var f = document.getElementById('f');
      switch(i) {
          case 1:
              window.setTimeout(test, 100);
              break;
          case 2:
              f.src = "resources/frame2.html";
              break;
          case 3:
              window.setTimeout(test, 100);
              break;
          case 4:
              f.src = "resources/frame1.html";
              break;
          case 5:
              window.setTimeout(test, 100);
              break;
          case 6:
              if (window.layoutTestController)
                  layoutTestController.notifyDone();
              break;
      }
  }
  </script>
  </head>
  <frameset>
      <frame onload="test()" id="f" src="resources/frame1.html" noresize>
  </frameset>
  </html>
  
  
  
  1.1                  WebCore/manual-tests/resources/frame1.html
  
  Index: frame1.html
  ===================================================================
  <html>
  <head>
  <title>frame1</title>
  </head>
  <body>
  Frame 1
  </body>
  </html>
  
  
  1.1                  WebCore/manual-tests/resources/frame2.html
  
  Index: frame2.html
  ===================================================================
  <html>
  <head>
  <title>frame2</title>
  </head>
  <body>
  Frame 2
  </body>
  </html>