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

Side by Side Diff: src/images/SkImageRef_ashmem.h

Issue 119753010: Revert "Revert of https://codereview.chromium.org/110593003/" (Closed) Base URL: https://skia.googlecode.com/svn/trunk
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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/images/SkImageRef.cpp ('k') | src/images/SkImageRef_ashmem.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #ifndef SkImageRef_ashmem_DEFINED 8 #ifndef SkImageRef_ashmem_DEFINED
9 #define SkImageRef_ashmem_DEFINED 9 #define SkImageRef_ashmem_DEFINED
10 10
(...skipping 14 matching lines...) Expand all
25 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageRef_ashmem) 25 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageRef_ashmem)
26 26
27 protected: 27 protected:
28 SkImageRef_ashmem(SkFlattenableReadBuffer&); 28 SkImageRef_ashmem(SkFlattenableReadBuffer&);
29 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; 29 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
30 30
31 virtual bool onDecode(SkImageDecoder* codec, SkStreamRewindable* stream, 31 virtual bool onDecode(SkImageDecoder* codec, SkStreamRewindable* stream,
32 SkBitmap* bitmap, SkBitmap::Config config, 32 SkBitmap* bitmap, SkBitmap::Config config,
33 SkImageDecoder::Mode mode); 33 SkImageDecoder::Mode mode);
34 34
35 virtual void* onLockPixels(SkColorTable**); 35 virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
36 virtual void onUnlockPixels(); 36 virtual void onUnlockPixels() SK_OVERRIDE;
37 37
38 private: 38 private:
39 void closeFD(); 39 void closeFD();
40 40
41 SkColorTable* fCT; 41 SkColorTable* fCT;
42 SkAshmemRec fRec; 42 SkAshmemRec fRec;
43 43
44 typedef SkImageRef INHERITED; 44 typedef SkImageRef INHERITED;
45 }; 45 };
46 46
47 #endif 47 #endif
OLDNEW
« no previous file with comments | « src/images/SkImageRef.cpp ('k') | src/images/SkImageRef_ashmem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698