Move SkV8Example to SkSurface

experimental/SkV8Example/SkV8Example.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 #include <v8.h>
 
 using namespace v8;
 
 #include "SkV8Example.h"
 #include "Global.h"
 #include "JsContext.h"
 #include "Path.h"
 
 #include "gl/GrGLUtil.h"
 #include "gl/GrGLDefines.h"
 #include "gl/GrGLInterface.h"
 #include "GrRenderTarget.h"
 #include "GrContext.h"
 #include "SkApplication.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
 #include "SkDraw.h"
 #include "SkGpuDevice.h"
 #include "SkGraphics.h"

[robertphillips, 2014/02/26 23:51:08]

Is this #include for the kBGRA_8888_SkColorType definition?

[jcgregorio, 2014/02/27 14:23:16]

I added it for that reason, looks like it isn't needed. Dropped.

+#include "SkImageInfo.h"
 #include "SkScalar.h"
+#include "SkSurface.h"
 
 
 DEFINE_string2(infile, i, NULL, "Name of file to load JS from.\n");
 DEFINE_bool(gpu, true, "Use the GPU for rendering.");
 
 void application_init() {
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }
 
 SkV8ExampleWindow::SkV8ExampleWindow(void* hwnd, JsContext* context)
     : INHERITED(hwnd)
     , fJsContext(context)
 #if SK_SUPPORT_GPU
     , fCurContext(NULL)
     , fCurIntf(NULL)
     , fCurRenderTarget(NULL)
+    , fCurSurface(NULL)
 #endif
 {
-    this->setConfig(SkBitmap::kARGB_8888_Config);
+    this->setColorType(kBGRA_8888_SkColorType);
     this->setVisibleP(true);
     this->setClipToBounds(false);
 
 #if SK_SUPPORT_GPU
     this->windowSizeChanged();
 #endif
 }
 
 #if SK_SUPPORT_GPU
 void SkV8ExampleWindow::windowSizeChanged() {
@@ skipping 20 matching lines @@
         desc.fConfig = kSkia8888_GrPixelConfig;
         desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
         desc.fSampleCnt = attachmentInfo.fSampleCount;
         desc.fStencilBits = attachmentInfo.fStencilBits;
         GrGLint buffer;
         GR_GL_GetIntegerv(fCurIntf, GR_GL_FRAMEBUFFER_BINDING, &buffer);
         desc.fRenderTargetHandle = buffer;
 
         SkSafeUnref(fCurRenderTarget);
         fCurRenderTarget = fCurContext->wrapBackendRenderTarget(desc);
+        SkSafeUnref(fCurSurface);

[robertphillips, 2014/02/26 23:51:08]

Doesn't this need to get cleaned up in the destructor?

[jcgregorio, 2014/02/27 14:23:16]

Added SkSafeUnref's for all the GPU related objects in the destructor.

On 2014/02/26 23:51:08, robertphillips wrote:

+        fCurSurface = SkSurface::NewRenderTargetDirect(fCurRenderTarget);
     }
 }
 #endif
 
 #if SK_SUPPORT_GPU

[robertphillips, 2014/02/26 23:51:08]

So does the base class not support creating a GPU backend?

[jcgregorio, 2014/02/27 14:23:16]

No, the base class impl is merely new SkCanvas(this-getBitmap()).

 SkCanvas* SkV8ExampleWindow::createCanvas() {
     if (FLAGS_gpu) {
-        SkAutoTUnref<SkBaseDevice> device(
-                new SkGpuDevice(fCurContext, fCurRenderTarget));
-        return new SkCanvas(device);
+        SkCanvas* c = fCurSurface->getCanvas();

[robertphillips, 2014/02/26 23:51:08]

How isn't there an unbalanced ref problem here? Is the canvas being leaked?

[jcgregorio, 2014/02/27 14:23:16]

Yeah, I would expect that fCurSurface->getCanvas() would return a canvas with a
ref count of 2, since it is in theory maintaining a cache of the canvas. Maybe
that's where the change for the refcount should go?

+        // Increase the ref count since the surface keeps a reference
+        // to the canvas, but callers of createCanvas put the results
+        // in a SkAutoTUnref.
+        c->ref();
+        return c;
     } else {
         return this->INHERITED::createCanvas();
     }
 }
 #endif
 
 void SkV8ExampleWindow::onSizeChange() {
     this->INHERITED::onSizeChange();
 
 #if SK_SUPPORT_GPU
@@ skipping 85 matching lines @@
 
     if (!jsContext->initialize()) {
         printf("Failed to initialize.\n");
         exit(1);
     }
     SkV8ExampleWindow* win = new SkV8ExampleWindow(hwnd, jsContext);
     global->setWindow(win);
 
     return win;
 }