NaCl Debugger: Implement overview and filters, cleanup

nacl/src/nacl_debugger.cpp

-#include <cstdio>
-#include <string>
+
+/*
+ * 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"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/point.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/var.h"
 
@@ skipping 11 matching lines @@
 // Used by SkDebugf
 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)
-        , fBitmap()
         , fCanvas(NULL)
-        , fDebugger()
-        , fImage()
+        , fPicture(NULL)
         , fFlushLoopRunning(false)
         , fFlushPending(false)
-        , fPicture(NULL)
+
     {
         gPluginInstance = this;
         SkGraphics::Init();
     }
 
     virtual ~SkiaInstance() {
         SkGraphics::Term();
         gPluginInstance = NULL;
     }
 
@@ skipping 13 matching lines @@
                     SkDebugf("Failed to decode SKP\n");
                     return;
                 }
                 SkMemoryStream pictureStream(decodedData.getData(), decodedSize);
                 fPicture = new SkPicture(&pictureStream);
                 if (fPicture->width() == 0 || fPicture->height() == 0) {
                     SkDebugf("Failed to create SKP.\n");
                     return;
                 }
                 fDebugger.loadPicture(fPicture);
+
+                // Set up the command list.
                 SkTArray<SkString>* commands = fDebugger.getDrawCommandsAsStrings();
                 PostMessage("ClearCommands");
                 for (int i = 0; i < commands->count(); ++i) {
-                    SkString message("AddCommand:");
-                    message.append((*commands)[i]);
-                    PostMessage(message.c_str());
+                    SkString addCommand("AddCommand:");
+                    addCommand.append((*commands)[i]);
+                    PostMessage(addCommand.c_str());
                 }
+                PostMessage("UpdateCommands");
+
+                // Set the overview text.
+                SkString overviewText;
+                fDebugger.getOverviewText(NULL, 0.0, &overviewText);
+                overviewText.prepend("SetOverview:");
+                PostMessage(overviewText.c_str());
+
+                // Draw the SKP.
                 if (!fFlushLoopRunning) {
                     Paint();
                 }
             } else if (msg.startsWith("CommandSelected:")) {
                 size_t startIndex = strlen("CommandSelected:");
                 int index = atoi(msg.c_str() + startIndex);
                 fDebugger.setIndex(index);
                 if (!fFlushLoopRunning) {
                     Paint();
                 }
@@ skipping 107 matching lines @@
     virtual pp::Instance* CreateInstance(PP_Instance instance) {
         return new SkiaInstance(instance);
     }
 };
 
 namespace pp {
 Module* CreateModule() {
     return new SkiaModule();
 }
 }  // namespace pp