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

Side by Side Diff: Source/core/platform/SharedBuffer.cpp

Issue 13973026: remove memoryinstrumentation Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove the rest part of MemoryInstrumentation Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/platform/SharedBuffer.h ('k') | Source/core/platform/audio/AudioArray.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) 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. 3 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "SharedBuffer.h" 28 #include "SharedBuffer.h"
29 29
30 #include "PlatformMemoryInstrumentation.h"
31 #include "PurgeableBuffer.h" 30 #include "PurgeableBuffer.h"
32 #include <wtf/MemoryInstrumentationVector.h>
33 #include <wtf/PassOwnPtr.h> 31 #include <wtf/PassOwnPtr.h>
34 #include <wtf/unicode/UTF8.h> 32 #include <wtf/unicode/UTF8.h>
35 #include <wtf/unicode/Unicode.h> 33 #include <wtf/unicode/Unicode.h>
36 34
37 using namespace std; 35 using namespace std;
38 36
39 namespace WebCore { 37 namespace WebCore {
40 38
41 static const unsigned segmentSize = 0x1000; 39 static const unsigned segmentSize = 0x1000;
42 static const unsigned segmentPositionMask = 0x0FFF; 40 static const unsigned segmentPositionMask = 0x0FFF;
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 memcpy(destination, m_segments[i], bytesToCopy); 249 memcpy(destination, m_segments[i], bytesToCopy);
252 destination += bytesToCopy; 250 destination += bytesToCopy;
253 bytesLeft -= bytesToCopy; 251 bytesLeft -= bytesToCopy;
254 freeSegment(m_segments[i]); 252 freeSegment(m_segments[i]);
255 } 253 }
256 m_segments.clear(); 254 m_segments.clear();
257 } 255 }
258 return m_buffer; 256 return m_buffer;
259 } 257 }
260 258
261 void SharedBuffer::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
262 {
263 MemoryClassInfo info(memoryObjectInfo, this);
264 info.addMember(m_buffer, "buffer");
265 for (unsigned i = 0; i < m_segments.size(); ++i)
266 info.addRawBuffer(m_segments[i], segmentSize, "RawBufferSegment", "segme nt");
267 info.addMember(m_segments, "segments");
268 info.addMember(m_purgeableBuffer, "purgeableBuffer");
269 }
270
271 unsigned SharedBuffer::getSomeData(const char*& someData, unsigned position) con st 259 unsigned SharedBuffer::getSomeData(const char*& someData, unsigned position) con st
272 { 260 {
273 unsigned totalSize = size(); 261 unsigned totalSize = size();
274 if (position >= totalSize) { 262 if (position >= totalSize) {
275 someData = 0; 263 someData = 0;
276 return 0; 264 return 0;
277 } 265 }
278 266
279 if (hasPlatformData() || m_purgeableBuffer) { 267 if (hasPlatformData() || m_purgeableBuffer) {
280 ASSERT_WITH_SECURITY_IMPLICATION(position < size()); 268 ASSERT_WITH_SECURITY_IMPLICATION(position < size());
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 const UChar* d = string.characters(); 335 const UChar* d = string.characters();
348 WTF::Unicode::ConversionResult result = WTF::Unicode::convertUTF16ToUTF8(&d, d + length, &p, p + buffer.size(), true); 336 WTF::Unicode::ConversionResult result = WTF::Unicode::convertUTF16ToUTF8(&d, d + length, &p, p + buffer.size(), true);
349 if (result != WTF::Unicode::conversionOK) 337 if (result != WTF::Unicode::conversionOK)
350 return 0; 338 return 0;
351 339
352 buffer.shrink(p - buffer.data()); 340 buffer.shrink(p - buffer.data());
353 return SharedBuffer::adoptVector(buffer); 341 return SharedBuffer::adoptVector(buffer);
354 } 342 }
355 343
356 } // namespace WebCore 344 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/SharedBuffer.h ('k') | Source/core/platform/audio/AudioArray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698