f8d8777ddd
(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 Conflicts: core/jni/android/graphics/Bitmap.cpp core/jni/android/graphics/Graphics.cpp core/jni/android/graphics/Typeface.cpp graphics/java/android/graphics/Bitmap.java
64 lines
2.0 KiB
C
64 lines
2.0 KiB
C
/*
|
|
* Copyright (C) 2012 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef ANDROID_HWUI_FONT_UTIL_H
|
|
#define ANDROID_HWUI_FONT_UTIL_H
|
|
|
|
#include <SkUtils.h>
|
|
|
|
#include "Properties.h"
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// Defines
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#define DEFAULT_TEXT_SMALL_CACHE_WIDTH 1024
|
|
#define DEFAULT_TEXT_SMALL_CACHE_HEIGHT 512
|
|
#define DEFAULT_TEXT_LARGE_CACHE_WIDTH 2048
|
|
#define DEFAULT_TEXT_LARGE_CACHE_HEIGHT 512
|
|
|
|
#define TEXTURE_BORDER_SIZE 1
|
|
#if TEXTURE_BORDER_SIZE != 1
|
|
# error TEXTURE_BORDER_SIZE other than 1 is not currently supported
|
|
#endif
|
|
|
|
#define CACHE_BLOCK_ROUNDING_SIZE 4
|
|
|
|
#if RENDER_TEXT_AS_GLYPHS
|
|
typedef uint16_t glyph_t;
|
|
#define TO_GLYPH(g) g
|
|
#define GET_METRICS(cache, glyph) cache->getGlyphIDMetrics(glyph)
|
|
#define GET_GLYPH(text) nextGlyph((const uint16_t**) &text)
|
|
#define IS_END_OF_STRING(glyph) false
|
|
|
|
static glyph_t nextGlyph(const uint16_t** srcPtr) {
|
|
const uint16_t* src = *srcPtr;
|
|
glyph_t g = *src++;
|
|
*srcPtr = src;
|
|
return g;
|
|
}
|
|
#else
|
|
typedef SkUnichar glyph_t;
|
|
#define TO_GLYPH(g) ((SkUnichar) g)
|
|
#define GET_METRICS(cache, glyph) cache->getUnicharMetrics(glyph)
|
|
#define GET_GLYPH(text) SkUTF16_NextUnichar((const uint16_t**) &text)
|
|
#define IS_END_OF_STRING(glyph) glyph < 0
|
|
#endif
|
|
|
|
#define AUTO_KERN(prev, next) (((next) - (prev) + 32) >> 6 << 16)
|
|
|
|
#endif // ANDROID_HWUI_FONT_UTIL_H
|