GitLab

Two Skia changes required for
https://googleplex-android-review.git.corp.google.com/#/c/357301/:

https://codereview.chromium.org/23464068/:
Use the default resync_to_restart in jpeg.

Our version requires rewinding the stream, which is not always
supported. Instead, depend on jpeg's default version.

This is required because the new framework code assumes that an
image stream will never be rewound unless it's at the beginning.

https://codereview.chromium.org/23717055/:
Add a buffered SkStream class.

This is used by Android to buffer an input stream which may not
otherwise be able to rewind.

Add a test for the new class.

This change allows us to buffer natively, and to only buffer the
beginning of the stream, which is all that is needed by the image
decoders.

BUG:8432093
BUG:6493544
BUG:10725383

Change-Id: I39fb1346866066693e14b6bcab1c398b9befa296

Bug: 10310267
Change-Id: If4ba6e07fcd3b8819d03f230adc705f15b974404

This is a fix for bug 10769257.

In the case where origFontID is also the first font in the fallback
list, the nextLogicalTypeface function was picking the first font in the
fallback list, which was causing looping. Simply allowing it to advance
to the next typeface fixes the ANR.

Change-Id: Icc1389af46aff7f6b9c96cc0e8c8e9ae74039554

This fixes a regression in Android when switching from FontHost_android

This fix is a cherry-pick of https://code.google.com/p/skia/source/detail?r=11134

bug: 10555832
Change-Id: I45d860766ef6101dbd04f1e5b88f99ae2d8fc892

In addition to selecting a bitmap strike appropriate for the
requested font size, we must also scale the chosen bitmap strike
to match the requested font size, as it will almost always not be
the actual size requested. This commit does so, and adjusts per-glyph
metrics accordingly.

Bug: 10260891
Change-Id: Ib9ebed250df32dec97e72419f7b612b996443516

Merge "fix regression in fallback chain where we don't account for the original font style." into klp-dev

Merge "Create a semi-stable API for capturing the state of an SkCanvas and reconstructing that state across different versions of Skia." into klp-dev

This CL also enforces that the language and variant are the same for all fonts
within a given fallback family.

bug:10529543
Change-Id: I0b5b3190fc5b36ccc706169915bcb36df874e6a9

Create a semi-stable API for capturing the state of an SkCanvas and reconstructing that state across different versions of Skia.

cherry-pick of https://skia.googlecode.com/svn/trunk@11013
cherry-pick of https://skia.googlecode.com/svn/trunk@11081

bug:10152369
Change-Id: I7821cf6efe856d5da0ba9c9ddda7a7ad392492e2

This captures revisions r10947 to r11077 (inclusive). However, some
PDF changes have already been cherry-picked so they will not show
up in this CL.

bug: 10285384
Change-Id: I5648963a4f2c4f36cdfbf316052176264cf643a6

Merge "[PDF] Fix printing crashes caused by font streams that don't support getMemoryBase()." into klp-dev

cherry-pick of https://code.google.com/p/skia/source/detail?r=10977

include/core/SkStream.h:
Update documentation to state that rewinding a stream at the beginning
should return true. This is important because our decoders fail if
rewind returns false, assuming that the stream is not at the beginning.

src/images/SkImageDecoder_libpng.cpp:
If rewind fails, call png_error.

src/images/SkImageDecoder_libwebp.cpp:
If rewind fails, report an error and return false.

src/images/SkImageRef.cpp:
If rewind fails report an error and return false.
FIXME: Need to handle flattening properly. Should I perhaps move
writeStream into SkOrderedWriteBuffer?

src/images/SkJpegUtility.cpp:
Report a jpeg error on failure to rewind.

BUG:8432093
Change-Id: Ie339cda0a9d31bf0abafc38f9c2c77726f23c6a6

Skia's decoders were calling getLength, which is not always
a reasonable call to make. This CL cherry-picks three changes
from Skia which remove the dependency.

cherry-pick of https://skia.googlecode.com/svn/trunk@10848
cherry-pick of https://skia.googlecode.com/svn/trunk@10849
cherry-pick of https://skia.googlecode.com/svn/trunk@10850
(Also modified Android.mk to include SkStreamHelpers.)

BUG:8432093

Change-Id: I271077eeaaf3fa11487ae30c188acd764fc494a6

getMemoryBase().

An apparently recently change started putting web fonts into SkStream objects
that don't support getMemoryBase().  This change uses writeStream to avoid
needing to call getMemoryBase().

