From: rniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue, 11 Jun 2013 05:37:51 +0000 (+0000)
Subject: DocType strings should be 8 bit wide
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=a1b7cf8f056464428c82d69aeb9e354e36aacd3d

DocType strings should be 8 bit wide
https://bugs.webkit.org/show_bug.cgi?id=117487

Reviewed by Michael Saboff.

Merge https://chromium.googlesource.com/chromium/blink/+/8da02d0ce3965c4e6bf227db856bce930393429a.

* html/parser/HTMLConstructionSite.cpp:
(WebCore::HTMLConstructionSite::insertDoctype):


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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2202ad50e45e..6fa2f1a831b7 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2013-06-10  Ryosuke Niwa  <rniwa@webkit.org>
+
+        DocType strings should be 8 bit wide
+        https://bugs.webkit.org/show_bug.cgi?id=117487
+
+        Reviewed by Michael Saboff.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/8da02d0ce3965c4e6bf227db856bce930393429a.
+
+        * html/parser/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::insertDoctype):
+
 2013-06-10  Ryosuke Niwa  <rniwa@webkit.org>
 
         Make more functions const
diff --git a/Source/WebCore/html/parser/HTMLConstructionSite.cpp b/Source/WebCore/html/parser/HTMLConstructionSite.cpp
index 4f3a774a7d08..a8c32ec9aba4 100644
--- a/Source/WebCore/html/parser/HTMLConstructionSite.cpp
+++ b/Source/WebCore/html/parser/HTMLConstructionSite.cpp
@@ -355,8 +355,8 @@ void HTMLConstructionSite::insertDoctype(AtomicHTMLToken* token)
 {
     ASSERT(token->type() == HTMLToken::DOCTYPE);
 
-    const String& publicId = String::adopt(token->publicIdentifier());
-    const String& systemId = String::adopt(token->systemIdentifier());
+    const String& publicId = StringImpl::create8BitIfPossible(token->publicIdentifier());
+    const String& systemId = StringImpl::create8BitIfPossible(token->systemIdentifier());
     RefPtr<DocumentType> doctype = DocumentType::create(m_document, token->name(), publicId, systemId);
     attachLater(m_attachmentRoot, doctype.release());