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

Side by Side Diff: third_party/WebKit/Source/modules/encoding/TextEncoder.cpp

Issue 1964183004: Revert of Move DOMArrayBuffer, DOMArrayBufferViews and DataView to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 { 69 {
70 } 70 }
71 71
72 String TextEncoder::encoding() const 72 String TextEncoder::encoding() const
73 { 73 {
74 String name = String(m_encoding.name()).lower(); 74 String name = String(m_encoding.name()).lower();
75 ASSERT(name == "utf-8" || name == "utf-16le" || name == "utf-16be"); 75 ASSERT(name == "utf-8" || name == "utf-16le" || name == "utf-16be");
76 return name; 76 return name;
77 } 77 }
78 78
79 DOMUint8Array* TextEncoder::encode(const String& input) 79 PassRefPtr<DOMUint8Array> TextEncoder::encode(const String& input)
80 { 80 {
81 CString result; 81 CString result;
82 if (input.is8Bit()) 82 if (input.is8Bit())
83 result = m_codec->encode(input.characters8(), input.length(), WTF::Quest ionMarksForUnencodables); 83 result = m_codec->encode(input.characters8(), input.length(), WTF::Quest ionMarksForUnencodables);
84 else 84 else
85 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables); 85 result = m_codec->encode(input.characters16(), input.length(), WTF::Ques tionMarksForUnencodables);
86 86
87 const char* buffer = result.data(); 87 const char* buffer = result.data();
88 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer); 88 const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*> (buffer);
89 89
90 return DOMUint8Array::create(unsignedBuffer, result.length()); 90 return DOMUint8Array::create(unsignedBuffer, result.length());
91 } 91 }
92 92
93 } // namespace blink 93 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698