Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: Source/core/dom/DocumentEncodingData.cpp

Issue 129123002: Revert of "Revert of Moved text decoding to the parser thread" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 months 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 unified diff | Download patch
« no previous file with comments | « Source/core/dom/DocumentEncodingData.h ('k') | Source/core/dom/DocumentParser.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "platform/PlatformThreadData.h" 32 #include "core/dom/DocumentEncodingData.h"
33 33
34 #include "platform/ThreadTimers.h" 34 #include "core/html/parser/TextResourceDecoder.h"
35 #include "wtf/PassOwnPtr.h"
36 #include "wtf/ThreadSpecific.h"
37 35
38 namespace WebCore { 36 namespace WebCore {
39 37
40 static ThreadSpecific<PlatformThreadData>* s_data; 38 DocumentEncodingData::DocumentEncodingData()
41 39 : m_wasDetectedHeuristically(false)
42 PlatformThreadData::PlatformThreadData() 40 , m_sawDecodingError(false)
43 : m_threadTimers(adoptPtr(new ThreadTimers))
44 { 41 {
45 } 42 }
46 43
47 PlatformThreadData::~PlatformThreadData() 44 DocumentEncodingData::DocumentEncodingData(const TextResourceDecoder& decoder)
48 { 45 {
46 m_encoding = decoder.encoding();
47 m_wasDetectedHeuristically = decoder.encodingWasDetectedHeuristically();
48 m_sawDecodingError = decoder.sawError();
49 } 49 }
50 50
51 void PlatformThreadData::destroy() 51 void DocumentEncodingData::setEncoding(const WTF::TextEncoding& encoding)
52 { 52 {
53 m_threadTimers.clear(); 53 m_encoding = encoding;
54 }
55
56 PlatformThreadData& PlatformThreadData::current()
57 {
58 if (!s_data)
59 s_data = new ThreadSpecific<PlatformThreadData>;
60 return **s_data;
61 } 54 }
62 55
63 } // namespace WebCore 56 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentEncodingData.h ('k') | Source/core/dom/DocumentParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698