<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[189771] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189771">189771</a></dd>
<dt>Author</dt> <dd>dewei_zhu@apple.com</dd>
<dt>Date</dt> <dd>2015-09-14 19:13:03 -0700 (Mon, 14 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Polish code for <a href="http://trac.webkit.org/projects/webkit/changeset/189579">r189579</a>.
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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentWritercpp">trunk/Source/WebCore/loader/DocumentWriter.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFormSubmissioncpp">trunk/Source/WebCore/loader/FormSubmission.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189770 => 189771)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-09-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop non-standard [IsIndex] WebKit IDL extended attribute
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (189770 => 189771)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -149,7 +149,6 @@
</span><span class="cx"> #include "StyleSheetList.h"
</span><span class="cx"> #include "SubresourceLoader.h"
</span><span class="cx"> #include "TextNodeTraversal.h"
</span><del>-#include "TextResourceDecoder.h"
</del><span class="cx"> #include "TransformSource.h"
</span><span class="cx"> #include "TreeWalker.h"
</span><span class="cx"> #include "VisitedLinkState.h"
</span><span class="lines">@@ -1248,15 +1247,8 @@
</span><span class="cx"> setVisualUpdatesAllowed(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AtomicString Document::encoding() const
</del><ins>+String Document::characterSetWithUTF8Fallback() const
</ins><span class="cx"> {
</span><del>- if (TextResourceDecoder* d = decoder())
- return d->encoding().domName();
- return nullAtom;
-}
-
-String Document::characterSetForBindings() const
-{
</del><span class="cx"> AtomicString name = encoding();
</span><span class="cx"> if (!name.isNull())
</span><span class="cx"> return name;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (189770 => 189771)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "StringWithDirection.h"
</span><span class="cx"> #include "StyleResolveTree.h"
</span><ins>+#include "TextResourceDecoder.h"
</ins><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "TreeScope.h"
</span><span class="cx"> #include "UserActionElementSet.h"
</span><span class="lines">@@ -401,9 +402,10 @@
</span><span class="cx"> String defaultCharset() const;
</span><span class="cx">
</span><span class="cx"> String charset() const { return Document::encoding(); }
</span><del>- String characterSetForBindings() const;
</del><ins>+ String characterSetWithUTF8Fallback() const;
+ TextEncoding textEncoding() const;
</ins><span class="cx">
</span><del>- AtomicString encoding() const;
</del><ins>+ AtomicString encoding() const { return textEncoding().domName(); }
</ins><span class="cx">
</span><span class="cx"> void setCharset(const String&);
</span><span class="cx">
</span><span class="lines">@@ -1750,6 +1752,13 @@
</span><span class="cx"> didRemoveAllPendingStylesheet();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline TextEncoding Document::textEncoding() const
+{
+ if (auto* decoder = this->decoder())
+ return decoder->encoding();
+ return TextEncoding();
+}
+
</ins><span class="cx"> #if ENABLE(TEMPLATE_ELEMENT)
</span><span class="cx"> inline const Document* Document::templateDocument() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (189770 => 189771)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> // DOM Level 3 Core
</span><span class="cx">
</span><del>- [ImplementedAs=characterSetForBindings] readonly attribute DOMString inputEncoding;
</del><ins>+ [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString inputEncoding;
</ins><span class="cx">
</span><span class="cx"> [TreatReturnedNullStringAs=Null] readonly attribute DOMString xmlEncoding;
</span><span class="cx"> [TreatReturnedNullStringAs=Null, TreatNullAs=NullString, SetterRaisesException] attribute DOMString xmlVersion;
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
</span><span class="cx"> DOMSelection getSelection();
</span><span class="cx"> #endif
</span><del>- [ImplementedAs=characterSetForBindings] readonly attribute DOMString characterSet;
</del><ins>+ [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString characterSet;
</ins><span class="cx">
</span><span class="cx"> // WebKit extensions
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentWritercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentWriter.cpp (189770 => 189771)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> m_decoder->setHintEncoding(parentFrame->document()->decoder());
</span><span class="cx"> if (m_encoding.isEmpty()) {
</span><span class="cx"> if (canReferToParentFrameEncoding(m_frame, parentFrame))
</span><del>- m_decoder->setEncoding(TextEncoding(parentFrame->document()->encoding()), TextResourceDecoder::EncodingFromParentFrame);
</del><ins>+ m_decoder->setEncoding(parentFrame->document()->textEncoding(), TextResourceDecoder::EncodingFromParentFrame);
</ins><span class="cx"> } else {
</span><span class="cx"> m_decoder->setEncoding(m_encoding,
</span><span class="cx"> m_encodingWasChosenByUser ? TextResourceDecoder::UserChosenEncoding : TextResourceDecoder::EncodingFromHTTPHeader);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFormSubmissioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FormSubmission.cpp (189770 => 189771)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> return encoding;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return TextEncoding(document.encoding());
</del><ins>+ return document.textEncoding();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<FormSubmission> FormSubmission::create(HTMLFormElement* form, const Attributes& attributes, PassRefPtr<Event> event, LockHistory lockHistory, FormSubmissionTrigger trigger)
</span></span></pre>
</div>
</div>
</body>
</html>