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

Unified Diff: third_party/WebKit/Source/platform/BUILD.gn

Issue 1456873003: More regular Platform implementations in unit tests (reland.) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: have GN disable c4267 also Created 5 years, 1 month 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: third_party/WebKit/Source/platform/BUILD.gn
diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn
index 4fde690fca2bff9c722016fc1ba28dabe32901f8..a7158d1ee2ee2db60ed720db9185d549fe466e00 100644
--- a/third_party/WebKit/Source/platform/BUILD.gn
+++ b/third_party/WebKit/Source/platform/BUILD.gn
@@ -209,10 +209,10 @@ component("platform") {
]
deps = [
":make_platform_generated",
+ "//third_party/WebKit/Source/platform/heap",
+ "//third_party/WebKit/Source/wtf",
"//third_party/harfbuzz-ng",
"//third_party/icu",
- "//third_party/WebKit/Source/wtf",
- "//third_party/WebKit/Source/platform/heap",
]
if (is_mac) {
@@ -326,6 +326,10 @@ source_set("test_support") {
deps = [
":platform",
]
+
+ if (is_win) {
+ cflags = [ "/wd4267" ] # Truncation from size_t to int.
+ }
}
# GYP: blink_heap_unittests
@@ -349,11 +353,11 @@ test("heap_unittests") {
"//base",
"//base/allocator",
"//base/test:test_support",
+ "//content/test:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/wtf:test_support",
- "//content/test:test_support",
]
if (is_android) {
apk_deps = [
@@ -401,9 +405,9 @@ test("platform_unittests") {
"//skia",
"//testing/gmock",
"//testing/gtest",
- "//third_party/harfbuzz-ng",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/wtf:test_support",
+ "//third_party/harfbuzz-ng",
"//url",
]
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceTest.cpp ('k') | third_party/WebKit/Source/platform/PurgeableVectorTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698