Better encapsulate oval/rrect batchs.

Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003

Committed: https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
Committed: https://skia.googlesource.com/skia/+/7f06c6947a3bef78dc57b9252779567c33604c90
Committed: https://skia.googlesource.com/skia/+/11bf8b2eae7d1780cb969146422a2ab3b933047a

[bsalomon, 2016-06-29 20:05:47]

Description was changed from

==========
Better encapsulate oval/rrect batchs.
==========

to

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003
==========

[bsalomon, 2016-06-29 20:12:23]

bsalomon@google.com changed reviewers:
+ robertphillips@google.com

[bsalomon, 2016-06-29 20:12:24]

This is a code shuffle to encapsulate the Geometry structs inside the batch
classes.

[bsalomon, 2016-06-29 20:12:48]

The CQ bit was checked by bsalomon@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-29 20:12:57]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[robertphillips, 2016-06-29 20:40:45]

lgtm + questions

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer.cpp
File src/gpu/GrOvalRenderer.cpp (right):

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer....
src/gpu/GrOvalRenderer.cpp:567: 
Why do we need this 'geometry' object ?

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer....
src/gpu/GrOvalRenderer.cpp:702: SkScalar fOuterRadius;
Would it make more sense to store 'center' for this batch rather than
'fDevBounds'?

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer....
src/gpu/GrOvalRenderer.cpp:910: SkScalar fInnerYRadius;
Same here. 'fDevBounds' seems trivial to (re)compute if we have 'center'.

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer....
src/gpu/GrOvalRenderer.cpp:1115: DIEllipseStyle fStyle;
Here too.

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer....
src/gpu/GrOvalRenderer.cpp:1550: SkScalar fInnerYRadius;
// 'fDevBounds' is the device bounds of an individual draw element. The device
bounds of the entire batch is stored in GrBatch 

?

[bsalomon, 2016-06-29 20:46:00]

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer.cpp
File src/gpu/GrOvalRenderer.cpp (right):

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer....
src/gpu/GrOvalRenderer.cpp:567: 
On 2016/06/29 20:40:45, robertphillips wrote:
> Why do we need this 'geometry' object ?

Oops, forgot to delete it.

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer....
src/gpu/GrOvalRenderer.cpp:702: SkScalar fOuterRadius;
On 2016/06/29 20:40:45, robertphillips wrote:
> Would it make more sense to store 'center' for this batch rather than
> 'fDevBounds'?

Yes, but I'm not trying to implementation in this CL, just hide Geometry.

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer....
src/gpu/GrOvalRenderer.cpp:910: SkScalar fInnerYRadius;
On 2016/06/29 20:40:45, robertphillips wrote:
> Same here. 'fDevBounds' seems trivial to (re)compute if we have 'center'.

Ditto

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer....
src/gpu/GrOvalRenderer.cpp:1115: DIEllipseStyle fStyle;
On 2016/06/29 20:40:45, robertphillips wrote:
> Here too.

Ditto

https://codereview.chromium.org/2104423003/diff/20001/src/gpu/GrOvalRenderer....
src/gpu/GrOvalRenderer.cpp:1550: SkScalar fInnerYRadius;
On 2016/06/29 20:40:45, robertphillips wrote:
> // 'fDevBounds' is the device bounds of an individual draw element. The device
> bounds of the entire batch is stored in GrBatch 
> 
> ?

I think this is likely to change in a future CL.

[commit-bot: I haz the power, 2016-06-29 20:49:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-29 20:49:05]

Dry run: This issue passed the CQ dry run.

[bsalomon, 2016-06-29 20:54:34]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-06-29 20:54:35]

The patchset sent to the CQ was uploaded after l-g-t-m from
robertphillips@google.com
Link to the patchset: https://codereview.chromium.org/2104423003/#ps40001
(title: "Delete extra circle geometry")

[commit-bot: I haz the power, 2016-06-29 20:54:48]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-29 21:16:34]

Description was changed from

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003
==========

to

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003

Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
==========

[commit-bot: I haz the power, 2016-06-29 21:16:35]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc

[dogben, 2016-06-29 22:24:41]

