[webkit-changes] cvs commit: WebCore/manual-tests/resources write-after-open-popup.html

Fri Jul 29 14:22:15 PDT 2005

ggaren      05/07/29 14:22:15

  Modified:    .        ChangeLog
               khtml    khtml_part.cpp
  Added:       manual-tests/resources write-after-open-popup.html
  Log:
          - fixed:
          <rdar://problem/3461547> can't use document.writeln() on windows opened via window.open("about:blank") in same function
          <rdar://problem/3725977> A_WINDOW.document.write() content overwritten when first parameter to window.open is provided
          <rdar://problem/4101498> SAP: window.write in same call chain as window.open fails to write if URL parameter is provided
          <rdar://problem/4179028> document.write in same function as window.open fails to write new content (4056)
          http://bugzilla.opendarwin.org/show_bug.cgi?id=4056 document.write in same function as window.open fails to write new content
  
          Reviewed by darin.
  
          Test cases added:
          * manual-tests/resources/write-after-open-popup.html: Added.
  
          * khtml/khtml_part.cpp:
          (KHTMLPart::didExplicitOpen): now cancels any pending redirection
  
  Revision  Changes    Path
  1.4493    +17 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4492
  retrieving revision 1.4493
  diff -u -r1.4492 -r1.4493
  --- ChangeLog	29 Jul 2005 21:16:42 -0000	1.4492
  +++ ChangeLog	29 Jul 2005 21:22:10 -0000	1.4493
  @@ -1,3 +1,20 @@
  +2005-07-29  Geoffrey Garen  <ggaren at apple.com>
  +        
  +        - fixed:
  +        <rdar://problem/3461547> can't use document.writeln() on windows opened via window.open("about:blank") in same function
  +        <rdar://problem/3725977> A_WINDOW.document.write() content overwritten when first parameter to window.open is provided
  +        <rdar://problem/4101498> SAP: window.write in same call chain as window.open fails to write if URL parameter is provided
  +        <rdar://problem/4179028> document.write in same function as window.open fails to write new content (4056)
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=4056 document.write in same function as window.open fails to write new content
  +
  +        Reviewed by darin.
  +
  +        Test cases added:
  +        * manual-tests/resources/write-after-open-popup.html: Added.
  +
  +        * khtml/khtml_part.cpp:
  +        (KHTMLPart::didExplicitOpen): now cancels any pending redirection
  +
   2005-07-29  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Dave Hyatt.
  
  
  
  1.331     +6 -0      WebCore/khtml/khtml_part.cpp
  
  Index: khtml_part.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
  retrieving revision 1.330
  retrieving revision 1.331
  diff -u -r1.330 -r1.331
  --- khtml_part.cpp	18 Jul 2005 21:52:13 -0000	1.330
  +++ khtml_part.cpp	29 Jul 2005 21:22:14 -0000	1.331
  @@ -586,6 +586,12 @@
   {
     d->m_bComplete = false;
     d->m_bLoadEventEmitted = false;
  +    
  +  // Prevent window.open(url) -- eg window.open("about:blank") -- from blowing away results
  +  // from a subsequent window.document.open / window.document.write call. 
  +  // Cancelling redirection here works for all cases because document.open 
  +  // implicitly precedes document.write.
  +  cancelRedirection(); 
   }
   
   
  
  
  
  1.1                  WebCore/manual-tests/resources/write-after-open-popup.html
  
  Index: write-after-open-popup.html
  ===================================================================
  <html>
      <body>
          FAIL: document.write should clear this text.
      </body>
  </html>