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

[Alexey]

ap          05/12/22 23:55:27

  Modified:    .        ChangeLog
               khtml    khtml_part.cpp
  Log:
          Reviewed by Darin Adler.
  
          - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6118
          Investigate not using the frameset charset as a default for frames
  
          * khtml/khtml_part.cpp (KHTMLPart::write):
          Do not use the parent frame encoding as a default for sub-frames (revert
          rdar://3100151).
  
  Revision  Changes    Path
  1.32      +11 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- ChangeLog	23 Dec 2005 03:57:24 -0000	1.31
  +++ ChangeLog	23 Dec 2005 07:55:25 -0000	1.32
  @@ -1,3 +1,14 @@
  +2005-12-22  Alexey Proskuryakov  <ap at nypop.com>
  +
  +        Reviewed by Darin Adler.
  +
  +        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6118
  +        Investigate not using the frameset charset as a default for frames
  +
  +        * khtml/khtml_part.cpp (KHTMLPart::write):
  +        Do not use the parent frame encoding as a default for sub-frames (revert
  +        rdar://3100151). 
  +
   2005-12-22  Maciej Stachowiak  <mjs at apple.com>
   
           Reviewed by Eric.
  
  
  
  1.372     +4 -6      WebCore/khtml/khtml_part.cpp
  
  Index: khtml_part.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
  retrieving revision 1.371
  retrieving revision 1.372
  diff -u -r1.371 -r1.372
  --- khtml_part.cpp	21 Dec 2005 16:51:00 -0000	1.371
  +++ khtml_part.cpp	23 Dec 2005 07:55:26 -0000	1.372
  @@ -7,6 +7,7 @@
    *                     2000 Stefan Schimanski <1Stein at gmx.de>
    *                     2001 George Staikos <staikos at kde.org>
    * Copyright (C) 2004 Apple Computer, Inc.
  + * Copyright (C) 2005 Alexey Proskuryakov <ap at nypop.com>
    *
    * This library is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Library General Public
  @@ -944,12 +945,9 @@
           if (!d->m_encoding.isNull())
               d->m_decoder->setEncoding(d->m_encoding.latin1(),
                   d->m_haveEncoding ? Decoder::UserChosenEncoding : Decoder::EncodingFromHTTPHeader);
  -        else {
  -            // Inherit the default encoding from the parent frame if there is one.
  -            const char *defaultEncoding = (parentPart() && parentPart()->d->m_decoder)
  -                ? parentPart()->d->m_decoder->encoding() : settings()->encoding().latin1();
  -            d->m_decoder->setEncoding(defaultEncoding, Decoder::DefaultEncoding);
  -        }
  +        else
  +            d->m_decoder->setEncoding(settings()->encoding().latin1(), Decoder::DefaultEncoding);
  +
           if (d->m_doc)
               d->m_doc->setDecoder(d->m_decoder.get());
       }