Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / dm / DMGpuGMTask.cpp

diff --git a/src/third_party/skia/dm/DMGpuGMTask.cpp b/src/third_party/skia/dm/DMGpuGMTask.cpp
index 4c44fae..65d65d9 100644 (file)
--- a/src/third_party/skia/dm/DMGpuGMTask.cpp
+++ b/src/third_party/skia/dm/DMGpuGMTask.cpp
@@ -1,6 +1,4 @@
 #include "DMGpuGMTask.h"
-
-#include "DMExpectationsTask.h"
 #include "DMUtil.h"
 #include "DMWriteTask.h"
 #include "SkCommandLineFlags.h"
@@ -13,14 +11,12 @@ GpuGMTask::GpuGMTask(const char* config,
                      Reporter* reporter,
                      TaskRunner* taskRunner,
                      skiagm::GMRegistry::Factory gmFactory,
-                     const Expectations& expectations,
                      GrContextFactory::GLContextType contextType,
                      GrGLStandard gpuAPI,
                      int sampleCount)
     : GpuTask(reporter, taskRunner)
     , fGM(gmFactory(NULL))
     , fName(UnderJoin(fGM->getName(), config))
-    , fExpectations(expectations)
     , fContextType(contextType)
     , fGpuAPI(gpuAPI)
     , fSampleCount(sampleCount)
@@ -38,6 +34,7 @@ void GpuGMTask::draw(GrContextFactory* grFactory) {
         return;
     }
     SkCanvas* canvas = surface->getCanvas();
+    CanvasPreflight(canvas);
 
     canvas->concat(fGM->getInitialTransform());
     fGM->draw(canvas);
@@ -47,8 +44,7 @@ void GpuGMTask::draw(GrContextFactory* grFactory) {
     bitmap.setInfo(info);
     canvas->readPixels(&bitmap, 0, 0);
 
-    this->spawnChild(SkNEW_ARGS(ExpectationsTask, (*this, fExpectations, bitmap)));
-    this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));
+    this->spawnChild(SkNEW_ARGS(WriteTask, (*this, "GM", bitmap)));
 }
 
 bool GpuGMTask::shouldSkip() const {