From 250eb95317140bf65dfd7b4dbc03ac20f45cde41 Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@digia.com>
Date: Tue, 26 Aug 2014 14:00:01 +0200
Subject: [PATCH] <third_party/WebKit> Disable annotations in Heap.h.
This patch can be removed again as soon as
we do not need to support XCode <= 5.0 anymore.
Change-Id: Icdcca203f28555029a16ce7f8a806f2844ecb0b4
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
chromium/third_party/WebKit/Source/platform/heap/Heap.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/chromium/third_party/WebKit/Source/platform/heap/Heap.h b/chromium/third_party/WebKit/Source/platform/heap/Heap.h
index e7894d77ec0..bc21ff1595c 100644
--- a/chromium/third_party/WebKit/Source/platform/heap/Heap.h
+++ b/chromium/third_party/WebKit/Source/platform/heap/Heap.h
@@ -1256,7 +1256,11 @@ T* adoptRefCountedGarbageCollected(T* ptr)
// ignore a particular class or field when checking for proper usage. When using
// GC_PLUGIN_IGNORE a bug-number should be provided as an argument where the
// bug describes what needs to happen to remove the GC_PLUGIN_IGNORE again.
-#if COMPILER(CLANG)
+
+// Annotations are not working in XCode <= 5.0. Therfore we have to
+// disable annotations until we do not need to support such an XCode
+// version anymore. - We are never running the GC plugin anyway.
+#if COMPILER(CLANG) && !defined(TOOLKIT_QT)
#define STACK_ALLOCATED() \
private: \
__attribute__((annotate("blink_stack_allocated"))) \
--
GitLab