Revert of setConfig -> setInfo

src/views/sdl/SkOSWindow_SDL.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 "SkOSWindow_SDL.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkGLCanvas.h"
 #include "SkOSMenu.h"
 #include "SkTime.h"
 
 static void post_SkEvent_event() {
     SDL_Event evt;
     evt.type = SDL_USEREVENT;
     evt.user.type = SDL_USEREVENT;
     evt.user.code = 0;
     evt.user.data1 = NULL;
     evt.user.data2 = NULL;
     SDL_PushEvent(&evt);
 }
 
 static bool skia_setBitmapFromSurface(SkBitmap* dst, SDL_Surface* src) {
-    SkColorType ct;
-    SkAlphaType at;
+    SkBitmap::Config config;
 
     switch (src->format->BytesPerPixel) {
         case 2:
-            ct = kRGB_565_SkColorType;
-            at = kOpaque_SkAlphaType;
+            config = SkBitmap::kRGB_565_Config;
             break;
         case 4:
-            ct = kN32_SkColorType;
-            at = kPremul_SkAlphaType;
+            config = SkBitmap::kARGB_8888_Config;
             break;
         default:
             return false;
     }
 
-    return dst->installPixels(SkImageInfo::Make(src->w, src->h, ct, at), src->pixels, src->pitch);
+    dst->setConfig(config, src->w, src->h, src->pitch);
+    dst->setPixels(src->pixels);
+    return true;
 }
 
 SkOSWindow::SkOSWindow(void* screen) {
     fScreen = reinterpret_cast<SDL_Surface*>(screen);
     this->resize(fScreen->w, fScreen->h);
 
     uint32_t rmask = SK_R32_MASK << SK_R32_SHIFT;
     uint32_t gmask = SK_G32_MASK << SK_G32_SHIFT;
     uint32_t bmask = SK_B32_MASK << SK_B32_SHIFT;
     uint32_t amask = SK_A32_MASK << SK_A32_SHIFT;
@@ skipping 165 matching lines @@
     return 0;
 }
 
 void SkEvent::SignalQueueTimer(SkMSec delay)
 {
     SDL_SetTimer(0, NULL);
     if (delay) {
         SDL_SetTimer(delay, timer_callback);
     }
 }