Chromium Code Reviews Chromium Code Reviews
Issue 74513003:
Moved text decoding to the parser thread (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@parserthread_step25| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. |
| 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) | 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) |
| 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. |
| 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. |
| (...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1102 | 1102 |
| 1103 void Document::setCharset(const String& charset) | 1103 void Document::setCharset(const String& charset) |
| 1104 { | 1104 { |
| 1105 if (DocumentLoader* documentLoader = loader()) | 1105 if (DocumentLoader* documentLoader = loader()) |
| 1106 documentLoader->setUserChosenEncoding(charset); | 1106 documentLoader->setUserChosenEncoding(charset); |
| 1107 WTF::TextEncoding encoding(charset); | 1107 WTF::TextEncoding encoding(charset); |
| 1108 // In case the encoding didn't exist, we keep the old one (helps some sites specifying invalid encodings). | 1108 // In case the encoding didn't exist, we keep the old one (helps some sites specifying invalid encodings). |
| 1109 if (!encoding.isValid()) | 1109 if (!encoding.isValid()) |
| 1110 return; | 1110 return; |
| 1111 DocumentEncodingData newEncodingData = m_encodingData; | 1111 DocumentEncodingData newEncodingData = m_encodingData; |
| 1112 newEncodingData.encoding = encoding; | 1112 newEncodingData.setEncoding(encoding); |
| 1113 setEncodingData(newEncodingData); | 1113 setEncodingData(newEncodingData); |
| 1114 } | 1114 } |
| 1115 | 1115 |
| 1116 void Document::setContentLanguage(const String& language) | 1116 void Document::setContentLanguage(const String& language) |
| 1117 { | 1117 { |
| 1118 if (m_contentLanguage == language) | 1118 if (m_contentLanguage == language) |
| 1119 return; | 1119 return; |
| 1120 m_contentLanguage = language; | 1120 m_contentLanguage = language; |
| 1121 | 1121 |
| 1122 // Document's style depends on the content language. | 1122 // Document's style depends on the content language. |
| (...skipping 979 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2102 // If the document has already been detached, do not make a new axObjectCach e. | 2102 // If the document has already been detached, do not make a new axObjectCach e. |
| 2103 if (!topDocument->renderView()) | 2103 if (!topDocument->renderView()) |
| 2104 return 0; | 2104 return 0; |
| 2105 | 2105 |
| 2106 ASSERT(topDocument == this || !m_axObjectCache); | 2106 ASSERT(topDocument == this || !m_axObjectCache); |
| 2107 if (!topDocument->m_axObjectCache) | 2107 if (!topDocument->m_axObjectCache) |
| 2108 topDocument->m_axObjectCache = adoptPtr(new AXObjectCache(topDocument)); | 2108 topDocument->m_axObjectCache = adoptPtr(new AXObjectCache(topDocument)); |
| 2109 return topDocument->m_axObjectCache.get(); | 2109 return topDocument->m_axObjectCache.get(); |
| 2110 } | 2110 } |
| 2111 | 2111 |
| 2112 void Document::setVisuallyOrdered() | |
| 2113 { | |
| 2114 m_visuallyOrdered = true; | |
| 2115 // FIXME: How is possible to not have a renderer here? | |
| 2116 if (renderView()) | |
| 2117 renderView()->style()->setRTLOrdering(VisualOrder); | |
| 2118 setNeedsStyleRecalc(); | |
| 2119 } | |
| 2120 | |
| 2121 PassRefPtr<DocumentParser> Document::createParser() | 2112 PassRefPtr<DocumentParser> Document::createParser() |
| 2122 { | 2113 { |
| 2123 if (isHTMLDocument()) { | 2114 if (isHTMLDocument()) { |
| 2124 bool reportErrors = InspectorInstrumentation::collectingHTMLParseErrors( this->page()); | 2115 bool reportErrors = InspectorInstrumentation::collectingHTMLParseErrors( this->page()); |
| 2125 return HTMLDocumentParser::create(toHTMLDocument(this), reportErrors); | 2116 return HTMLDocumentParser::create(toHTMLDocument(this), reportErrors); |
| 2126 } | 2117 } |
| 2127 // FIXME: this should probably pass the frame instead | 2118 // FIXME: this should probably pass the frame instead |
| 2128 return XMLDocumentParser::create(this, view()); | 2119 return XMLDocumentParser::create(this, view()); |
| 2129 } | 2120 } |
| 2130 | 2121 |
| (...skipping 1825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3956 | 3947 |
| 3957 void Document::setEncodingData(const DocumentEncodingData& newData) | 3948 void Document::setEncodingData(const DocumentEncodingData& newData) |
| 3958 { | 3949 { |
| 3959 // It's possible for the encoding of the document to change while we're deco ding | 3950 // It's possible for the encoding of the document to change while we're deco ding |
| 3960 // data. That can only occur while we're processing the <head> portion of th e | 3951 // data. That can only occur while we're processing the <head> portion of th e |
| 3961 // document. There isn't much user-visible content in the <head>, but there is | 3952 // document. There isn't much user-visible content in the <head>, but there is |
| 3962 // the <title> element. This function detects that situation and re-decodes the | 3953 // the <title> element. This function detects that situation and re-decodes the |
| 3963 // document's title so that the user doesn't see an incorrectly decoded titl e | 3954 // document's title so that the user doesn't see an incorrectly decoded titl e |
| 3964 // in the title bar. | 3955 // in the title bar. |
| 3965 if (m_titleElement | 3956 if (m_titleElement |
| 3966 && encoding() != newData.encoding | 3957 && encoding() != newData.encoding() |
| 3967 && !m_titleElement->firstElementChild() | 3958 && !m_titleElement->firstElementChild() |
| 3968 && encoding() == Latin1Encoding() | 3959 && encoding() == Latin1Encoding() |
| 3969 && m_titleElement->textContent().containsOnlyLatin1()) { | 3960 && m_titleElement->textContent().containsOnlyLatin1()) { |
| 3970 | 3961 |
| 3971 CString originalBytes = m_titleElement->textContent().latin1(); | 3962 CString originalBytes = m_titleElement->textContent().latin1(); |
| 3972 OwnPtr<TextCodec> codec = newTextCodec(newData.encoding); | 3963 OwnPtr<TextCodec> codec = newTextCodec(newData.encoding()); |
| 3973 String correctlyDecodedTitle = codec->decode(originalBytes.data(), origi nalBytes.length(), true); | 3964 String correctlyDecodedTitle = codec->decode(originalBytes.data(), origi nalBytes.length(), true); |
| 3974 m_titleElement->setTextContent(correctlyDecodedTitle, IGNORE_EXCEPTION); | 3965 m_titleElement->setTextContent(correctlyDecodedTitle, IGNORE_EXCEPTION); |
| 3975 } | 3966 } |
| 3976 | 3967 |
| 3977 m_encodingData = newData; | 3968 m_encodingData = newData; |
| 3969 | |
| 3970 // FIXME: Should be removed as part of https://code.google.com/p/chromium/is sues/detail?id=319643 | |
| 3971 if (m_encodingData.encoding().usesVisualOrdering() != m_visuallyOrdered) { | |
| 3972 m_visuallyOrdered = !m_visuallyOrdered; | |
|
eseidel
2013/11/25 19:57:13
This reads weird to me, but OK.
oystein (OOO til 10th of July)
2013/11/27 00:47:30
Habitual thing, I suppose; I added a new local var
| |
| 3973 // FIXME: How is possible to not have a renderer here? | |
| 3974 if (renderView()) | |
| 3975 renderView()->style()->setRTLOrdering(m_visuallyOrdered ? VisualOrde r : LogicalOrder); | |
| 3976 setNeedsStyleRecalc(); | |
| 3977 } | |
| 3978 } | 3978 } |
| 3979 | 3979 |
| 3980 KURL Document::completeURL(const String& url, const KURL& baseURLOverride) const | 3980 KURL Document::completeURL(const String& url, const KURL& baseURLOverride) const |
| 3981 { | 3981 { |
| 3982 // Always return a null URL when passed a null string. | 3982 // Always return a null URL when passed a null string. |
| 3983 // FIXME: Should we change the KURL constructor to have this behavior? | 3983 // FIXME: Should we change the KURL constructor to have this behavior? |
| 3984 // See also [CSS]StyleSheet::completeURL(const String&) | 3984 // See also [CSS]StyleSheet::completeURL(const String&) |
| 3985 if (url.isNull()) | 3985 if (url.isNull()) |
| 3986 return KURL(); | 3986 return KURL(); |
| 3987 const KURL& baseURL = ((baseURLOverride.isEmpty() || baseURLOverride == blan kURL()) && parentDocument()) ? parentDocument()->baseURL() : baseURLOverride; | 3987 const KURL& baseURL = ((baseURLOverride.isEmpty() || baseURLOverride == blan kURL()) && parentDocument()) ? parentDocument()->baseURL() : baseURLOverride; |
| (...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5197 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode) | 5197 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode) |
| 5198 { | 5198 { |
| 5199 if (!isActive()) | 5199 if (!isActive()) |
| 5200 return; | 5200 return; |
| 5201 | 5201 |
| 5202 styleEngine()->modifiedStyleSheet(sheet); | 5202 styleEngine()->modifiedStyleSheet(sheet); |
| 5203 styleResolverChanged(when, updateMode); | 5203 styleResolverChanged(when, updateMode); |
| 5204 } | 5204 } |
| 5205 | 5205 |
| 5206 } // namespace WebCore | 5206 } // namespace WebCore |
| OLD | NEW |
