commit 9d08172828c2119752bc5bceeb1084c02ce7ab33
author scroggo <scroggo@google.com> Wed Apr 20 08:27:18 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Apr 20 08:27:18 2016 -0700
tree a6394b690777f09f27836f7f46c874c46418d8cc
parent 09aa1fce69b214714171db12c341aebd78dd29ea

Add instructions for building with MSAN

Move static functions only used by GPU into if SK_SUPPORT_GPU guard.
This enables building MSAN, which seems to default to not supporting
GPU.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1908493002
DOCS_PREVIEW= https://skia.org/?cl=1908493002

Review URL: https://codereview.chromium.org/1908493002

site/user/special/msan.md

diff --git a/site/user/special/msan.md b/site/user/special/msan.md
new file mode 100644
index 0000000..c4fce78
--- /dev/null
+++ b/site/user/special/msan.md
@@ -0,0 +1,19 @@
+Running with Memory Sanitizer
+=============================
+
+Prerequisites
+-------------
+
+The msan build builds Clang from scratch, so you need to download Clang first:
+
+    bin/sync-and-gyp --deps=llvm
+
+Build
+-----
+
+    tools/xsan_build memory dm
+
+Run
+---
+
+    out/Debug/dm -v --match ~Codec ~BlurLargeImage ~FontMgrAndroidParser

tests/ImageTest.cpp

diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index c4d6e12..9cba74e 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -67,6 +67,25 @@
     draw_image_test_pattern(surface->getCanvas());
     return surface->makeImageSnapshot();
 }
+
+static SkData* create_image_data(SkImageInfo* info) {
+    *info = SkImageInfo::MakeN32(20, 20, kOpaque_SkAlphaType);
+    const size_t rowBytes = info->minRowBytes();
+    SkAutoTUnref<SkData> data(SkData::NewUninitialized(rowBytes * info->height()));
+    {
+        SkBitmap bm;
+        bm.installPixels(*info, data->writable_data(), rowBytes);
+        SkCanvas canvas(bm);
+        draw_image_test_pattern(&canvas);
+    }
+    return data.release();
+}
+static sk_sp<SkImage> create_data_image() {
+    SkImageInfo info;
+    sk_sp<SkData> data(create_image_data(&info));
+    return SkImage::MakeRasterData(info, data, info.minRowBytes());
+}
+#if SK_SUPPORT_GPU // not gpu-specific but currently only used in GPU tests
 static sk_sp<SkImage> create_image_565() {
     const SkImageInfo info = SkImageInfo::Make(20, 20, kRGB_565_SkColorType, kOpaque_SkAlphaType);
     auto surface(SkSurface::MakeRaster(info));
@@ -90,24 +109,6 @@
     SkImageInfo info = SkImageInfo::Make(5, 5, kIndex_8_SkColorType, kPremul_SkAlphaType);
     return SkImage::MakeRasterCopy(SkPixmap(info, data, 5, colorTable));
 }
-static SkData* create_image_data(SkImageInfo* info) {
-    *info = SkImageInfo::MakeN32(20, 20, kOpaque_SkAlphaType);
-    const size_t rowBytes = info->minRowBytes();
-    SkAutoTUnref<SkData> data(SkData::NewUninitialized(rowBytes * info->height()));
-    {
-        SkBitmap bm;
-        bm.installPixels(*info, data->writable_data(), rowBytes);
-        SkCanvas canvas(bm);
-        draw_image_test_pattern(&canvas);
-    }
-    return data.release();
-}
-static sk_sp<SkImage> create_data_image() {
-    SkImageInfo info;
-    sk_sp<SkData> data(create_image_data(&info));
-    return SkImage::MakeRasterData(info, data, info.minRowBytes());
-}
-#if SK_SUPPORT_GPU // not gpu-specific but currently only used in GPU tests
 static sk_sp<SkImage> create_picture_image() {
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(10, 10);