fix casting issue with or operator

fix casting issue with or operator

TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true

Committed: http://code.google.com/p/skia/source/detail?r=15011

[djsollen, 2014-05-30 20:55:56]

The CQ bit was checked by djsollen@google.com

[djsollen, 2014-05-30 20:55:58]

The CQ bit was unchecked by djsollen@google.com

[djsollen, 2014-05-30 20:56:38]

The CQ bit was checked by djsollen@google.com

[reed1, 2014-05-30 20:57:31]

lgtm

[commit-bot: I haz the power, 2014-05-30 20:58:03]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/djsollen@google.com/305253002/10001

[epoger, 2014-05-30 21:00:41]

Do you think this will fix the red we see on the buildbots right now?

[djsollen, 2014-05-30 21:02:48]

On 2014/05/30 21:00:41, epoger wrote:
> Do you think this will fix the red we see on the buildbots right now?

Sort of.  It will fix the current segfault but mtklein's change introduces an
assertion on debug builds.

[djsollen, 2014-05-30 21:04:39]

The CQ bit was unchecked by djsollen@google.com

[djsollen, 2014-05-30 21:04:43]

The CQ bit was checked by djsollen@google.com

[commit-bot: I haz the power, 2014-05-30 21:05:10]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/djsollen@google.com/305253002/10001

[djsollen, 2014-05-30 21:06:33]

The CQ bit was unchecked by djsollen@google.com

[djsollen, 2014-05-30 21:06:38]

The CQ bit was checked by djsollen@google.com

[commit-bot: I haz the power, 2014-05-30 21:06:59]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/djsollen@google.com/305253002/10001

[commit-bot: I haz the power, 2014-05-30 21:07:07]

Change committed as 15011