cherry-pick of https://code.google.com/p/skia/source/detail?r=10928

bug:10461655
Change-Id: If73ca86312ff31b1c2800ce51abe2318bc64b5be

getMemoryBase().

An apparently recently change started putting web fonts into SkStream objects
that don't support getMemoryBase().  This change uses writeStream to avoid
needing to call getMemoryBase().

cherry-pick of https://code.google.com/p/skia/source/detail?r=10918

bug:10461655
Change-Id: Ic383c3b4ce9002063062775c769acf12b5ee13f5

The earlier code assumed that if jpeg_create_huffman_index
succeeded but jpeg_build_huffman_index failed that the
index would still need to be destroyed. This is not the
case. Only call jpeg_destroy_huffman_index if both
succeeded.

BUG=http://b.corp.google.com/issue?id=10263847

Change-Id: I3fbc7ac507ce11134565ebe50bd6be95e276b8e4

cherry-pick of https://skia.googlecode.com/svn/trunk@10838

bug:2248948
Change-Id: I8e534beeaa8e2c13b9195b646fef380cdcb88ba8

Conflicts:
	include/core/SkUserConfig.h
	src/images/SkImageDecoder_libjpeg.cpp

Change-Id: I40e031f0abcd0d1e064b25f071bfc5f1b3c55e91

This change cuts libskia.so from 2.3MB to 1.5MB with no loss in
performance.

We've recently cleared away the issues that were preventing Skia from
building with Thumb2, and our performance tests showed it was at worst
neutral on a Nexus S, and slightly positive on a Nexus 4.  Skia has been
building and testing with Thumb2 for two uneventful weeks now, and Clank
has apparently been doing it for forever.

bug: 9914906
Change-Id: I4f9ed568214b31b148516db60f8f6c7a8e349389

Change-Id: I846e489575859eff43302c698606953c58420671

Chromium expects to be able to use the skia debug canvas; add it to the
list of files built along with its dependencies.

Change-Id: I43e890f0440a9b4b77ac025f5f0461fad801490f

Add GR_GL_PER_GL_FUNC_CALLBACK=1 as Chromium requires it, and move
GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE=1 into the headers instead of the
command line so that it's visible by code including skia headers.

Change-Id: Ia6ccb487e60359322e35648e53a7f5a659ddcd41

This also refactors how metrics are generated for outline fonts, in
an attempt to keep the metrics code as common/universal as possible.

Bug: 9577689
Change-Id: I845a3af111314d8983e5de919343aeceb7609489

This commit provides colour bitmap font support via FreeType's new
FT_LOAD_COLOR and FT_PIXEL_MODE_BGRA flags. Some minor bitmap format
conversion was needed, as SkMask does not have a BGRA format.

Bug: 9577689
Change-Id: Ifb0a031c5ab52543b1e53fa778945d20953d1a33

Bug: 9577689
Change-Id: I9e8260e23603adb390b7874f4e2ee7d004e8646c

* commit 'b5714864':
  tweaks for forward compatibility

Change-Id: Id9089424d82567556fc1faf6024cfe46b3de7cfe

This CL also includes a cherry-pick of r10483 to fix
errors in the JPEG region decoder.

Conflicts:
	include/core/SkUserConfig.h
	src/images/SkImageDecoder.cpp
	src/images/SkImageDecoder_libbmp.cpp
	src/images/SkImageDecoder_libgif.cpp
	src/images/SkImageDecoder_libico.cpp
	src/images/SkImageDecoder_libjpeg.cpp
	src/images/SkImageDecoder_libpng.cpp
	src/images/SkImageDecoder_libwebp.cpp
	src/images/SkImageDecoder_wbmp.cpp
	src/ports/FontHostConfiguration_android.cpp
	src/ports/FontHostConfiguration_android.h
	src/ports/SkFontConfigInterface_android.cpp

Change-Id: I415ba6cfbb7ee41f4c8c5c01ec1bcc32345568d2

Change-Id: Id35b998cb70e867d14e58c2e794b9a742b1ef6d5

Change-Id: I99edbeebb2b1e2eed713957578c9feff755e3279

This reverts commit 06a86005.

Change-Id: Iacb501a25c3804b3a16fea1e00c88c5edea2a9d5

Change-Id: Ib3567a52506bfe9e0a1423f225b4126796c897cb

Bug: 9603326
Change-Id: Ibbe29d780dd24c08a4165360e7b6d6231063e8a7