diff options
author | mek <mek@chromium.org> | 2015-01-07 09:51:35 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-07 17:52:19 +0000 |
commit | 164a39b1806a6261868bc6b2103e24b543251669 (patch) | |
tree | 77da445108e5596e6d29a88a7fad3c5b8953b06f /skia/ext | |
parent | cf6d3b1224f37cce81e88b0240fbec160758c731 (diff) | |
download | chromium_src-164a39b1806a6261868bc6b2103e24b543251669.zip chromium_src-164a39b1806a6261868bc6b2103e24b543251669.tar.gz chromium_src-164a39b1806a6261868bc6b2103e24b543251669.tar.bz2 |
Revert of skia: Add 'skia_unittests' test suite for this directory. (patchset #12 id:220001 of https://codereview.chromium.org/815023003/)
Reason for revert:
Fails linking on the Mac GN builder:
http://build.chromium.org/p/chromium.mac/builders/Mac%20GN/builds/2094
duplicate symbol __ZN3gfx27SkMatrixToCGAffineTransformERK8SkMatrix in:
obj/skia/ext/skia_unittests.skia_utils_mac_unittest.o
obj/skia/ext/skia.skia_utils_mac.o
(and more similar issues)
Original issue's description:
> skia: Add 'skia_unittests' test suite for this directory.
>
> This should be a lightweight test suite that should allow a dev changing
> something in skia/ext to test it much more quickly than having to build
> all 'unit_tests' target just to run the tests from skia/ext.
>
> BUG=444058
> TEST=skia_unittests links and runs fine.
> R=danakj@chromium.org,thakis@chromium.org
>
> Committed: https://crrev.com/c87c3d2d949f9ba4f17627dc023b303c75b7635f
> Cr-Commit-Position: refs/heads/master@{#310310}
TBR=danakj@chromium.org,thakis@chromium.org,glider@chromium.org,sky@chromium.org,tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=444058
Review URL: https://codereview.chromium.org/816803003
Cr-Commit-Position: refs/heads/master@{#310314}
Diffstat (limited to 'skia/ext')
-rw-r--r-- | skia/ext/platform_canvas_unittest.cc | 29 |
1 files changed, 12 insertions, 17 deletions
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 |