Fix DM build failures.

dm/DMGpuTask.cpp

Index: dm/DMGpuTask.cpp
diff --git a/dm/DMGpuTask.cpp b/dm/DMGpuTask.cpp
index 9205cb996bfa736a218eb8976803b5faee15da2b..d65e394f58565a151cdaa065e023043764857947 100644
--- a/dm/DMGpuTask.cpp
+++ b/dm/DMGpuTask.cpp
@@ -30,7 +30,7 @@ static void* new_gr_context_factory() {
 }
 
 static void delete_gr_context_factory(void* factory) {
-    return SkDELETE((GrContextFactory*) factory);
+    SkDELETE((GrContextFactory*) factory);
 }
 
 static GrContextFactory* get_gr_factory() {
@@ -40,7 +40,7 @@ static GrContextFactory* get_gr_factory() {
 
 void GpuTask::draw() {
     GrContext* gr = get_gr_factory()->get(fContextType);  // Will be owned by device.
-    SkGpuDevice device(gr, fConfig, fGM->width(), fGM->height(), fSampleCount);
+    SkGpuDevice device(gr, fConfig, (int)fGM->width(), (int)fGM->height(), fSampleCount);

[bungeman-skia, 2013/10/16 16:00:47]

SkScalerCeilToInt

     SkCanvas canvas(&device);
 
     canvas.concat(fGM->getInitialTransform());
@@ -48,7 +48,7 @@ void GpuTask::draw() {
     canvas.flush();
 
     SkBitmap bitmap;
-    bitmap.setConfig(fConfig, fGM->width(), fGM->height());
+    bitmap.setConfig(fConfig, (int)fGM->width(), (int)fGM->height());
     canvas.readPixels(&bitmap, 0, 0);
 
     // We offload checksum comparison to the main CPU threadpool.
@@ -57,7 +57,10 @@ void GpuTask::draw() {
 }
 
 bool GpuTask::shouldSkip() const {
-    return fGM->getFlags() & skiagm::GM::kSkipGPU_Flag;
+    if (fGM->getFlags() & skiagm::GM::kSkipGPU_Flag) {

[bungeman-skia, 2013/10/16 16:00:47]

SkToBool

+        return true;
+    }
+    return false;
 }
 
 }  // namespace DM