removed dead colortable code

Bug: skia:6828
Change-Id: I2d3b3b7c846d3ac08bbcb9357cb644873fe5a286
Reviewed-on: https://skia-review.googlesource.com/24623
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 4877d64e46..e96e968fbf 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -233,11 +233,7 @@ bool SkBitmap::tryAllocPixels(Allocator* allocator) {
     if (nullptr == allocator) {
         allocator = &stdalloc;
     }
-#ifdef SK_SUPPORT_LEGACY_COLORTABLE
-    return allocator->allocPixelRef(this, nullptr);
-#else
     return allocator->allocPixelRef(this);
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -358,11 +354,7 @@ void SkBitmap::notifyPixelsChanged() const {
 /** We explicitly use the same allocator for our pixels that SkMask does,
  so that we can freely assign memory allocated by one class to the other.
  */
-bool SkBitmap::HeapAllocator::allocPixelRef(SkBitmap* dst
-#ifdef SK_SUPPORT_LEGACY_COLORTABLE
-                                            , SkColorTable*
-#endif
-                                            ) {
+bool SkBitmap::HeapAllocator::allocPixelRef(SkBitmap* dst) {
     const SkImageInfo info = dst->info();
     if (kUnknown_SkColorType == info.colorType()) {
 //        SkDebugf("unsupported config for info %d\n", dst->config());