Cherry-pick 875e13ca0 to M52.

Cherry-pick 875e13ca0 to M52.

TBR=

Original description:
    Simplify mask/clip intersection, making sure to explicitly check for an empty mask.

    Previously we were only asserting the mask wasn't empty, which isn't necessarily true when we're given pathological float coordinates like +Inf or NaN.

    A local run of nanobench --match text_ was not able to show this is faster or slower.

    This patch fixed this first Chrome bug on my desktop, and the second is probably a dupe.
    BUG=chromium:619378, chromium:613912
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2073873002

    Review-Url: https://codereview.chromium.org/2073873002
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=2085023002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

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

[mtklein_C, 2016-06-21 19:02:40]

Description was changed from

==========
Cherry-pick 875e13ca0 to M52.

Original description:
    Simplify mask/clip intersection, making sure to explicitly check for an
empty mask.

    Previously we were only asserting the mask wasn't empty, which isn't
necessarily true when we're given pathological float coordinates like +Inf or
NaN.

    A local run of nanobench --match text_ was not able to show this is faster
or slower.

    This patch fixed this first Chrome bug on my desktop, and the second is
probably a dupe.
    BUG=chromium:619378,chromium:613912

    GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2073873002

    Review-Url: https://codereview.chromium.org/2073873002
==========

to

==========
Cherry-pick 875e13ca0 to M52.

Original description:
    Simplify mask/clip intersection, making sure to explicitly check for an
empty mask.

    Previously we were only asserting the mask wasn't empty, which isn't
necessarily true when we're given pathological float coordinates like +Inf or
NaN.

    A local run of nanobench --match text_ was not able to show this is faster
or slower.

    This patch fixed this first Chrome bug on my desktop, and the second is
probably a dupe.
    BUG=chromium:619378,chromium:613912

    GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2073873002

    Review-Url: https://codereview.chromium.org/2073873002
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

[mtklein_C, 2016-06-21 19:03:19]

Description was changed from

==========
Cherry-pick 875e13ca0 to M52.

Original description:
    Simplify mask/clip intersection, making sure to explicitly check for an
empty mask.

    Previously we were only asserting the mask wasn't empty, which isn't
necessarily true when we're given pathological float coordinates like +Inf or
NaN.

    A local run of nanobench --match text_ was not able to show this is faster
or slower.

    This patch fixed this first Chrome bug on my desktop, and the second is
probably a dupe.
    BUG=chromium:619378,chromium:613912

    GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2073873002

    Review-Url: https://codereview.chromium.org/2073873002
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

to

==========
Cherry-pick 875e13ca0 to M52.

TBR=

Original description:
    Simplify mask/clip intersection, making sure to explicitly check for an
empty mask.

    Previously we were only asserting the mask wasn't empty, which isn't
necessarily true when we're given pathological float coordinates like +Inf or
NaN.

    A local run of nanobench --match text_ was not able to show this is faster
or slower.

    This patch fixed this first Chrome bug on my desktop, and the second is
probably a dupe.
    BUG=chromium:619378,chromium:613912

    GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2073873002

    Review-Url: https://codereview.chromium.org/2073873002
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

[mtklein_C, 2016-06-21 19:03:22]

The CQ bit was checked by mtklein@chromium.org

[commit-bot: I haz the power, 2016-06-21 19:03:32]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2085023002/1

[commit-bot: I haz the power, 2016-06-21 19:03:41]

Description was changed from

==========
Cherry-pick 875e13ca0 to M52.

TBR=

Original description:
    Simplify mask/clip intersection, making sure to explicitly check for an
empty mask.

    Previously we were only asserting the mask wasn't empty, which isn't
necessarily true when we're given pathological float coordinates like +Inf or
NaN.

    A local run of nanobench --match text_ was not able to show this is faster
or slower.

    This patch fixed this first Chrome bug on my desktop, and the second is
probably a dupe.
    BUG=chromium:619378,chromium:613912

    GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2073873002

    Review-Url: https://codereview.chromium.org/2073873002
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

to

==========
Cherry-pick 875e13ca0 to M52.

TBR=

Original description:
    Simplify mask/clip intersection, making sure to explicitly check for an
empty mask.

    Previously we were only asserting the mask wasn't empty, which isn't
necessarily true when we're given pathological float coordinates like +Inf or
NaN.

    A local run of nanobench --match text_ was not able to show this is faster
or slower.

    This patch fixed this first Chrome bug on my desktop, and the second is
probably a dupe.
    BUG=chromium:619378,chromium:613912

    GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2073873002

    Review-Url: https://codereview.chromium.org/2073873002
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

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

[commit-bot: I haz the power, 2016-06-21 19:03:42]

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