A revert of this CL (patchset #3 id:40001) has been created in
https://codereview.chromium.org/2109913005/ by benjaminwagner@google.com.

The reason for reverting is: Causing assertion error on
Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug
(https://chromium-swarm.appspot.com/user/task/2fb6ee239783b910) and
Test-Win8-MSVC-ShuttleA-GPU-GTX960-x86_64-Debug
(https://chromium-swarm.appspot.com/user/task/2fb6ebcc157fed10)..

[bsalomon, 2016-06-30 00:26:47]

Description was changed from

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003

Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
==========

to

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003

Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
==========

[bsalomon, 2016-06-30 00:27:25]

The CQ bit was checked by bsalomon@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-30 00:27:31]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-30 00:42:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-30 00:42:03]

Dry run: This issue passed the CQ dry run.

[bsalomon, 2016-06-30 00:54:28]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-06-30 00:54:28]

The patchset sent to the CQ was uploaded after l-g-t-m from
robertphillips@google.com
Link to the patchset: https://codereview.chromium.org/2104423003/#ps60001
(title: "fix ellipse matrix")

[commit-bot: I haz the power, 2016-06-30 00:54:33]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[bsalomon, 2016-06-30 00:54:35]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2016-06-30 00:54:43]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-30 00:55:30]

Description was changed from

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003

Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
==========

to

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003

Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
Committed:
https://skia.googlesource.com/skia/+/7f06c6947a3bef78dc57b9252779567c33604c90
==========

[commit-bot: I haz the power, 2016-06-30 00:55:31]

Committed patchset #4 (id:60001) as
https://skia.googlesource.com/skia/+/7f06c6947a3bef78dc57b9252779567c33604c90

[dogben, 2016-06-30 11:47:32]

