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

Unified Diff: third_party/WebKit/Source/wtf/ContainerAnnotations.h

Issue 2755663002: Move files in wtf/ to platform/wtf/ (Part 2). (Closed)
Patch Set: Fix file name (facepalm). Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/wtf/ConditionalDestructor.h ('k') | third_party/WebKit/Source/wtf/CurrentTime.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/wtf/ContainerAnnotations.h
diff --git a/third_party/WebKit/Source/wtf/ContainerAnnotations.h b/third_party/WebKit/Source/wtf/ContainerAnnotations.h
index 401cc605435e88372a465472d4a9f5afe5528449..ff2a3cbcd174f0731c87e16f420c80e32437e7bc 100644
--- a/third_party/WebKit/Source/wtf/ContainerAnnotations.h
+++ b/third_party/WebKit/Source/wtf/ContainerAnnotations.h
@@ -1,44 +1,9 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WTF_ContainerAnnotations_h
-#define WTF_ContainerAnnotations_h
+#include "platform/wtf/ContainerAnnotations.h"
-#include "wtf/AddressSanitizer.h"
-#include "wtf/CPU.h"
-
-// TODO(ochang): Remove the CPU(X86_64) condition to enable this for X86 once
-// the crashes there have been fixed: http://crbug.com/461406
-#if defined(ADDRESS_SANITIZER) && OS(LINUX) && CPU(X86_64)
-#define ANNOTATE_CONTIGUOUS_CONTAINER
-#define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \
- if (buffer) { \
- __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), \
- (buffer) + (capacity), \
- (buffer) + (newSize)); \
- }
-#define ANNOTATE_DELETE_BUFFER(buffer, capacity, oldSize) \
- if (buffer) { \
- __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), \
- (buffer) + (oldSize), \
- (buffer) + (capacity)); \
- }
-#define ANNOTATE_CHANGE_SIZE(buffer, capacity, oldSize, newSize) \
- if (buffer) { \
- __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), \
- (buffer) + (oldSize), \
- (buffer) + (newSize)); \
- }
-#define ANNOTATE_CHANGE_CAPACITY(buffer, oldCapacity, bufferSize, newCapacity) \
- ANNOTATE_DELETE_BUFFER(buffer, oldCapacity, bufferSize); \
- ANNOTATE_NEW_BUFFER(buffer, newCapacity, bufferSize);
-// Annotations require buffers to begin on an 8-byte boundary.
-#else // defined(ADDRESS_SANITIZER) && OS(LINUX) && CPU(X86_64)
-#define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize)
-#define ANNOTATE_DELETE_BUFFER(buffer, capacity, oldSize)
-#define ANNOTATE_CHANGE_SIZE(buffer, capacity, oldSize, newSize)
-#define ANNOTATE_CHANGE_CAPACITY(buffer, oldCapacity, bufferSize, newCapacity)
-#endif // defined(ADDRESS_SANITIZER) && OS(LINUX) && CPU(X86_64)
-
-#endif // WTF_ContainerAnnotations_h
+// The contents of this header was moved to platform/wtf as part of
+// WTF migration project. See the following post for details:
+// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
« no previous file with comments | « third_party/WebKit/Source/wtf/ConditionalDestructor.h ('k') | third_party/WebKit/Source/wtf/CurrentTime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698