move SkImage::ColorType into SkColorType

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;}");
 
-    SkImage::Info info;
+    SkImageInfo info;
     info.fWidth = kImageWidgetWidth;
     info.fHeight = kImageWidgetHeight;
-    info.fColorType = SkImage::kPMColor_ColorType;
+    info.fColorType = kPMColor_SkColorType;
     info.fAlphaType = kPremul_SkAlphaType;
 
     fSurface = SkSurface::NewRasterDirect(info, fPixels, 4 * kImageWidgetWidth);
 }
 
 void SkImageWidget::paintEvent(QPaintEvent* event) {
     if (this->isHidden()) {
         return;
     }
 
@@ skipping 16 matching lines @@
 
             painter.drawImage(origin, image);
         } else {
             painter.drawRect(0, 0, kImageWidgetWidth, kImageWidgetHeight);
         }
     }
 
     painter.end();
     emit drawComplete();
 }