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

Unified Diff: content/public/test/layout_tests/WebTestCommon.h

Issue 110533009: Import TestRunner library into chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 7 years 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
Index: content/public/test/layout_tests/WebTestCommon.h
diff --git a/third_party/tcmalloc/vendor/src/base/linuxthreads.h b/content/public/test/layout_tests/WebTestCommon.h
similarity index 58%
copy from third_party/tcmalloc/vendor/src/base/linuxthreads.h
copy to content/public/test/layout_tests/WebTestCommon.h
index 5c318fed7ec4c47e7bf082e315992e102abcd620..31b324a109f62d850c5545281aae87f8f0597a18 100644
--- a/third_party/tcmalloc/vendor/src/base/linuxthreads.h
+++ b/content/public/test/layout_tests/WebTestCommon.h
@@ -1,5 +1,9 @@
-/* Copyright (c) 2005-2007, Google Inc.
- * All rights reserved.
+// Copyright 2013 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.
+
+/*
+ * Copyright (C) 2013 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -26,28 +30,44 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ---
- * Author: Markus Gutschke
*/
-#ifndef _LINUXTHREADS_H
-#define _LINUXTHREADS_H
+#ifndef WebTestCommon_h
+#define WebTestCommon_h
-/* Include thread_lister.h to get the interface that we implement for linux.
- */
+// -----------------------------------------------------------------------------
+// Default configuration
-/* We currently only support x86-32 and x86-64 on Linux. Porting to other
- * related platforms should not be difficult.
- */
-#if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) || \
- defined(__mips__) || defined(__PPC__)) && defined(__linux)
+#if !defined(WEBTESTRUNNER_IMPLEMENTATION)
+#define WEBTESTRUNNER_IMPLEMENTATION 0
+#endif
-/* Define the THREADS symbol to make sure that there is exactly one core dumper
- * built into the library.
- */
-#define THREADS "Linux /proc"
+// -----------------------------------------------------------------------------
+// Exported symbols need to be annotated with WEBTESTRUNNER_EXPORT
+
+#if defined(WEBTESTRUNNER_DLL)
+
+#if defined(WIN32)
+#if WEBTESTRUNNER_IMPLEMENTATION
+#define WEBTESTRUNNER_EXPORT __declspec(dllexport)
+#else
+#define WEBTESTRUNNER_EXPORT __declspec(dllimport)
+#endif
+
+#else // defined(WIN32)
+
+#if WEBTESTRUNNER_IMPLEMENTATION
+#define WEBTESTRUNNER_EXPORT __attribute__((visibility("default")))
+#else
+#define WEBTESTRUNNER_EXPORT
+#endif
+
+#endif
+
+#else // defined(WEBTESTRUNNER_DLL)
+
+#define WEBTESTRUNNER_EXPORT
#endif
-#endif /* _LINUXTHREADS_H */
+#endif // WebTestCommon_h

Powered by Google App Engine
This is Rietveld 408576698