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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@189771 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4f8d4bcef595312e8aa67d3ab25df6e6fe5be6b8..1ed1d25a22466dccb5dc3105733dcf86dfe69556 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2015-09-14  Dewei Zhu  <dewei_zhu@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  <cdumez@apple.com>
 
         Drop non-standard [IsIndex] WebKit IDL extended attribute

diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index be326f0fc5e6ae12c3c550c408b0dd1922504376..9192147d9c88a231a257b92166976f617ab18b94 100644 (file)
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -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,14 +1247,7 @@ void Document::setVisualUpdatesAllowedByClient(bool visualUpdatesAllowedByClient
         setVisualUpdatesAllowed(true);
 }
 
-AtomicString Document::encoding() const
-{
-    if (TextResourceDecoder* d = decoder())
-        return d->encoding().domName();
-    return nullAtom;
-}
-
-String Document::characterSetForBindings() const
+String Document::characterSetWithUTF8Fallback() const
 {
     AtomicString name = encoding();
     if (!name.isNull())

diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
index 88d3466e67aeef6696327952cc2c59869ad64cd7..74ceaa96bc92f47817cebb5f3cf9390a19a77d69 100644 (file)
--- a/Source/WebCore/dom/Document.h
+++ b/Source/WebCore/dom/Document.h
@@ -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 @@ public:
     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 @@ inline void Document::notifyRemovePendingSheetIfNeeded()
         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
 {

diff --git a/Source/WebCore/dom/Document.idl b/Source/WebCore/dom/Document.idl
index 391c98368009d51a71a928edf09ca542adaf6439..f3264772408b512616edf0628dc81f5775be220c 100644 (file)
--- a/Source/WebCore/dom/Document.idl
+++ b/Source/WebCore/dom/Document.idl
@@ -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
 

diff --git a/Source/WebCore/loader/DocumentWriter.cpp b/Source/WebCore/loader/DocumentWriter.cpp
index 0e155e5531f4f4e250548259f5bf2aa16ce9feb4..a296799392919a1329dd87975984109a078b29a8 100644 (file)
--- a/Source/WebCore/loader/DocumentWriter.cpp
+++ b/Source/WebCore/loader/DocumentWriter.cpp
@@ -189,7 +189,7 @@ TextResourceDecoder* DocumentWriter::createDecoderIfNeeded()
             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);

diff --git a/Source/WebCore/loader/FormSubmission.cpp b/Source/WebCore/loader/FormSubmission.cpp
index 43435d5c2b489517c7fc5456a5bf14de3fc394b3..7a83ef3dec164b6cae8cf9b13909dd005f001526 100644 (file)
--- a/Source/WebCore/loader/FormSubmission.cpp
+++ b/Source/WebCore/loader/FormSubmission.cpp
@@ -151,7 +151,7 @@ static TextEncoding encodingFromAcceptCharset(const String& acceptCharset, Docum
             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)