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

[Timothy]

thatcher    05/11/12 17:10:04

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml    Tag: Safari-1-3-branch khtml_part.cpp
  Log:
          Merged fix from TOT to Safari-1-3-branch
  
      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
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.335.2.19 +21 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.335.2.18
  retrieving revision 1.335.2.19
  diff -u -r1.335.2.18 -r1.335.2.19
  --- ChangeLog	13 Nov 2005 00:19:57 -0000	1.335.2.18
  +++ ChangeLog	13 Nov 2005 01:10:01 -0000	1.335.2.19
  @@ -2,6 +2,27 @@
   
           Merged fix from TOT to Safari-1-3-branch
   
  +    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-11-12  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-1-3-branch
  +
       2005-09-19  Beth Dakin  <bdakin at apple.com>
   
           Reviewed by Hyatt
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.311.6.8 +6 -0      WebCore/khtml/khtml_part.cpp
  
  Index: khtml_part.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
  retrieving revision 1.311.6.7
  retrieving revision 1.311.6.8
  diff -u -r1.311.6.7 -r1.311.6.8
  --- khtml_part.cpp	12 Nov 2005 01:57:41 -0000	1.311.6.7
  +++ khtml_part.cpp	13 Nov 2005 01:10:03 -0000	1.311.6.8
  @@ -579,6 +579,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(); 
   }