Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1842)

Unified Diff: cc/resources/etc1_pixel_ref.cc

Issue 138393002: replace etc1_pixel_ref with skia version (SkMallocPixelRef) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/etc1_pixel_ref.h ('k') | cc/resources/ui_resource_bitmap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/etc1_pixel_ref.cc
diff --git a/cc/resources/etc1_pixel_ref.cc b/cc/resources/etc1_pixel_ref.cc
deleted file mode 100644
index 038e6c8c456fbdd3c74b18afa79f0d02c6f4d7a6..0000000000000000000000000000000000000000
--- a/cc/resources/etc1_pixel_ref.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "cc/resources/etc1_pixel_ref.h"
-
-#include "base/memory/scoped_ptr.h"
-#include "third_party/skia/include/core/SkPixelRef.h"
-
-namespace cc {
-
-// Takes ownership of pixels.
-ETC1PixelRef::ETC1PixelRef(const SkImageInfo& info,
- size_t rowBytes,
- scoped_ptr<uint8_t[]> pixels)
- : SkPixelRef(info), rowBytes_(rowBytes), pixels_(pixels.Pass()) {
- setImmutable();
-}
-
-ETC1PixelRef::~ETC1PixelRef() {}
-
-#ifdef SK_SUPPORT_LEGACY_ONLOCKPIXELS
-void* ETC1PixelRef::onLockPixels(SkColorTable** color_table) {
- *color_table = NULL;
- return static_cast<void*>(pixels_.get());
-}
-#endif
-
-bool ETC1PixelRef::onNewLockPixels(LockRec* rec) {
- if (pixels_.get()) {
- rec->fPixels = pixels_.get();
- rec->fColorTable = NULL;
- rec->fRowBytes = rowBytes_;
- return true;
- }
- return false;
-}
-
-void ETC1PixelRef::onUnlockPixels() {}
-
-SkFlattenable::Factory ETC1PixelRef::getFactory() const { return NULL; }
-
-} // namespace cc
« no previous file with comments | « cc/resources/etc1_pixel_ref.h ('k') | cc/resources/ui_resource_bitmap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698