Update debugger to use SkPixmap

debugger/QT/SkDrawCommandGeometryWidget.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <QtGui>
 
@@ skipping 23 matching lines @@
 void SkDrawCommandGeometryWidget::paintEvent(QPaintEvent* event) {
     this->QFrame::paintEvent(event);
 
     if (!fSurface) {
         return;
     }
 
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing);
 
-    SkImageInfo info;
-    size_t rowBytes;
-    if (const void* pixels = fSurface->peekPixels(&info, &rowBytes)) {
-        SkASSERT(info.width() > 0);
-        SkASSERT(info.height() > 0);
+    SkPixmap pixmap;
+
+    if (fSurface->peekPixels(&pixmap)) {
+        SkASSERT(pixmap.width() > 0);
+        SkASSERT(pixmap.height() > 0);
 
         QRectF resultRect;
         if (this->width() < this->height()) {
-            float ratio = this->width() / info.width();
-            resultRect = QRectF(0, 0, this->width(), ratio * info.height());
+            float ratio = this->width() / pixmap.width();
+            resultRect = QRectF(0, 0, this->width(), ratio * pixmap.height());
         } else {
-            float ratio = this->height() / info.height();
-            resultRect = QRectF(0, 0, ratio * info.width(), this->height());
+            float ratio = this->height() / pixmap.height();
+            resultRect = QRectF(0, 0, ratio * pixmap.width(), this->height());
         }
 
         resultRect.moveCenter(this->contentsRect().center());
 
-        QImage image(reinterpret_cast<const uchar*>(pixels),
-                     info.width(),
-                     info.height(),
-                     rowBytes,
+        QImage image(reinterpret_cast<const uchar*>(pixmap.addr()),
+                     pixmap.width(),
+                     pixmap.height(),
+                     pixmap.rowBytes(),
                      QImage::Format_ARGB32_Premultiplied);
         painter.drawImage(resultRect, image);
     }
 }
 
 void SkDrawCommandGeometryWidget::setDrawCommandIndex(int commandIndex) {
     fCommandIndex = commandIndex;
     this->updateImage();
 }
 
@@ skipping 10 matching lines @@
         didRender = command->render(fSurface->getCanvas());
     }
 
     if (!didRender) {
         fSurface->getCanvas()->clear(SK_ColorTRANSPARENT);
     }
 
     fSurface->getCanvas()->flush();
     this->update();
 }