A revert of this CL (patchset #4 id:60001) has been created in
https://codereview.chromium.org/2111883002/ by benjaminwagner@google.com.

The reason for reverting is: Chromium roll is failing:
https://build.chromium.org/p/chromium.linux/builders/Android%20Arm64%20Builde...

[1505/19896] CXX obj/skia/skia/GrOvalRenderer.o
FAILED: obj/skia/skia/GrOvalRenderer.o 
/mnt/data/b/build/slave/cache/cipd/goma/gomacc
../../third_party/android_tools/ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++
-MMD -MF obj/skia/skia/GrOvalRenderer.o.d -DV8_DEPRECATION_WARNINGS
-DENABLE_NOTIFICATIONS -DENABLE_BROWSER_CDMS -DENABLE_PRINTING=1
-DENABLE_BASIC_PRINTING=1 -DENABLE_SPELLCHECK=1 -DUSE_BROWSER_SPELLCHECKER=1
-DUSE_OPENSSL_CERTS=1 -DNO_TCMALLOC -DUSE_EXTERNAL_POPUP_MENU=1
-DENABLE_WEBRTC=1 -DDISABLE_NACL -DENABLE_SUPERVISED_USERS=1
-DUSE_PROPRIETARY_CODECS -DVIDEO_HOLE=1 -DSAFE_BROWSING_DB_REMOTE
-DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DENABLE_WEBVR
-DFIELDTRIAL_TESTING_ENABLED -D_FILE_OFFSET_BITS=64 -DANDROID -DHAVE_SYS_UIO_H
-DANDROID_NDK_VERSION=r10e -D__GNU_SOURCE=1 -D_DEBUG
-DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1
-DSK_IGNORE_DW_GRAY_FIX -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS
-DSK_SUPPORT_GPU=1 -DSK_BUILD_FOR_ANDROID -DUSE_CHROMIUM_SKIA
-DSK_GAMMA_APPLY_TO_A8 -DSK_GAMMA_EXPONENT=1.4 -DSK_GAMMA_CONTRAST=0.0
-DSK_DEFAULT_FONT_CACHE_LIMIT=1048576 -DXML_STATIC -I../.. -Igen
-I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c
-I../../third_party/skia/include/config -I../../third_party/skia/include/core
-I../../third_party/skia/include/effects -I../../third_party/skia/include/images
-I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops
-I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe
-I../../third_party/skia/include/ports -I../../third_party/skia/include/utils
-I../../third_party/skia/include/gpu -I../../third_party/skia/src/gpu
-I../../third_party/skia/include/private
-I../../third_party/skia/include/client/android
-I../../third_party/skia/src/core -I../../third_party/skia/src/image
-I../../third_party/skia/src/opts -I../../third_party/skia/src/pdf
-I../../third_party/skia/src/ports -I../../third_party/skia/src/sfnt
-I../../third_party/skia/src/utils -I../../third_party/skia/src/lazy
-I../../third_party/zlib
-I../../third_party/android_tools/ndk/sources/android/cpufeatures
-I../../third_party/expat/files/lib -I../../third_party/freetype-android/include
-I../../third_party/freetype-android/src/include -fno-strict-aliasing
--param=ssp-buffer-size=4 -fstack-protector -funwind-tables -fPIC -pipe
-ffunction-sections -fno-short-enums -finline-limit=64 -Os -fdata-sections
-ffunction-sections -g1
--sysroot=../../third_party/android_tools/ndk/platforms/android-21/arch-arm64
-fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized
-Wno-missing-field-initializers -Wno-unused-parameter -fno-threadsafe-statics
-fvisibility-inlines-hidden -std=gnu++11 -fno-rtti
-isystem../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libcxx/include
-isystem../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++abi/libcxxabi/include
-isystem../../third_party/android_tools/ndk/sources/android/support/include
-fno-exceptions -Wno-deprecated -Wno-narrowing -c
../../third_party/skia/src/gpu/GrOvalRenderer.cpp -o
obj/skia/skia/GrOvalRenderer.o
In file included from
../../third_party/skia/include/private/../private/SkTemplates.h:17:0,
                 from ../../third_party/skia/include/private/SkTArray.h:12,
                 from ../../third_party/skia/src/gpu/GrBufferAllocPool.h:11,
                 from ../../third_party/skia/src/gpu/GrBatchFlushState.h:11,
                 from ../../third_party/skia/src/gpu/GrOvalRenderer.cpp:10:
../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libcxx/include/memory:
In instantiation of 'void std::__1::unique_ptr<_Tp,
_Dp>::reset(std::__1::unique_ptr<_Tp, _Dp>::pointer) [with _Tp =
std::__1::__function::__base<bool(GrSurface*, int, int, int, int, GrPixelConfig,
const void*, long unsigned int)>; _Dp =
std::__1::__allocator_destructor<std::__1::allocator<std::__1::__function::__func<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)>,
std::__1::allocator<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)> >, bool(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, long unsigned int)> > >;
std::__1::unique_ptr<_Tp, _Dp>::pointer =
std::__1::__function::__base<bool(GrSurface*, int, int, int, int, GrPixelConfig,
const void*, long unsigned int)>*]':
../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libcxx/include/memory:2598:52:
  required from 'std::__1::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp =
std::__1::__function::__base<bool(GrSurface*, int, int, int, int, GrPixelConfig,
const void*, long unsigned int)>; _Dp =
std::__1::__allocator_destructor<std::__1::allocator<std::__1::__function::__func<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)>,
std::__1::allocator<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)> >, bool(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, long unsigned int)> > >]'
../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libcxx/include/functional:1603:72:
  required from 'std::__1::function<_Rp(_ArgTypes ...)>::function(_Fp, typename
std::__1::enable_if<(std::__1::function<_Rp(_ArgTypes
...)>::__callable<_Fp>::value && (! std::__1::is_same<_Fp,
std::__1::function<_Rp(_ArgTypes ...)> >::value))>::type*) [with _Fp =
GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)>; _Rp = bool; _ArgTypes
= {GrSurface*, int, int, int, int, GrPixelConfig, const void*, long unsigned
int}; typename std::__1::enable_if<(std::__1::function<_Rp(_ArgTypes
...)>::__callable<_Fp>::value && (! std::__1::is_same<_Fp,
std::__1::function<_Rp(_ArgTypes ...)> >::value))>::type = void]'
../../third_party/skia/src/gpu/GrBatchFlushState.h:80:9:   required from here
../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libcxx/include/memory:2630:34:
error: invalid conversion from
'std::__1::unique_ptr<std::__1::__function::__base<bool(GrSurface*, int, int,
int, int, GrPixelConfig, const void*, long unsigned int)>,
std::__1::__allocator_destructor<std::__1::allocator<std::__1::__function::__func<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)>,
std::__1::allocator<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)> >, bool(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, long unsigned int)> > >
>::pointer {aka std::__1::__function::__base<bool(GrSurface*, int, int, int,
int, GrPixelConfig, const void*, long unsigned int)>*}' to
'std::__1::__allocator_destructor<std::__1::allocator<std::__1::__function::__func<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)>,
std::__1::allocator<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)> >, bool(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, long unsigned int)> > >::pointer
{aka
std::__1::__function::__func<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)>,
std::__1::allocator<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)> >, bool(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, long unsigned int)>*}'
[-fpermissive]
             __ptr_.second()(__tmp);
                                  ^
In file included from
../../third_party/skia/include/private/../private/SkTemplates.h:17:0,
                 from ../../third_party/skia/include/private/SkTArray.h:12,
                 from ../../third_party/skia/src/gpu/GrBufferAllocPool.h:11,
                 from ../../third_party/skia/src/gpu/GrBatchFlushState.h:11,
                 from ../../third_party/skia/src/gpu/GrOvalRenderer.cpp:10:
../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libcxx/include/memory:3474:10:
note: initializing argument 1 of 'void
std::__1::__allocator_destructor<_Alloc>::operator()(std::__1::__allocator_destructor<_Alloc>::pointer)
[with _Alloc =
std::__1::allocator<std::__1::__function::__func<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)>,
std::__1::allocator<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)> >, bool(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, long unsigned int)> >;
std::__1::__allocator_destructor<_Alloc>::pointer =
std::__1::__function::__func<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)>,
std::__1::allocator<GrBatchFlushState::doUpload(GrDrawBatch::DeferredUploadFn&)::<lambda(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, size_t)> >, bool(GrSurface*,
int, int, int, int, GrPixelConfig, const void*, long unsigned int)>*]'
     void operator()(pointer __p) _NOEXCEPT
          ^
.

[bsalomon, 2016-07-01 02:12:41]

Description was changed from

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003

Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
Committed:
https://skia.googlesource.com/skia/+/7f06c6947a3bef78dc57b9252779567c33604c90
==========

to

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003

Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
Committed:
https://skia.googlesource.com/skia/+/7f06c6947a3bef78dc57b9252779567c33604c90
==========

[bsalomon, 2016-07-07 14:32:33]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-07-07 14:32:34]

The patchset sent to the CQ was uploaded after l-g-t-m from
robertphillips@google.com
Link to the patchset: https://codereview.chromium.org/2104423003/#ps80001
(title: "rebase")

[commit-bot: I haz the power, 2016-07-07 14:32:38]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[bsalomon, 2016-07-07 14:33:17]

The CQ bit was unchecked by bsalomon@google.com

[bsalomon, 2016-07-07 14:39:35]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2016-07-07 14:39:41]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-07 14:55:27]

Description was changed from

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003

Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
Committed:
https://skia.googlesource.com/skia/+/7f06c6947a3bef78dc57b9252779567c33604c90
==========

to

==========
Better encapsulate oval/rrect batchs.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003

Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
Committed:
https://skia.googlesource.com/skia/+/7f06c6947a3bef78dc57b9252779567c33604c90
Committed:
https://skia.googlesource.com/skia/+/11bf8b2eae7d1780cb969146422a2ab3b933047a
==========

[commit-bot: I haz the power, 2016-07-07 14:55:28]

Committed patchset #5 (id:80001) as
https://skia.googlesource.com/skia/+/11bf8b2eae7d1780cb969146422a2ab3b933047a

[commit-bot: I haz the power, 2016-07-07 14:55:32]

CQ bit was unchecked.

[hush (inactive), 2016-07-07 20:51:55]

A revert of this CL (patchset #5 id:80001) has been created in
https://codereview.chromium.org/2121313004/ by hush@chromium.org.

The reason for reverting is: This CL is suspected to break compilation on arm64.
https://build.chromium.org/p/chromium.android/builders/Android%20arm64%20Buil....