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

Side by Side Diff: third_party/WebKit/Source/platform/heap/HeapPage.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 30 matching lines...) Expand all
41 #include "platform/heap/PagePool.h" 41 #include "platform/heap/PagePool.h"
42 #include "platform/heap/SafePoint.h" 42 #include "platform/heap/SafePoint.h"
43 #include "platform/heap/ThreadState.h" 43 #include "platform/heap/ThreadState.h"
44 #include "platform/web_memory_allocator_dump.h" 44 #include "platform/web_memory_allocator_dump.h"
45 #include "platform/web_process_memory_dump.h" 45 #include "platform/web_process_memory_dump.h"
46 #include "public/platform/Platform.h" 46 #include "public/platform/Platform.h"
47 #include "wtf/Assertions.h" 47 #include "wtf/Assertions.h"
48 #include "wtf/ContainerAnnotations.h" 48 #include "wtf/ContainerAnnotations.h"
49 #include "wtf/CurrentTime.h" 49 #include "wtf/CurrentTime.h"
50 #include "wtf/LeakAnnotations.h" 50 #include "wtf/LeakAnnotations.h"
51 #include "wtf/PassOwnPtr.h"
51 #include "wtf/TemporaryChange.h" 52 #include "wtf/TemporaryChange.h"
52 #include "wtf/allocator/PageAllocator.h" 53 #include "wtf/allocator/PageAllocator.h"
53 #include "wtf/allocator/Partitions.h" 54 #include "wtf/allocator/Partitions.h"
54 55
55 #ifdef ANNOTATE_CONTIGUOUS_CONTAINER 56 #ifdef ANNOTATE_CONTIGUOUS_CONTAINER
56 // FIXME: have ContainerAnnotations.h define an ENABLE_-style name instead. 57 // FIXME: have ContainerAnnotations.h define an ENABLE_-style name instead.
57 #define ENABLE_ASAN_CONTAINER_ANNOTATIONS 1 58 #define ENABLE_ASAN_CONTAINER_ANNOTATIONS 1
58 59
59 // When finalizing a non-inlined vector backing store/container, remove 60 // When finalizing a non-inlined vector backing store/container, remove
60 // its contiguous container annotation. Required as it will not be destructed 61 // its contiguous container annotation. Required as it will not be destructed
(...skipping 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 1617
1617 m_hasEntries = true; 1618 m_hasEntries = true;
1618 size_t index = hash(address); 1619 size_t index = hash(address);
1619 ASSERT(!(index & 1)); 1620 ASSERT(!(index & 1));
1620 Address cachePage = roundToBlinkPageStart(address); 1621 Address cachePage = roundToBlinkPageStart(address);
1621 m_entries[index + 1] = m_entries[index]; 1622 m_entries[index + 1] = m_entries[index];
1622 m_entries[index] = cachePage; 1623 m_entries[index] = cachePage;
1623 } 1624 }
1624 1625
1625 } // namespace blink 1626 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/heap/Heap.cpp ('k') | third_party/WebKit/Source/platform/heap/HeapTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698