GitLab

bug: 6906025

Conflicts resolved in:
	include/gpu/GrBackendEffectFactory.h
	src/core/SkPaint.cpp
	src/effects/gradients/SkLinearGradient.cpp
	src/ports/FontHostConfiguration_android.cpp

Change-Id: I5ad1f8f99f8fdbc26c5f98861701dd0c1cee82fa

Change-Id: I83c7c2152f5d2c303b4655a5a604f513a54f350a

# Via Ruben Brunk
* commit '2dad6229':
  This fixes the immediate setjmp crash.

Bug: 6880937
Change-Id: I13340705b7ae5050e00cd7fba56f21921de5a502

* commit '0203c47d':
  Introduces new shared library that will be used to playback SkPictures.

* commit 'f8cacf6b':
  Make a copy of the Skia sources to isolate them from updates.

Change-Id: Ied68be289bf5f54d51ddad5cf08fd2b1f1e8fedd

This is a specific library only needed on devices that must be capable
of playing back SkPicture files recorded with a previous version of
Skia than what is currently on the system.

bug: 8019756
Change-Id: I0c1b8c8d74fd4df64b86c2e2eb534bd85841d81c

These files will be the basis for a special shared library that
will be used to playback SkPicture files that have been saved
using this version of Skia.

bug: 8019756
Change-Id: I1ea4d6baf9bb09be01f267337271e0c352cea81e

Change-Id: I420c812b34ba41a3fc03db1f1276340954d379c1

* commit 'cfceaa81':
  Changes to Skia to support Harfbuzz NG

* commit '460abbfb':
  Expose extra matrix parameter in glyph cache APIs

Change-Id: I4d660b49051add2407fbe4eb1dcbd2c661ad39ee

Change-Id: I12ae1c7ebdb566addf3d2783c8405793e842df8a

Change-Id: Id331cea931fbc29611fdc32e4267bc9ecc463994

Change-Id: I40c1c8a08cc39102fe9f8b3f116206be17db12e2

Change-Id: I8c637470b52c8277a781111c2ac2d1dcce7d84fa

Change-Id: I09e1477c92879d723e9d71cf13c6e0371407041f

Change-Id: I5c9aa88bd82f150da9f5b1152bc2d5aa4baaabb2

This version of the patch supports both old and new Harfbuzz (the former
is still needed for WebView).

Change-Id: Id438a5dd7f9fe4a7deca3cb6fb8521eb757b10e4

* commit '7cd90d4e':
  Add Android specific API Bug #7353771

Bug #7353771

This API is just a boolean property that tells the hardware renderer
whether it should use mipmap levels.

Change-Id: I123a334b89b0d64d711bdad43f5e2feb416de8b4

* commit '9c1f88b8':
  Update Skia's handling of vertical text when freetype metrics are available.

This is a cherry-pick of a larger change going into upstream Skia at...
https://codereview.appspot.com/6554064/

bug: 7124435
Change-Id: Id8b030afaf493741e133b592a4e08a3fd90ec2f3

* commit 'faa8dc5b':
  Reduce tolerance for going into our fast path for gradients.

bug: 6897797
Change-Id: If7bce42f5347bc78f10c55d5041389b983813c2a

* commit 'ebb0af8e':
  Increment SkPath's generation id when transform() is called

Change-Id: I2f164c30342620e1c0663e133ba671b4a3869b70

Remove header include for decode_vp8.h file. The required APIs are
defined in decode.h, that's already included.

Change-Id: I2e3c72de242a61585577d0dfe8d4b5cac64fcbcc

am efda4cbd: am 867c7f44: am 6a22037d: Merge "[Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery"

* commit 'efda4cbd':
  [Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery

am 867c7f44: am 6a22037d: Merge "[Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery"

* commit '867c7f44':
  [Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery

* commit '6a22037d':
  [Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery

am 2f7c075a: am a223e0da: am 2f12560c: Merge "Enable dynamic effect of GIF animating images in browser"

* commit '2f7c075a':
  Enable dynamic effect of GIF animating images in browser

* commit 'a223e0da':
  Enable dynamic effect of GIF animating images in browser

* commit '2f12560c':
  Enable dynamic effect of GIF animating images in browser

The ANDROID_LARGE_MEMORY_DEVICE flag is not set for x86 platforms but it
is required to get animated GIF working. 256MB is considered "large".

Change-Id: I2ed6d1668702e6b422e6d585eb8cd06f064ccc32
Author: Bin Xu <bxu10X@intel.com>
Signed-off-by: Bin Xu <bxu10X@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 19205