Snapshot from http://skia.googlecode.com/svn/trunk@12108

Change-Id: Ia710b27d97e938df06014b7b61a3767bd3be1eb5
Snapshot from http://skia.googlecode.com/svn/trunk@12682

Change-Id: I0470d8e53bf019f410509180b95950f20f98a5e8
Merge Skia r12682 into Android.

Conflicts:
	include/core/SkDraw.h
	include/pdf/SkPDFDevice.h
	include/utils/SkCanvasStateUtils.h
	include/utils/SkFrontBufferedStream.h
	src/core/SkDevice.cpp
	src/core/SkDeviceLooper.cpp
	src/core/SkDeviceLooper.h
	src/core/SkRRect.cpp
	src/doc/SkDocument_PDF.cpp
	src/effects/SkBlurMaskFilter.cpp
	src/fonts/SkFontMgr_fontconfig.cpp
	src/gpu/GrAAHairLinePathRenderer.cpp
	src/gpu/GrAAHairLinePathRenderer.h
	src/gpu/GrTextContext.cpp
	src/images/SkImageDecoder_libpng.cpp
	src/images/SkScaledBitmapSampler.cpp
	src/images/SkScaledBitmapSampler.h
	src/pdf/SkPDFDevice.cpp
	src/pdf/SkPDFDeviceFlattener.cpp
	src/ports/SkFontConfigInterface_android.cpp
	src/ports/SkFontHost_FreeType.cpp
	src/ports/SkFontHost_FreeType_common.cpp
	src/utils/SkCanvasStack.cpp
	src/utils/SkCanvasStack.h
	src/utils/SkCanvasStateUtils.cpp
	src/utils/SkDeferredCanvas.cpp
	src/utils/SkFrontBufferedStream.cpp
	src/utils/SkPictureUtils.cpp

Change-Id: Ice86d9769ed99f804932d8839acfdea695cb6d28
Fix issue in the image decoders where the bitmap config was not properly set.

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

bug: 12968474
Change-Id: I245eea4f05f402ca24849d5d2fe354c69526d03d
Apply all Skia changes made to the chromium m33 branch of Skia.

This CL was generated using "svn diff -r12932:12963" on the skia branch /chrome/m33_1750

------------------------------------------------------------------------
r12963 | fmalita@google.com | 2014-01-08 12:17:22 -0500 (Wed, 08 Jan 2014) | 1 line

Cherrypick r12846 into m33_1750 for http://crbug.com/330293
------------------------------------------------------------------------
r12945 | sugoi@google.com | 2014-01-07 13:15:39 -0500 (Tue, 07 Jan 2014) | 1 line

cherrypick changes into branch m33_1750 to fix http://crbug.com/329254
------------------------------------------------------------------------
r12934 | vandebo@chromium.org | 2014-01-06 18:40:00 -0500 (Mon, 06 Jan 2014) | 17 lines

Merge 12729 "[PDF] Fix clipping in xfermode improvement."

> [PDF] Fix clipping in xfermode improvement.
>
> In some cases, the wrong clip (src clip instead of initial clip) was used.
> Switch almost exclusively to initial clip because it is safe and generates a smaller result.
>
> BUG=chromium:328009
> R=reed@google.com, bungeman@google.com
>
> Author: vandebo@chromium.org
>
> Review URL: https://codereview.chromium.org/116423004

TBR=vandebo@chromium.org

Review URL: https://codereview.chromium.org/125293004
------------------------------------------------------------------------

Change-Id: I1d7b49c7dbd32f8d024492d4576879dbecb1d19c
Fix x86 build. DO NOT MERGE

Bug: 13246311

Change-Id: I6cd6a7dd95f2ca693412dbf71cc858c89480f990
Fix build on arm devices w/o neon. DO NOT MERGE

SkMorphologyGetPlatformProc is defined in both SkMorphology_opts_none
and opts_check_arm, so don't build both files.

Bug: 13246311
Change-Id: I06e75c2a99a8820b79b1c068b136349027814ae3
DO NOT MERGE - Allow buffered stream to work with an offset.

Merge fix for nativeDecodeFileDescriptor into MR2.
BUG:13191516

Original CL below:

Allow buffered stream to work with an offset.

If the stream being buffered is buffered from somewhere other than
the start, the SkFrontBufferedStream needs to take that into account
when reporting its length.

Required for https://googleplex-android-review.googlesource.com/#/c/415165/1
in frameworks/base to work.

BUG:12807677
BUG:12895876
Cherry-pick from: I675397f5cebb7c7d8bc9f76acb5265d7209cbbc2

Change-Id: Ia9aa7451fd6f72f0f5c8ba68199f0a74c0475178
Add an Android version of SkRefCnt - DO NOT MERGE

This version adds SkRefCnt::deref(). This allows chromium on Android
to build against the system version of Skia, since chromium requires
this function.

BUG:13246311
Change-Id: I988ef1f76e4e10918ca896e4488d65ccc94837c6
Disable optimizations for chromium m33.

These optimizations are disabled in chromium m33, so disable them in
Android's build of Skia, against which chromium/webview will link.

BUG:13246311
Change-Id: I8e64dea2d232a6b3616c225f1cd269f086b056e3
Set GR_GL_IGNORE_ES3_MSAA to 0. DO NOT MERGE

GR_GL_IGNORE_ES3_MSAA is a workaround for older versions of Chrome, and
M33 (the version we're using) no longer needs it.

BUG:13246311
Change-Id: Ib3cffe72b0b0b0e1fe1b441f3f716dd62ae17ad3
Merge "Set GR_GL_IGNORE_ES3_MSAA to 0. DO NOT MERGE" into m33
Merge "Disable optimizations for chromium m33." into m33
Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

Conflicts:
	Android.mk
	include/core/SkShader.h
	include/ports/SkFontConfigInterface.h
	src/core/SkBitmap.cpp
	src/core/SkTypeface.cpp
	src/core/SkTypefaceCache.h
	src/images/SkImageDecoder_libgif.cpp

Change-Id: I5bc5a94027922fbb096b7c43f4a56842674208e3
TEMPORARY: Disable qc-perf

It needs to be updated for the new skia

Change-Id: I419f8238657541fb6640ef46192f534dbf3670ba
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_external_skia into kitkat

Conflicts:
	Android.mk

Change-Id: I3222ff0dd409078f4453af39c849149d8c0f7d40