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

Side by Side Diff: Source/core/fetch/ShaderResource.cpp

Issue 133273007: Revert "Moved text decoding to the parser thread" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/fetch/ScriptResource.cpp ('k') | Source/core/fetch/TextResourceDecoder.h » ('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) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 12 matching lines...) Expand all
23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29 29
30 #include "config.h" 30 #include "config.h"
31 #include "core/fetch/ShaderResource.h" 31 #include "core/fetch/ShaderResource.h"
32 32
33 #include "core/html/parser/TextResourceDecoder.h" 33 #include "core/fetch/TextResourceDecoder.h"
34 #include "platform/SharedBuffer.h" 34 #include "platform/SharedBuffer.h"
35 #include "wtf/text/StringBuilder.h" 35 #include "wtf/text/StringBuilder.h"
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 ShaderResource::ShaderResource(const ResourceRequest& resourceRequest) 39 ShaderResource::ShaderResource(const ResourceRequest& resourceRequest)
40 : Resource(resourceRequest, Shader) 40 : Resource(resourceRequest, Shader)
41 , m_decoder(TextResourceDecoder::create("application/shader")) 41 , m_decoder(TextResourceDecoder::create("application/shader"))
42 { 42 {
43 } 43 }
44 44
45 ShaderResource::~ShaderResource() 45 ShaderResource::~ShaderResource()
46 { 46 {
47 } 47 }
48 48
49 const String& ShaderResource::shaderString() 49 const String& ShaderResource::shaderString()
50 { 50 {
51 if (m_shaderString.isNull() && m_data) { 51 if (m_shaderString.isNull() && m_data) {
52 StringBuilder builder; 52 StringBuilder builder;
53 builder.append(m_decoder->decode(m_data->data(), m_data->size())); 53 builder.append(m_decoder->decode(m_data->data(), m_data->size()));
54 builder.append(m_decoder->flush()); 54 builder.append(m_decoder->flush());
55 m_shaderString = builder.toString(); 55 m_shaderString = builder.toString();
56 } 56 }
57 57
58 return m_shaderString; 58 return m_shaderString;
59 } 59 }
60 60
61 } // namespace WebCore 61 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/fetch/ScriptResource.cpp ('k') | Source/core/fetch/TextResourceDecoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698