Changeset 189771 in webkit
- Timestamp:
- Sep 14, 2015 7:13:03 PM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r189770 r189771 1 2015-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 1 24 2015-09-14 Chris Dumez <cdumez@apple.com> 2 25 -
trunk/Source/WebCore/dom/Document.cpp
r189765 r189771 150 150 #include "SubresourceLoader.h" 151 151 #include "TextNodeTraversal.h" 152 #include "TextResourceDecoder.h"153 152 #include "TransformSource.h" 154 153 #include "TreeWalker.h" … … 1249 1248 } 1250 1249 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 1250 String Document::characterSetWithUTF8Fallback() const 1259 1251 { 1260 1252 AtomicString name = encoding(); -
trunk/Source/WebCore/dom/Document.h
r189765 r189771 48 48 #include "StringWithDirection.h" 49 49 #include "StyleResolveTree.h" 50 #include "TextResourceDecoder.h" 50 51 #include "Timer.h" 51 52 #include "TreeScope.h" … … 402 403 403 404 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(); } 407 409 408 410 void setCharset(const String&); … … 1751 1753 } 1752 1754 1755 inline TextEncoding Document::textEncoding() const 1756 { 1757 if (auto* decoder = this->decoder()) 1758 return decoder->encoding(); 1759 return TextEncoding(); 1760 } 1761 1753 1762 #if ENABLE(TEMPLATE_ELEMENT) 1754 1763 inline const Document* Document::templateDocument() const -
trunk/Source/WebCore/dom/Document.idl
r189765 r189771 65 65 // DOM Level 3 Core 66 66 67 [ImplementedAs=characterSet ForBindings] readonly attribute DOMString inputEncoding;67 [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString inputEncoding; 68 68 69 69 [TreatReturnedNullStringAs=Null] readonly attribute DOMString xmlEncoding; … … 189 189 DOMSelection getSelection(); 190 190 #endif 191 [ImplementedAs=characterSet ForBindings] readonly attribute DOMString characterSet;191 [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString characterSet; 192 192 193 193 // WebKit extensions -
trunk/Source/WebCore/loader/DocumentWriter.cpp
r189564 r189771 190 190 if (m_encoding.isEmpty()) { 191 191 if (canReferToParentFrameEncoding(m_frame, parentFrame)) 192 m_decoder->setEncoding( TextEncoding(parentFrame->document()->encoding()), TextResourceDecoder::EncodingFromParentFrame);192 m_decoder->setEncoding(parentFrame->document()->textEncoding(), TextResourceDecoder::EncodingFromParentFrame); 193 193 } else { 194 194 m_decoder->setEncoding(m_encoding, -
trunk/Source/WebCore/loader/FormSubmission.cpp
r189564 r189771 152 152 } 153 153 154 return TextEncoding(document.encoding());154 return document.textEncoding(); 155 155 } 156 156
Note: See TracChangeset
for help on using the changeset viewer.