diff options
| -rw-r--r-- | build/all.gyp | 9 | ||||
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 17 | ||||
| -rw-r--r-- | skia/BUILD.gn | 46 | ||||
| -rw-r--r-- | skia/ext/platform_canvas_unittest.cc | 29 | ||||
| -rw-r--r-- | skia/skia_tests.gyp | 65 | ||||
| -rw-r--r-- | testing/buildbot/chromium.chromiumos.json | 5 | ||||
| -rw-r--r-- | testing/buildbot/chromium.fyi.json | 5 | ||||
| -rw-r--r-- | testing/buildbot/chromium.linux.json | 12 | ||||
| -rw-r--r-- | testing/buildbot/chromium.mac.json | 12 | ||||
| -rw-r--r-- | testing/buildbot/chromium.memory.fyi.json | 2 | ||||
| -rw-r--r-- | testing/buildbot/chromium.memory.json | 3 | ||||
| -rw-r--r-- | testing/buildbot/chromium.webkit.json | 4 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 15 | ||||
| -rw-r--r-- | testing/buildbot/chromium_memory_trybot.json | 1 | ||||
| -rw-r--r-- | testing/buildbot/chromium_trybot.json | 1 | ||||
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 4 |
16 files changed, 44 insertions, 186 deletions
diff --git a/build/all.gyp b/build/all.gyp index 226eada..04e67c3 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -311,7 +311,6 @@ '../components/components_tests.gyp:components_unittests', '../crypto/crypto.gyp:crypto_unittests', '../net/net.gyp:net_unittests', - '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../ui/base/ui_base_tests.gyp:ui_base_unittests', @@ -840,7 +839,6 @@ '../media/media.gyp:media_unittests', '../net/net.gyp:net_unittests', '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps', - '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../testing/android/junit/junit_test.gyp:junit_unit_tests', @@ -875,7 +873,6 @@ '../media/media.gyp:media_unittests_apk', '../net/net.gyp:net_unittests_apk', '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk', - '../skia/skia_tests.gyp:skia_unittests_apk', '../sql/sql.gyp:sql_unittests_apk', '../sync/sync.gyp:sync_unit_tests_apk', '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unittests_apk', @@ -948,7 +945,6 @@ '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', '../rlz/rlz.gyp:*', - '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', @@ -986,7 +982,6 @@ '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', - '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', @@ -1037,7 +1032,6 @@ '../google_apis/gcm/gcm.gyp:gcm_unit_tests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', - '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', @@ -1087,7 +1081,6 @@ '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', - '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', @@ -1188,7 +1181,6 @@ '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', - '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', @@ -1285,7 +1277,6 @@ '../google_apis/gcm/gcm.gyp:gcm_unit_tests', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../remoting/remoting.gyp:remoting_unittests', - '../skia/skia_tests.gyp:skia_unittests', '../ui/app_list/app_list.gyp:*', '../ui/aura/aura.gyp:*', '../ui/base/ui_base_tests.gyp:ui_base_unittests', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index a216dee..80dcdb3 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1418,6 +1418,17 @@ '../components/search_engines/template_url_service_sync_unittest.cc', '../components/search_engines/template_url_service_unittest.cc', + '../skia/ext/analysis_canvas_unittest.cc', + '../skia/ext/bitmap_platform_device_mac_unittest.cc', + '../skia/ext/convolver_unittest.cc', + '../skia/ext/image_operations_unittest.cc', + '../skia/ext/pixel_ref_utils_unittest.cc', + '../skia/ext/platform_canvas_unittest.cc', + '../skia/ext/recursive_gaussian_convolution_unittest.cc', + '../skia/ext/refptr_unittest.cc', + '../skia/ext/skia_utils_ios_unittest.mm', + '../skia/ext/skia_utils_mac_unittest.mm', + '../skia/ext/vector_canvas_unittest.cc', '../testing/gtest_mac_unittest.mm', '../third_party/zlib/google/zip_reader_unittest.cc', '../third_party/zlib/google/zip_unittest.cc', @@ -2467,6 +2478,11 @@ 'tools/convert_dict/convert_dict.gyp:convert_dict_lib', ], }], + ['OS!="win" and OS!="mac"', { + 'sources!': [ + '../skia/ext/platform_canvas_unittest.cc', + ], + }], ['OS=="win" or OS=="mac"', { 'sources': [ 'browser/media_galleries/fileapi/itunes_file_util_unittest.cc', @@ -2545,6 +2561,7 @@ 'browser/search_engines/template_url_scraper_unittest.cc', 'browser/ui/views/extensions/browser_action_drag_data_unittest.cc', 'test/data/resource.rc', + '../skia/ext/vector_canvas_unittest.cc', ], }], ['OS=="android" or OS=="ios"', { diff --git a/skia/BUILD.gn b/skia/BUILD.gn index eb54593..b2e703b 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -7,9 +7,6 @@ import("//build/config/ui.gni") if (cpu_arch == "arm") { import("//build/config/arm.gni") } -if (is_android) { - import("//build/config/android/rules.gni") -} skia_support_gpu = !is_ios skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview) @@ -713,46 +710,3 @@ source_set("skia_opts") { visibility = [ ":skia" ] } - -test("skia_unittests") { - sources = [ - "ext/analysis_canvas_unittest.cc", - "ext/bitmap_platform_device_mac_unittest.cc", - "ext/convolver_unittest.cc", - "ext/image_operations_unittest.cc", - "ext/pixel_ref_utils_unittest.cc", - "ext/platform_canvas_unittest.cc", - "ext/recursive_gaussian_convolution_unittest.cc", - "ext/refptr_unittest.cc", - "ext/skia_utils_ios_unittest.mm", - "ext/skia_utils_mac_unittest.mm", - "ext/vector_canvas_unittest.cc", - ] - - if (!is_win) { - sources -= [ "ext/vector_canvas_unittest.cc" ] - } - - if (!is_win && !is_mac) { - sources -= [ "ext/platform_canvas_unittest.cc" ] - } - - deps = [ - ":skia", - "//base", - "//base/test:run_all_unittests", - "//testing/gtest", - "//ui/gfx", - "//ui/gfx/geometry", - ] -} - -if (is_android) { - # GYP: //skia/skia_tests.gyp:skia_unittests_apk - unittest_apk("skia_unittests_apk") { - unittests_dep = ":skia_unittests" - deps = [ - ":skia_unittests", - ] - } -} diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc index 9ab5667..3b39b44 100644 --- a/skia/ext/platform_canvas_unittest.cc +++ b/skia/ext/platform_canvas_unittest.cc @@ -4,17 +4,7 @@ // TODO(awalker): clean up the const/non-const reference handling in this test -#include "skia/ext/platform_canvas.h" - -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" #include "build/build_config.h" -#include "skia/ext/platform_device.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkColorPriv.h" -#include "third_party/skia/include/core/SkPixelRef.h" #if defined(OS_MACOSX) #import <ApplicationServices/ApplicationServices.h> @@ -24,6 +14,15 @@ #include <unistd.h> #endif +#include "base/memory/scoped_ptr.h" +#include "skia/ext/platform_canvas.h" +#include "skia/ext/platform_device.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "third_party/skia/include/core/SkBitmap.h" +#include "third_party/skia/include/core/SkColor.h" +#include "third_party/skia/include/core/SkColorPriv.h" +#include "third_party/skia/include/core/SkPixelRef.h" + namespace skia { namespace { @@ -68,12 +67,8 @@ bool VerifyRect(const PlatformCanvas& canvas, // rectangle. Basically, we're just checking to make sure that the pixels in the // middle are of rect_color and pixels in the corners are of canvas_color. bool VerifyRoundedRect(const PlatformCanvas& canvas, - uint32_t canvas_color, - uint32_t rect_color, - int x, - int y, - int w, - int h) { + uint32_t canvas_color, uint32_t rect_color, + int x, int y, int w, int h) { SkBaseDevice* device = skia::GetTopDevice(canvas); const SkBitmap& bitmap = device->accessBitmap(false); SkAutoLockPixels lock(bitmap); @@ -131,7 +126,7 @@ void DrawNativeRect(PlatformCanvas& canvas, int x, int y, int w, int h) { } #else void DrawNativeRect(PlatformCanvas& canvas, int x, int y, int w, int h) { - NOTIMPLEMENTED(); + notImplemented(); } #endif diff --git a/skia/skia_tests.gyp b/skia/skia_tests.gyp deleted file mode 100644 index 250ff1f..0000000 --- a/skia/skia_tests.gyp +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2014 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - 'target_name': 'skia_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:run_all_unittests', - '../testing/gtest.gyp:gtest', - '../skia/skia.gyp:skia', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - ], - 'sources': [ - 'ext/analysis_canvas_unittest.cc', - 'ext/bitmap_platform_device_mac_unittest.cc', - 'ext/convolver_unittest.cc', - 'ext/image_operations_unittest.cc', - 'ext/pixel_ref_utils_unittest.cc', - 'ext/platform_canvas_unittest.cc', - 'ext/recursive_gaussian_convolution_unittest.cc', - 'ext/refptr_unittest.cc', - 'ext/skia_utils_ios_unittest.mm', - 'ext/skia_utils_mac_unittest.mm', - 'ext/vector_canvas_unittest.cc', - ], - 'conditions': [ - ['OS != "win"', { - 'sources!': [ - 'ext/vector_canvas_unittest.cc', - ], - }], - ['OS != "win" and OS != "mac"', { - 'sources!': [ - 'ext/platform_canvas_unittest.cc', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - 'target_name': 'skia_unittests_apk', - 'type': 'none', - 'dependencies': [ - 'skia_unittests', - ], - 'variables': { - 'test_suite_name': 'skia_unittests', - }, - 'includes': [ '../build/apk_test.gypi' ], - }, - ], - }], - ], -} diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 3e0535e..62ecaa0 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -89,8 +89,7 @@ "athena_unittests", "app_shell_browsertests", "app_shell_unittests", - "chromevox_tests", - "skia_unittests" + "chromevox_tests" ] }, "Linux ChromiumOS Ozone Tests (1)": { @@ -150,7 +149,6 @@ "test": "sandbox_linux_unittests", "args": ["--test-launcher-print-test-stdio=always"] }, - "skia_unittests", "sql_unittests", "sync_unit_tests", "ui_base_unittests", @@ -252,7 +250,6 @@ }, "athena_unittests", "gcm_unit_tests", - "skia_unittests", { "test": "interactive_ui_tests", "swarming": { diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index 68fb55b..0db9d9c 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -32,7 +32,6 @@ "printing_unittests", "remoting_unittests", "sandbox_linux_unittests", - "skia_unittests", "ui_base_unittests", "ui_touch_selection_unittests", "ipc_tests", @@ -99,7 +98,6 @@ "printing_unittests", "remoting_unittests", "sandbox_linux_unittests", - "skia_unittests", "ui_base_unittests", "ui_touch_selection_unittests", "ipc_tests", @@ -166,7 +164,6 @@ "printing_unittests", "remoting_unittests", "sandbox_linux_unittests", - "skia_unittests", "ui_base_unittests", "ui_touch_selection_unittests", "ipc_tests", @@ -233,7 +230,6 @@ "printing_unittests", "remoting_unittests", "sandbox_linux_unittests", - "skia_unittests", "ui_base_unittests", "ui_touch_selection_unittests", "ipc_tests", @@ -309,7 +305,6 @@ "printing_unittests", "remoting_unittests", "sandbox_mac_unittests", - "skia_unittests", "sql_unittests", "sync_integration_tests", "sync_unit_tests", diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index 3c05ad7..7e97897 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -122,8 +122,7 @@ }, "url_unittests", "views_unittests", - "wm_unittests", - "skia_unittests" + "wm_unittests" ], "scripts": [ { @@ -263,8 +262,7 @@ }, "url_unittests", "views_unittests", - "wm_unittests", - "skia_unittests" + "wm_unittests" ], "scripts": [ { @@ -400,8 +398,7 @@ }, "url_unittests", "views_unittests", - "wm_unittests", - "skia_unittests" + "wm_unittests" ], "scripts": [ { @@ -443,8 +440,7 @@ "sql_unittests", "sync_unit_tests", "ui_base_unittests", - "unit_tests", - "skia_unittests" + "unit_tests" ] } } diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index cfc0a2a..c74cd86 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -105,8 +105,7 @@ "can_use_on_swarming_builders": true } }, - "url_unittests", - "skia_unittests" + "url_unittests" ], "scripts": [ { @@ -229,8 +228,7 @@ "can_use_on_swarming_builders": true } }, - "url_unittests", - "skia_unittests" + "url_unittests" ], "scripts": [ { @@ -353,8 +351,7 @@ "can_use_on_swarming_builders": true } }, - "url_unittests", - "skia_unittests" + "url_unittests" ], "scripts": [ { @@ -478,8 +475,7 @@ "can_use_on_swarming_builders": true } }, - "url_unittests", - "skia_unittests" + "url_unittests" ], "scripts": [ { diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json index 04b74f6..3852f7a 100644 --- a/testing/buildbot/chromium.memory.fyi.json +++ b/testing/buildbot/chromium.memory.fyi.json @@ -40,7 +40,6 @@ "printing_unittests", "remoting_unittests", "sandbox_linux_unittests", - "skia_unittests", "sql_unittests", "sync_unit_tests", "ui_base_unittests", @@ -107,7 +106,6 @@ "printing_unittests", "remoting_unittests", "sandbox_linux_unittests", - "skia_unittests", "sql_unittests", "sync_unit_tests", "ui_base_unittests", diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json index 296c0a7..40583de 100644 --- a/testing/buildbot/chromium.memory.json +++ b/testing/buildbot/chromium.memory.json @@ -60,7 +60,6 @@ "printing_unittests", "remoting_unittests", "sandbox_linux_unittests", - "skia_unittests", "sql_unittests", "sync_unit_tests", "ui_base_unittests", @@ -210,7 +209,6 @@ "ppapi_unittests", "printing_unittests", "remoting_unittests", - "skia_unittests", "sql_unittests", "sync_unit_tests", "ui_base_unittests", @@ -296,7 +294,6 @@ "printing_unittests", "remoting_unittests", "sandbox_linux_unittests", - "skia_unittests", "sql_unittests", "sync_unit_tests", { diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json index 47f4c49..145df59 100644 --- a/testing/buildbot/chromium.webkit.json +++ b/testing/buildbot/chromium.webkit.json @@ -86,8 +86,7 @@ "athena_unittests", "app_shell_browsertests", "app_shell_unittests", - "chromevox_tests", - "skia_unittests" + "chromevox_tests" ] }, "Linux ChromiumOS Tests (2)": { @@ -175,7 +174,6 @@ }, "athena_unittests", "gcm_unit_tests", - "skia_unittests", { "test": "interactive_ui_tests", "swarming": { diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index a138a36..c7ae0d4 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -86,8 +86,7 @@ "ui_touch_selection_unittests", "url_unittests", "views_unittests", - "wm_unittests", - "skia_unittests" + "wm_unittests" ], "scripts": [ { @@ -197,8 +196,7 @@ "ui_touch_selection_unittests", "url_unittests", "views_unittests", - "wm_unittests", - "skia_unittests" + "wm_unittests" ], "scripts": [ { @@ -316,8 +314,7 @@ }, "url_unittests", "views_unittests", - "wm_unittests", - "skia_unittests" + "wm_unittests" ], "scripts": [ { @@ -439,8 +436,7 @@ }, "url_unittests", "views_unittests", - "wm_unittests", - "skia_unittests" + "wm_unittests" ], "scripts": [ { @@ -556,8 +552,7 @@ }, "url_unittests", "views_unittests", - "wm_unittests", - "skia_unittests" + "wm_unittests" ], "scripts": [ { diff --git a/testing/buildbot/chromium_memory_trybot.json b/testing/buildbot/chromium_memory_trybot.json index 2b8564e..357735f 100644 --- a/testing/buildbot/chromium_memory_trybot.json +++ b/testing/buildbot/chromium_memory_trybot.json @@ -63,7 +63,6 @@ "test": "sandbox_linux_unittests", "platforms": ["linux"] }, - "skia_unittests", "sql_unittests", "sync_unit_tests", "ui_base_unittests", diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json index cdf0ea1..edfcad2 100644 --- a/testing/buildbot/chromium_trybot.json +++ b/testing/buildbot/chromium_trybot.json @@ -211,7 +211,6 @@ ] }, "url_unittests", - "skia_unittests", { "test": "wm_unittests", "platforms": ["linux", "win"] diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index 40ef7ba..eef3175 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -446,9 +446,6 @@ class ChromeTests: "--ui-test-action-timeout=60000", "--ui-test-action-max-timeout=150000"]) - def TestSkia(self): - return self.SimpleTest("skia", "skia_unittests") - def TestSql(self): return self.SimpleTest("chrome", "sql_unittests") @@ -709,7 +706,6 @@ class ChromeTests: "remoting": TestRemoting, "remoting_unittests": TestRemoting, "safe_browsing": TestSafeBrowsing, "safe_browsing_tests": TestSafeBrowsing, "sandbox": TestLinuxSandbox, "sandbox_linux_unittests": TestLinuxSandbox, - "skia": TestSkia, "skia_unittests": TestSkia, "sql": TestSql, "sql_unittests": TestSql, "sync": TestSync, "sync_unit_tests": TestSync, "sync_integration_tests": TestSyncIntegration, |