| Index: skia/ext/platform_canvas_unittest.cc
|
| diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc
|
| index 9ab5667127b36605e639cc1dbb4468a416db1c65..3b39b4477a185acc56b0fff4f0e800a8c3f44c08 100644
|
| --- a/skia/ext/platform_canvas_unittest.cc
|
| +++ b/skia/ext/platform_canvas_unittest.cc
|
| @@ -4,25 +4,24 @@
|
|
|
| // TODO(awalker): clean up the const/non-const reference handling in this test
|
|
|
| +#include "build/build_config.h"
|
| +
|
| +#if defined(OS_MACOSX)
|
| +#import <ApplicationServices/ApplicationServices.h>
|
| +#endif
|
| +
|
| +#if !defined(OS_WIN)
|
| +#include <unistd.h>
|
| +#endif
|
| +
|
| +#include "base/memory/scoped_ptr.h"
|
| #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>
|
| -#endif
|
| -
|
| -#if !defined(OS_WIN)
|
| -#include <unistd.h>
|
| -#endif
|
|
|
| namespace skia {
|
|
|
| @@ -68,12 +67,8 @@
|
| // 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 @@
|
| }
|
| #else
|
| void DrawNativeRect(PlatformCanvas& canvas, int x, int y, int w, int h) {
|
| - NOTIMPLEMENTED();
|
| + notImplemented();
|
| }
|
| #endif
|
|
|
|
|