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

[Adele]

adele       05/08/02 17:02:29

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml    Tag: Safari-2-0-branch khtml_part.cpp
  Log:
          Merged fix from TOT to Safari-2-0-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.4104.2.87 +26 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.86
  retrieving revision 1.4104.2.87
  diff -u -r1.4104.2.86 -r1.4104.2.87
  --- ChangeLog	2 Aug 2005 23:10:49 -0000	1.4104.2.86
  +++ ChangeLog	3 Aug 2005 00:02:14 -0000	1.4104.2.87
  @@ -2,6 +2,32 @@
   
           Merged fix from TOT to Safari-2-0-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-07-29  John Sullivan  <sullivan at apple.com>
  + 
  +         Reviewed by Dave Hyatt.
  +
  +
  +2005-08-02  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
       2005-07-14  Justin Garcia  <justin.garcia at apple.com>
   
           Patch by Anders Carlsson and justin
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.311.8.11 +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.8.10
  retrieving revision 1.311.8.11
  diff -u -r1.311.8.10 -r1.311.8.11
  --- khtml_part.cpp	26 Jul 2005 21:14:22 -0000	1.311.8.10
  +++ khtml_part.cpp	3 Aug 2005 00:02:28 -0000	1.311.8.11
  @@ -580,6 +580,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(); 
   }