5e49b497ae2019586937aae0e8159292363728b5 |
|
03-Dec-2013 |
Leon Scroggins III <scroggo@google.com> |
Update framework to use M33 Skia. DO NOT MERGE (These CLs are already in master.) Bug: 13246311 This cherry-picks 7 CLs: ----------------------------------------------------------------------- Remove calls to deprecated SkBitmap::setIsOpaque() setIsOpaque() has been removed from ToT Skia. Update setters for mIsPremultiplied and hasAlpha to take the other into consideration. cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a ----------------------------------------------------------------------- Merge AssetStream with AssetStreamAdaptor. Add enums to the constructor for AssetStreamAdaptor to choose the different behaviors used by the (former) two different classes. The old clients of AssetStream now get the following features of AssetStreamAdaptor - Debugging statements on error. - The stream is an SkStreamRewindable. - getLength() returns the correct value, and the old way of getting the length (read(NULL, 0)) is no longer implemented, since it is no longer used. - isAtEnd() returns the correct value. ToT Skia makes it pure virtual, so some implementation is necessary. cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56 ----------------------------------------------------------------------- Deprecate Android-specific SkPaint functions. The following functions were problematic: const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*); const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*); const void* findImage(const SkGlyph&, const SkMatrix*); Replacing them with calls through SkGlyphCache solved a nasty crash bug, so they have all been deprecated. Bug: 11968757 cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08 ----------------------------------------------------------------------- pass SkGlyphCache into updateGlyphCache() Doing so prevents us from double-locking the glyph cache, thereby effectively locking ourselves out of reusing work that we'd just done. Bug: 11968757 cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89 ----------------------------------------------------------------------- Updates to the Skia API needed to merge the WebView m33 version of Skia. cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3 Bugfix for screenshots (recent apps) due to incorrect rowBytes computation bug: 12915192 cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714 ----------------------------------------------------------------------- Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap. cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5 ----------------------------------------------------------------------- Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
1abf5d62429e5a9329520b2f7c2b5a5e7a8e72ec |
|
16-Aug-2013 |
Chris Craik <ccraik@google.com> |
Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap bug:2248948 Change-Id: I8fdd649332667598504a1076d5a447572bd53086
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
6a6bc216d15293886ad088bb0ca99aadb7df85dc |
|
08-Aug-2013 |
Jesse Hall <jessehall@google.com> |
Use new ISurfaceComposer::destroyDisplay method Bug: 10191053 Change-Id: I3ecc6880db4a4c77c6db4e8b50faa9b4021d17c6
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
b251f3d0c619c37cc4e4b8d9f8b95eb377423190 |
|
26-Jul-2013 |
Mathias Agopian <mathias@google.com> |
get rid of HAL pixelformats 5551 and 4444 Change-Id: I6a6c4c656d80280eb85f90f99f35721ffca285df
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
6f7b58917104916ee6afd6f246c251c1d7a2102a |
|
26-Jul-2013 |
Mathias Agopian <mathias@google.com> |
get rid of PIXEL_FORMAT_A_8 Change-Id: Ia750811f08ddebdd5818da211fd03d61b75f8e97
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
32b9f6258d052c8c334ae348322fed9ba032a09f |
|
22-Mar-2013 |
Mathias Agopian <mathias@google.com> |
Revert "make sure screenshot are in a format supported by Bitmap.java" This reverts commit 74beb8953789635ad50fa979cf9ac8178a78cb81. it was checked-in by mistake
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
74beb8953789635ad50fa979cf9ac8178a78cb81 |
|
22-Mar-2013 |
Mathias Agopian <mathias@google.com> |
make sure screenshot are in a format supported by Bitmap.java Change-Id: Ic3ab7db31f1810ea19aac55d448dd1d4d6c419e4
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
b1d90c8f60f71422196c337f1d078b68867f5710 |
|
07-Mar-2013 |
Mathias Agopian <mathias@google.com> |
fix JNI use of incStrong/decStrong Change-Id: Ia11b404dea483dc19bbc30f4d7bcff516655e180
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
0449a40586b45ee05f760802020dc2f8a6e0506b |
|
02-Mar-2013 |
Mathias Agopian <mathias@google.com> |
screenshots can now go into a Surface from java A Surface can trivially be created from a SurfaceTexture. Update ElectronBeam to use this new API. Bug: 6940974 Change-Id: I20459443d0d853e3f8ae23104c08d185c336abea
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
ffddc9b8045235a493ec506965ae4892601eb23d |
|
26-Feb-2013 |
Mathias Agopian <mathias@google.com> |
Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface also fix a typo that made us call the wrong Surface ctor Bug: 8225509 Change-Id: I23f92179b6003d4c3e0febb35166c1caeafa27f5
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
76f56dd598045dadae6dee5e8547bd077b980d5c |
|
15-Feb-2013 |
Mathias Agopian <mathias@google.com> |
am ceec31b7: Merge changes I5a218ca1,I853a76d9 * commit 'ceec31b7dab6a23e443d5dcbcfac4a23b720cfde': Refactoring: Rename SurfaceTextureClient to Surface clean-up following Surface split
|
52800617946c456e78ed010c82d0ec4358368164 |
|
15-Feb-2013 |
Mathias Agopian <mathias@google.com> |
Refactoring: Rename SurfaceTextureClient to Surface Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
29479ebe1007361222bf6ab4d5e2a27927d4b8e8 |
|
14-Feb-2013 |
Mathias Agopian <mathias@google.com> |
clean-up following Surface split Change-Id: I853a76d92d957ee38a36fcdd280d6407ec316987
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
e32e2b343dca94086badfe34080fb24b4215db27 |
|
15-Feb-2013 |
Kristian Monsen <kristianm@google.com> |
Fixup from merge, and compile fix due to different skia version Change-Id: I644c5148904893a2854207f4d566395d973d4aff
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|
3866f0d581ceaa165710feeee9f37fe1b0d7067d |
|
12-Feb-2013 |
Mathias Agopian <mathias@google.com> |
split Surface in two classes: SurfaceControl and Surface SurfaceControl is the window manager side; it can control the attributes of a surface but cannot push buffers to it. Surface on the other hand is the application (producer) side and is used to push buffers to the surface. Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
/frameworks/base/core/jni/android_view_SurfaceControl.cpp
|