Make SkDrawCommands lighter weight

debugger/QT/SkImageWidget.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <QtGui>
 
 #include "SkDebugger.h"
 #include "SkImageWidget.h"
 
 SkImageWidget::SkImageWidget(SkDebugger *debugger)
     : QWidget()
     , fDebugger(debugger) {
     this->setStyleSheet("QWidget {background-color: white; border: 1px solid #cccccc;}");
+

[jvanverth1, 2013/06/05 21:48:02]

Why not declare fPixels as char fPixels[4*kImageWidgetWidth*kImageWidgetHeight]?
Then you don't need to delete it in the destructor.

[robertphillips, 2013/06/05 22:00:12]

Done.

+    int rowBytes = kImageWidgetWidth * 4;
+    fPixels = new char[kImageWidgetHeight * rowBytes];
+
+    SkImage::Info info;
+    info.fWidth = kImageWidgetWidth;
+    info.fHeight = kImageWidgetHeight;
+    info.fColorType = SkImage::kPMColor_ColorType;
+    info.fAlphaType = SkImage::kPremul_AlphaType;
+
+    fSurface = SkSurface::NewRasterDirect(info, fPixels, rowBytes);
 }
 
 void SkImageWidget::paintEvent(QPaintEvent* event) {
     if (this->isHidden()) {
         return;
     }
 
     QPainter painter(this);
     QStyleOption opt;
     opt.init(this);
 
     style()->drawPrimitive(QStyle::PE_Widget, &opt, &painter, this);
 
     const SkTDArray<SkDrawCommand*>& commands = fDebugger->getDrawCommands();
     if (0 != commands.count()) {
         SkDrawCommand* command = commands[fDebugger->index()];
 
-        const SkBitmap* bitmap = command->getBitmap();
-
-        if (NULL != bitmap) {
-            bitmap->lockPixels();
-
+        if (command->render(fSurface->getCanvas())) {
             QPoint origin(0,0);
-            QImage image((uchar *)bitmap->getPixels(), bitmap->width(),
-                    bitmap->height(), QImage::Format_ARGB32_Premultiplied);
+            QImage image((uchar*) fPixels, 
+                         kImageWidgetWidth,
+                         kImageWidgetHeight, 
+                         QImage::Format_ARGB32_Premultiplied);
 
             painter.drawImage(origin, image);
-
-            bitmap->unlockPixels();
         } else {
             painter.drawRect(0, 0, kImageWidgetWidth, kImageWidgetHeight);
         }
     }
 
     painter.end();
     emit drawComplete();
 }