summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhalcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-10 18:33:07 +0000
committerhalcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-10 18:33:07 +0000
commit4d5fb26af2c0433ae37505607d19712a1363fb7c (patch)
tree5f3c41a14fac7ec5b674a451a8bb936582c70044
parentf8747106fc99ace3b36fdc7febfddc9398a8f06a (diff)
downloadgyp-4d5fb26af2c0433ae37505607d19712a1363fb7c.tar.gz
Implement SkAshmemDiscardableMemory
- Implement ashmem-backed SkDiscardableMemory subclass: This class in only accesible via the SkDiscardableMemory::Create() function, which replaces the mock implementation in SkDiscardableMemory_none.cpp - Added SkDiscardableMemory_ashmem.cpp to the Android port of Skia Removed SkDiscardableMemory_none.cpp from the Android port. - Added DiscardableMemoryTest. Still needs work. - SkDiscardablePixelRef Bugfix: onLockPixels() now calls SkDELETE on the SkDiscardableMemory pointer when it fails to unlock. - Improved documentation inside ashmem.h BUG= R=scroggo@google.com Review URL: https://codereview.chromium.org/83563002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12608 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--ports.gyp2
-rw-r--r--tests.gyp1
2 files changed, 3 insertions, 0 deletions
diff --git a/ports.gyp b/ports.gyp
index 068d2e1..26003de 100644
--- a/ports.gyp
+++ b/ports.gyp
@@ -153,10 +153,12 @@
[ 'skia_os == "android"', {
'sources!': [
'../src/ports/SkDebug_stdio.cpp',
+ '../src/ports/SkDiscardableMemory_none.cpp',
'../src/ports/SkPurgeableMemoryBlock_none.cpp',
],
'sources': [
'../src/ports/SkDebug_android.cpp',
+ '../src/ports/SkDiscardableMemory_ashmem.cpp',
'../src/ports/SkFontConfigInterface_android.cpp',
'../src/ports/SkFontConfigParser_android.cpp',
'../src/ports/SkFontHost_fontconfig.cpp',
diff --git a/tests.gyp b/tests.gyp
index ed1d077..4c8053e 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -56,6 +56,7 @@
'../tests/DequeTest.cpp',
'../tests/DeviceLooperTest.cpp',
'../tests/DiscardableMemoryPool.cpp',
+ '../tests/DiscardableMemoryTest.cpp',
'../tests/DocumentTest.cpp',
'../tests/DrawBitmapRectTest.cpp',
'../tests/DrawPathTest.cpp',