Changeset 94810 in webkit
- Timestamp:
- Sep 8, 2011 3:20:39 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r94809 r94810 1 2011-09-08 Adam Barth <abarth@webkit.org> 2 3 Inline DocumentWriter::encoding() into it's only caller: deprecatedFrameEncoding() 4 https://bugs.webkit.org/show_bug.cgi?id=67807 5 6 Reviewed by Eric Seidel. 7 8 This function is super nutty. We don't want any more folks to call it 9 thinking that it does something sane. 10 11 * loader/DocumentWriter.cpp: 12 (WebCore::DocumentWriter::deprecatedFrameEncoding): 13 * loader/DocumentWriter.h: 14 1 15 2011-09-08 Roland Steiner <rolandsteiner@chromium.org> 2 16 -
trunk/Source/WebCore/loader/DocumentWriter.cpp
r94800 r94810 237 237 } 238 238 239 String DocumentWriter::encoding() const240 {241 if (m_encodingWasChosenByUser && !m_encoding.isEmpty())242 return m_encoding;243 if (m_decoder && m_decoder->encoding().isValid())244 return m_decoder->encoding().name();245 Settings* settings = m_frame->settings();246 return settings ? settings->defaultTextEncodingName() : String();247 }248 249 239 void DocumentWriter::setEncoding(const String& name, bool userChosen) 250 240 { … … 256 246 String DocumentWriter::deprecatedFrameEncoding() const 257 247 { 258 return m_frame->document()->url().isEmpty() ? m_encoding : encoding(); 248 if (m_frame->document()->url().isEmpty()) 249 return m_encoding; 250 251 if (m_encodingWasChosenByUser && !m_encoding.isEmpty()) 252 return m_encoding; 253 254 if (m_decoder && m_decoder->encoding().isValid()) 255 return m_decoder->encoding().name(); 256 257 Settings* settings = m_frame->settings(); 258 return settings ? settings->defaultTextEncodingName() : String(); 259 259 } 260 260 -
trunk/Source/WebCore/loader/DocumentWriter.h
r94800 r94810 58 58 void setFrame(Frame* frame) { m_frame = frame; } 59 59 60 String encoding() const;61 60 void setEncoding(const String& encoding, bool userChosen); 62 61
Note: See TracChangeset
for help on using the changeset viewer.