Source/core/dom/Document.cpp - Issue 69823002: Move ownership of the TextResourceDecoder to DecodedDataDocumentParser

Unified Diff: Source/core/dom/Document.cpp

Issue 69823002: Move ownership of the TextResourceDecoder to DecodedDataDocumentParser (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Moved DocumentEncodingData to its own header Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/core/dom/Document.cpp

diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp

index ddbf5696eac836353ba82ea2d429573a829b2f22..e9f79d176eeddf3b756325faecce363b3fb7ed7e 100644

--- a/Source/core/dom/Document.cpp

+++ b/Source/core/dom/Document.cpp

@@ -518,8 +518,6 @@ Document::~Document()

if (this == topDocument())

clearAXObjectCache();

- setDecoder(PassRefPtr<TextResourceDecoder>());

if (m_styleSheetList)

m_styleSheetList->detachFromDocument();

@@ -1100,7 +1098,7 @@ String Document::encodingName() const

// TextEncoding::name() returns a char*, no need to allocate a new

// String for it each time.

// FIXME: We should fix TextEncoding to speak AtomicString anyway.

- return AtomicString(m_encoding.name());

+ return AtomicString(encoding().name());

}

String Document::defaultCharset() const

@@ -1112,10 +1110,15 @@ String Document::defaultCharset() const

void Document::setCharset(const String& charset)

{

- if (!decoder())

+ if (DocumentLoader* documentLoader = loader())

+ documentLoader->setUserChosenEncoding(charset);

+ WTF::TextEncoding encoding(charset);

+ // In case the encoding didn't exist, we keep the old one (helps some sites specifying invalid encodings).

+ if (!encoding.isValid())

return;

- decoder()->setEncoding(charset, TextResourceDecoder::UserChosenEncoding);

- setEncoding(m_decoder->encoding());

+ DocumentEncodingData data;

+ data.encoding = encoding;

+ setEncodingData(data);

abarth-chromium 2013/11/14 07:04:33 It's ok to clobber all the data? We don't want to

oystein (OOO til 10th of July) 2013/11/14 19:02:29 Unsure, maybe jamesr@ knows. I've modified this to

}

void Document::setContentLanguage(const String& language)

@@ -3108,7 +3111,7 @@ PassRefPtr<Document> Document::cloneDocumentWithoutChildren()

void Document::cloneDataFromDocument(const Document& other)

{

setCompatibilityMode(other.compatibilityMode());

- setEncoding(other.encoding());

+ setEncodingData(other.encodingData());

abarth-chromium 2013/11/14 07:04:33 Notice that there's no reason to call encodingData

oystein (OOO til 10th of July) 2013/11/14 19:02:29 Done.

setContextFeatures(other.contextFeatures());

setSecurityOrigin(other.securityOrigin()->isolatedCopy());

}

@@ -3928,17 +3931,8 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S

return parseQualifiedNameInternal(qualifiedName, qualifiedName.characters16(), length, prefix, localName, es);

}

-void Document::setDecoder(PassRefPtr<TextResourceDecoder> decoder)

+void Document::setEncodingData(const DocumentEncodingData& newData)

{

- m_decoder = decoder;

- setEncoding(m_decoder ? m_decoder->encoding() : WTF::TextEncoding());

-void Document::setEncoding(const WTF::TextEncoding& encoding)

- if (m_encoding == encoding)

- return;

// It's possible for the encoding of the document to change while we're decoding

// data. That can only occur while we're processing the <head> portion of the

// document. There isn't much user-visible content in the <head>, but there is

@@ -3946,17 +3940,18 @@ void Document::setEncoding(const WTF::TextEncoding& encoding)

// document's title so that the user doesn't see an incorrectly decoded title

// in the title bar.

if (m_titleElement

+ && encoding() != newData.encoding

&& !m_titleElement->firstElementChild()

- && m_encoding == Latin1Encoding()

+ && encoding() == Latin1Encoding()

&& m_titleElement->textContent().containsOnlyLatin1()) {

CString originalBytes = m_titleElement->textContent().latin1();

- OwnPtr<TextCodec> codec = newTextCodec(encoding);

+ OwnPtr<TextCodec> codec = newTextCodec(newData.encoding);

String correctlyDecodedTitle = codec->decode(originalBytes.data(), originalBytes.length(), true);

m_titleElement->setTextContent(correctlyDecodedTitle, IGNORE_EXCEPTION);

}

- m_encoding = encoding;

+ m_encodingData = newData;

}

KURL Document::completeURL(const String& url, const KURL& baseURLOverride) const

@@ -3967,9 +3962,9 @@ KURL Document::completeURL(const String& url, const KURL& baseURLOverride) const

if (url.isNull())

return KURL();

const KURL& baseURL = ((baseURLOverride.isEmpty() || baseURLOverride == blankURL()) && parentDocument()) ? parentDocument()->baseURL() : baseURLOverride;

- if (!m_decoder)

+ if (!encoding().isValid())

return KURL(baseURL, url);

- return KURL(baseURL, url, m_decoder->encoding());

+ return KURL(baseURL, url, encoding());

}

KURL Document::completeURL(const String& url) const

« Source/core/dom/Document.h ('K') | « Source/core/dom/Document.h ('k') | Source/core/dom/DocumentEncodingData.h » ('j') | Source/core/dom/DocumentEncodingData.h » ('J')