Title: [189771] trunk/Source/WebCore
- Revision
- 189771
- Author
- dewei_...@apple.com
- Date
- 2015-09-14 19:13:03 -0700 (Mon, 14 Sep 2015)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (189770 => 189771)
--- trunk/Source/WebCore/ChangeLog 2015-09-15 01:48:38 UTC (rev 189770)
+++ trunk/Source/WebCore/ChangeLog 2015-09-15 02:13:03 UTC (rev 189771)
@@ -1,3 +1,26 @@
+2015-09-14 Dewei Zhu <dewei_...@apple.com>
+
+ 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):
+
2015-09-14 Chris Dumez <cdu...@apple.com>
Drop non-standard [IsIndex] WebKit IDL extended attribute
Modified: trunk/Source/WebCore/dom/Document.cpp (189770 => 189771)
--- trunk/Source/WebCore/dom/Document.cpp 2015-09-15 01:48:38 UTC (rev 189770)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-09-15 02:13:03 UTC (rev 189771)
@@ -149,7 +149,6 @@
#include "StyleSheetList.h"
#include "SubresourceLoader.h"
#include "TextNodeTraversal.h"
-#include "TextResourceDecoder.h"
#include "TransformSource.h"
#include "TreeWalker.h"
#include "VisitedLinkState.h"
@@ -1248,15 +1247,8 @@
setVisualUpdatesAllowed(true);
}
-AtomicString Document::encoding() const
+String Document::characterSetWithUTF8Fallback() const
{
- if (TextResourceDecoder* d = decoder())
- return d->encoding().domName();
- return nullAtom;
-}
-
-String Document::characterSetForBindings() const
-{
AtomicString name = encoding();
if (!name.isNull())
return name;
Modified: trunk/Source/WebCore/dom/Document.h (189770 => 189771)
--- trunk/Source/WebCore/dom/Document.h 2015-09-15 01:48:38 UTC (rev 189770)
+++ trunk/Source/WebCore/dom/Document.h 2015-09-15 02:13:03 UTC (rev 189771)
@@ -47,6 +47,7 @@
#include "ScriptExecutionContext.h"
#include "StringWithDirection.h"
#include "StyleResolveTree.h"
+#include "TextResourceDecoder.h"
#include "Timer.h"
#include "TreeScope.h"
#include "UserActionElementSet.h"
@@ -401,9 +402,10 @@
String defaultCharset() const;
String charset() const { return Document::encoding(); }
- String characterSetForBindings() const;
+ String characterSetWithUTF8Fallback() const;
+ TextEncoding textEncoding() const;
- AtomicString encoding() const;
+ AtomicString encoding() const { return textEncoding().domName(); }
void setCharset(const String&);
@@ -1750,6 +1752,13 @@
didRemoveAllPendingStylesheet();
}
+inline TextEncoding Document::textEncoding() const
+{
+ if (auto* decoder = this->decoder())
+ return decoder->encoding();
+ return TextEncoding();
+}
+
#if ENABLE(TEMPLATE_ELEMENT)
inline const Document* Document::templateDocument() const
{
Modified: trunk/Source/WebCore/dom/Document.idl (189770 => 189771)
--- trunk/Source/WebCore/dom/Document.idl 2015-09-15 01:48:38 UTC (rev 189770)
+++ trunk/Source/WebCore/dom/Document.idl 2015-09-15 02:13:03 UTC (rev 189771)
@@ -64,7 +64,7 @@
// DOM Level 3 Core
- [ImplementedAs=characterSetForBindings] readonly attribute DOMString inputEncoding;
+ [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString inputEncoding;
[TreatReturnedNullStringAs=Null] readonly attribute DOMString xmlEncoding;
[TreatReturnedNullStringAs=Null, TreatNullAs=NullString, SetterRaisesException] attribute DOMString xmlVersion;
@@ -188,7 +188,7 @@
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
DOMSelection getSelection();
#endif
- [ImplementedAs=characterSetForBindings] readonly attribute DOMString characterSet;
+ [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString characterSet;
// WebKit extensions
Modified: trunk/Source/WebCore/loader/DocumentWriter.cpp (189770 => 189771)
--- trunk/Source/WebCore/loader/DocumentWriter.cpp 2015-09-15 01:48:38 UTC (rev 189770)
+++ trunk/Source/WebCore/loader/DocumentWriter.cpp 2015-09-15 02:13:03 UTC (rev 189771)
@@ -189,7 +189,7 @@
m_decoder->setHintEncoding(parentFrame->document()->decoder());
if (m_encoding.isEmpty()) {
if (canReferToParentFrameEncoding(m_frame, parentFrame))
- m_decoder->setEncoding(TextEncoding(parentFrame->document()->encoding()), TextResourceDecoder::EncodingFromParentFrame);
+ m_decoder->setEncoding(parentFrame->document()->textEncoding(), TextResourceDecoder::EncodingFromParentFrame);
} else {
m_decoder->setEncoding(m_encoding,
m_encodingWasChosenByUser ? TextResourceDecoder::UserChosenEncoding : TextResourceDecoder::EncodingFromHTTPHeader);
Modified: trunk/Source/WebCore/loader/FormSubmission.cpp (189770 => 189771)
--- trunk/Source/WebCore/loader/FormSubmission.cpp 2015-09-15 01:48:38 UTC (rev 189770)
+++ trunk/Source/WebCore/loader/FormSubmission.cpp 2015-09-15 02:13:03 UTC (rev 189771)
@@ -151,7 +151,7 @@
return encoding;
}
- return TextEncoding(document.encoding());
+ return document.textEncoding();
}
Ref<FormSubmission> FormSubmission::create(HTMLFormElement* form, const Attributes& attributes, PassRefPtr<Event> event, LockHistory lockHistory, FormSubmissionTrigger trigger)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes