Update debugger to use SkPixmap

debugger/QT/SkRasterWidget.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 "SkRasterWidget.h"
 #include "SkDebugger.h"
@@ skipping 30 matching lines @@
         return;
     }
 
     if (fNeedImageUpdate) {
         fDebugger->draw(fSurface->getCanvas());
         fSurface->getCanvas()->flush();
         fNeedImageUpdate = false;
         Q_EMIT drawComplete();
     }
 
-    SkImageInfo info;
-    size_t rowBytes;
-    if (const void* pixels = fSurface->peekPixels(&info, &rowBytes)) {
-        QImage image(reinterpret_cast<const uchar*>(pixels),
-                     info.width(),
-                     info.height(),
-                     rowBytes,
+    SkPixmap pixmap;
+
+    if (fSurface->peekPixels(&pixmap)) {
+        QImage image(reinterpret_cast<const uchar*>(pixmap.addr()),
+                     pixmap.width(),
+                     pixmap.height(),
+                     pixmap.rowBytes(),
                      QImage::Format_ARGB32_Premultiplied);
 #if SK_R32_SHIFT == 0
         painter.drawImage(this->contentsRect(), image.rgbSwapped());
 #else
         painter.drawImage(this->contentsRect(), image);
 #endif
     }
 }
 
 void SkRasterWidget::updateImage() {
     if (!fSurface) {
         return;
     }
     fNeedImageUpdate = true;
     this->update();
 }