SampleApp: Remove SkWindow::setColorType

src/views/SkWindow.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkWindow.h"
 #include "SkCanvas.h"
 #include "SkOSMenu.h"
 #include "SkSurface.h"
 #include "SkSystemEventTypes.h"
 #include "SkTime.h"
 
 #define SK_EventDelayInval "\xd" "n" "\xa" "l"
 
 SkWindow::SkWindow()
     : fSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType)
     , fFocusView(nullptr)
 {
     fClicks.reset();
     fWaitingOnInval = false;
-    fColorType = kN32_SkColorType;
     fMatrix.reset();
 }
 
 SkWindow::~SkWindow() {
     fClicks.deleteAll();
     fMenus.deleteAll();
 }
 
 SkSurface* SkWindow::createSurface() {
     const SkBitmap& bm = this->getBitmap();
@@ skipping 12 matching lines @@
     m.setConcat(fMatrix, matrix);
     this->setMatrix(m);
 }
 
 void SkWindow::postConcat(const SkMatrix& matrix) {
     SkMatrix m;
     m.setConcat(matrix, fMatrix);
     this->setMatrix(m);
 }
 
-void SkWindow::setColorType(SkColorType ct) {
-    this->resize(fBitmap.width(), fBitmap.height(), ct);
-}
-
-void SkWindow::resize(int width, int height, SkColorType ct) {
-    if (ct == kUnknown_SkColorType)
-        ct = fColorType;
-
-    if (width != fBitmap.width() || height != fBitmap.height() || ct != fColorType) {
-        fColorType = ct;
-        fBitmap.allocPixels(SkImageInfo::Make(width, height,
-                                              ct, kPremul_SkAlphaType));
-
-        this->setSize(SkIntToScalar(width), SkIntToScalar(height));
+void SkWindow::resize(int width, int height) {
+    if (width != fBitmap.width() || height != fBitmap.height()) {
+        fBitmap.allocPixels(SkImageInfo::Make(width, height, kN32_SkColorType,
+                                              kPremul_SkAlphaType));
         this->inval(nullptr);
     }
+    this->setSize(SkIntToScalar(width), SkIntToScalar(height));
 }
 
 bool SkWindow::handleInval(const SkRect* localR) {
     SkIRect ir;
 
     if (localR) {
         SkRect devR;
         SkMatrix inverse;
         if (!fMatrix.invert(&inverse)) {
             return false;
@@ skipping 248 matching lines @@
     desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
     desc.fSampleCnt = attachmentInfo.fSampleCount;
     desc.fStencilBits = attachmentInfo.fStencilBits;
     GrGLint buffer;
     GR_GL_GetIntegerv(interface, GR_GL_FRAMEBUFFER_BINDING, &buffer);
     desc.fRenderTargetHandle = buffer;
     return grContext->textureProvider()->wrapBackendRenderTarget(desc);
 }
 
 #endif