Revert of Better encapsulate oval/rrect batchs.

Revert of Better encapsulate oval/rrect batchs. (patchset #3 id:40001 of https://codereview.chromium.org/2104423003/ )

Reason for revert:
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).

Original issue's description:
> Better encapsulate oval/rrect batchs.
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003
> 
> Committed: https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc

TBR=robertphillips@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed: https://skia.googlesource.com/skia/+/fc5b70a8e427ee115868786fa361c2c813ab566b

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

The CQ bit was checked by benjaminwagner@google.com

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

Created Revert of Better encapsulate oval/rrect batchs.

[commit-bot: I haz the power, 2016-06-29 22:24:54]

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 22:25:02]

Description was changed from

==========
Revert of Better encapsulate oval/rrect batchs. (patchset #3 id:40001 of
https://codereview.chromium.org/2104423003/ )

Reason for revert:
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).

Original issue's description:
> Better encapsulate oval/rrect batchs.
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003
> 
> Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc

TBR=robertphillips@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
==========

to

==========
Revert of Better encapsulate oval/rrect batchs. (patchset #3 id:40001 of
https://codereview.chromium.org/2104423003/ )

Reason for revert:
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).

Original issue's description:
> Better encapsulate oval/rrect batchs.
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003
> 
> Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc

TBR=robertphillips@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed:
https://skia.googlesource.com/skia/+/fc5b70a8e427ee115868786fa361c2c813ab566b
==========

[commit-bot: I haz the power, 2016-06-29 22:25:03]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/fc5b70a8e427ee115868786fa361c2c813ab566b