Changeset 189771 in webkit


Ignore:
Timestamp:
Sep 14, 2015 7:13:03 PM (9 years ago)
Author:
Dewei Zhu
Message:

Polish code for r189579.
https://bugs.webkit.org/show_bug.cgi?id=149131

Reviewed by Chris Dumez.

Use more self-explaining function name "characterSetWithUTF8Fallback" instead of
"characterSetForBindings". Optimize the way to get text encoding.

  • dom/Document.cpp:

(WebCore::Document::characterSetWithUTF8Fallback):
(WebCore::Document::encoding): Deleted.
(WebCore::Document::characterSetForBindings): Deleted.

  • dom/Document.h:

(WebCore::Document::encoding):
(WebCore::Document::textEncoding):

  • dom/Document.idl:
  • loader/DocumentWriter.cpp:

(WebCore::DocumentWriter::createDecoderIfNeeded):

  • loader/FormSubmission.cpp:

(WebCore::encodingFromAcceptCharset):

Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r189770 r189771  
     12015-09-14  Dewei Zhu  <dewei_zhu@apple.com>
     2
     3        Polish code for r189579.
     4        https://bugs.webkit.org/show_bug.cgi?id=149131
     5
     6        Reviewed by Chris Dumez.
     7
     8        Use more self-explaining function name "characterSetWithUTF8Fallback" instead of
     9        "characterSetForBindings". Optimize the way to get text encoding.
     10
     11        * dom/Document.cpp:
     12        (WebCore::Document::characterSetWithUTF8Fallback):
     13        (WebCore::Document::encoding): Deleted.
     14        (WebCore::Document::characterSetForBindings): Deleted.
     15        * dom/Document.h:
     16        (WebCore::Document::encoding):
     17        (WebCore::Document::textEncoding):
     18        * dom/Document.idl:
     19        * loader/DocumentWriter.cpp:
     20        (WebCore::DocumentWriter::createDecoderIfNeeded):
     21        * loader/FormSubmission.cpp:
     22        (WebCore::encodingFromAcceptCharset):
     23
    1242015-09-14  Chris Dumez  <cdumez@apple.com>
    225
  • trunk/Source/WebCore/dom/Document.cpp

    r189765 r189771  
    150150#include "SubresourceLoader.h"
    151151#include "TextNodeTraversal.h"
    152 #include "TextResourceDecoder.h"
    153152#include "TransformSource.h"
    154153#include "TreeWalker.h"
     
    12491248}
    12501249
    1251 AtomicString Document::encoding() const
    1252 {
    1253     if (TextResourceDecoder* d = decoder())
    1254         return d->encoding().domName();
    1255     return nullAtom;
    1256 }
    1257 
    1258 String Document::characterSetForBindings() const
     1250String Document::characterSetWithUTF8Fallback() const
    12591251{
    12601252    AtomicString name = encoding();
  • trunk/Source/WebCore/dom/Document.h

    r189765 r189771  
    4848#include "StringWithDirection.h"
    4949#include "StyleResolveTree.h"
     50#include "TextResourceDecoder.h"
    5051#include "Timer.h"
    5152#include "TreeScope.h"
     
    402403
    403404    String charset() const { return Document::encoding(); }
    404     String characterSetForBindings() const;
    405 
    406     AtomicString encoding() const;
     405    String characterSetWithUTF8Fallback() const;
     406    TextEncoding textEncoding() const;
     407
     408    AtomicString encoding() const { return textEncoding().domName(); }
    407409
    408410    void setCharset(const String&);
     
    17511753}
    17521754
     1755inline TextEncoding Document::textEncoding() const
     1756{
     1757    if (auto* decoder = this->decoder())
     1758        return decoder->encoding();
     1759    return TextEncoding();
     1760}
     1761
    17531762#if ENABLE(TEMPLATE_ELEMENT)
    17541763inline const Document* Document::templateDocument() const
  • trunk/Source/WebCore/dom/Document.idl

    r189765 r189771  
    6565    // DOM Level 3 Core
    6666
    67     [ImplementedAs=characterSetForBindings] readonly attribute DOMString inputEncoding;
     67    [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString inputEncoding;
    6868
    6969    [TreatReturnedNullStringAs=Null] readonly attribute DOMString xmlEncoding;
     
    189189    DOMSelection       getSelection();
    190190#endif
    191     [ImplementedAs=characterSetForBindings] readonly attribute DOMString characterSet;
     191    [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString characterSet;
    192192
    193193    // WebKit extensions
  • trunk/Source/WebCore/loader/DocumentWriter.cpp

    r189564 r189771  
    190190        if (m_encoding.isEmpty()) {
    191191            if (canReferToParentFrameEncoding(m_frame, parentFrame))
    192                 m_decoder->setEncoding(TextEncoding(parentFrame->document()->encoding()), TextResourceDecoder::EncodingFromParentFrame);
     192                m_decoder->setEncoding(parentFrame->document()->textEncoding(), TextResourceDecoder::EncodingFromParentFrame);
    193193        } else {
    194194            m_decoder->setEncoding(m_encoding,
  • trunk/Source/WebCore/loader/FormSubmission.cpp

    r189564 r189771  
    152152    }
    153153
    154     return TextEncoding(document.encoding());
     154    return document.textEncoding();
    155155}
    156156
Note: See TracChangeset for help on using the changeset viewer.