Fixes for nacl_debugger's use of picture.

platform_tools/nacl/src/nacl_debugger.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 "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/graphics_2d.h"
@@ skipping 19 matching lines @@
 SkiaInstance* gPluginInstance;
 
 void FlushCallback(void* data, int32_t result);
 
 // Skia's subclass of pp::Instance, our interface with the browser.
 class SkiaInstance : public pp::Instance {
 public:
     explicit SkiaInstance(PP_Instance instance)
         : pp::Instance(instance)
         , fCanvas(NULL)
-        , fPicture(NULL)
         , fFlushLoopRunning(false)
         , fFlushPending(false)
 
     {
         gPluginInstance = this;
         SkGraphics::Init();
     }
 
     virtual ~SkiaInstance() {
         SkGraphics::Term();
@@ skipping 10 matching lines @@
                 size_t dataSize = msg.size()/sizeof(char) - startIndex;
                 SkBase64 decodedData;
                 decodedData.decode(msg.c_str() + startIndex, dataSize);
                 size_t decodedSize = 3 * (dataSize / 4);
                 SkDebugf("Got size: %d\n", decodedSize);
                 if (!decodedData.getData()) {
                     SkDebugf("Failed to decode SKP\n");
                     return;
                 }
                 SkMemoryStream pictureStream(decodedData.getData(), decodedSize);
-                fPicture = SkPicture::CreateFromStream(&pictureStream);
-                if (fPicture->width() == 0 || fPicture->height() == 0) {
+                SkPicture* picture = SkPicture::CreateFromStream(&pictureStream);
+                if (NULL == picture) {
                     SkDebugf("Failed to create SKP.\n");
                     return;
                 }
-                fDebugger.loadPicture(fPicture);
+                fDebugger.loadPicture(picture);
+                picture->unref();
 
                 // Set up the command list.
                 SkTArray<SkString>* commands = fDebugger.getDrawCommandsAsStrings();
                 PostMessage("ClearCommands");
                 for (int i = 0; i < commands->count(); ++i) {
                     SkString addCommand("AddCommand:");
                     addCommand.append((*commands)[i]);
                     PostMessage(addCommand.c_str());
                 }
                 PostMessage("UpdateCommands");
@@ skipping 100 matching lines @@
 
 private:
     pp::Graphics2D fDeviceContext;
     pp::ImageData fImage;
     int fWidth;
     int fHeight;
 
     SkBitmap fBitmap;
     SkCanvas* fCanvas;
     SkDebugger fDebugger;
-    SkPicture* fPicture;
 
     bool fFlushLoopRunning;
     bool fFlushPending;
 };
 
 void FlushCallback(void* data, int32_t result) {
     static_cast<SkiaInstance*>(data)->OnFlush();
 }
 
 class SkiaModule : public pp::Module {
 public:
     SkiaModule() : pp::Module() {}
     virtual ~SkiaModule() {}
 
     virtual pp::Instance* CreateInstance(PP_Instance instance) {
         return new SkiaInstance(instance);
     }
 };
 
 namespace pp {
 Module* CreateModule() {
     return new SkiaModule();
 }
 }  // namespace pp