Remove opaque versions of Color32_D565

src/core/SkBlitRow_D16.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 "SkBlitRow.h"
 #include "SkColorPriv.h"
 #include "SkDither.h"
@@ skipping 237 matching lines @@
 
     SkBlitRow::Proc16 proc = PlatformFactory565(flags);
     if (NULL == proc) {
         proc = gDefault_565_Procs[flags];
     }
     return proc;
 }
 
 static const SkBlitRow::ColorProc16 gDefault_565_ColorProcs[] = {
 #if 0
-    Color32_D565,
     Color32A_D565,
-    Color32_D565_Dither,
     Color32A_D565_Dither
 #else
-    // TODO: stop cheating and fill in the above specializations!
-    Color32A_D565,
-    Color32A_D565,
+    // TODO: stop cheating and fill dither from the above specializations!
     Color32A_D565,
     Color32A_D565,
 #endif
 };
 
 SkBlitRow::ColorProc16 SkBlitRow::ColorFactory16(unsigned flags) {
     SkASSERT((flags & ~kFlags16_Mask) == 0);
     // just so we don't crash
     flags &= kFlags16_Mask;
-    // we ignore kGlobalAlpha_Flag, so shift down
-    flags >>= 1;
+    // we ignore both kGlobalAlpha_Flag and kSrcPixelAlpha_Flag, so shift down
+    // since this factory is only used for transparent source alphas
+    flags >>= 2;
 
     SkASSERT(flags < SK_ARRAY_COUNT(gDefault_565_ColorProcs));
 
     SkBlitRow::ColorProc16 proc = PlatformColorFactory565(flags);
     if (NULL == proc) {
         proc = gDefault_565_ColorProcs[flags];
     }
     return proc;
 }