ui/compositor: use cc/ directly instead of webkit

ui/compositor: use cc/ directly instead of webkit

BUG=159278
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=169152

[danakj, 2012-11-21 01:12:21]

cc LGTM

[Ben Goodger (Google), 2012-11-21 03:29:35]

lgtm

[commit-bot: I haz the power, 2012-11-21 07:59:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/11415089/5001

[commit-bot: I haz the power, 2012-11-21 08:25:20]

Sorry for I got bad news for ya.
Compile failed with a clobber build on mac_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-11-21 19:37:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/11415089/10001

[piman, 2012-11-21 20:16:35]

Dana: PTAL to cc/
Because cc/ doesn't (yet) compile with chromium_code=1, we didn't turn on some
warnings, but now that we include headers in ui/compositor (which has
chromium_code=1) some warnings show up. I made a few functionally-noop changes
to fix those.

[danakj, 2012-11-21 20:23:58]

https://codereview.chromium.org/11415089/diff/14002/cc/proxy.h
File cc/proxy.h (left):

https://codereview.chromium.org/11415089/diff/14002/cc/proxy.h#oldcode123
cc/proxy.h:123: : m_proxy(proxy)
Just #ifndef around this and the private variable instead? (Prefer not a second
version of the class in an else if we can help it).

[piman, 2012-11-21 20:44:06]

https://codereview.chromium.org/11415089/diff/14002/cc/proxy.h
File cc/proxy.h (left):

https://codereview.chromium.org/11415089/diff/14002/cc/proxy.h#oldcode123
cc/proxy.h:123: : m_proxy(proxy)
On 2012/11/21 20:23:59, danakj wrote:
> Just #ifndef around this and the private variable instead? (Prefer not a
second
> version of the class in an else if we can help it).

If you prefer, but I found that this version was a lot more readable:
- if debug, this class keeps state and check things
- if release, this class does nothing

The alternative is a preprocessor statement nearly every other line (I'm even a
little afraid clang will complain about the |proxy| parameter being unused in
the constructor if I don't ifdef it out too).

[danakj, 2012-11-21 20:52:23]

https://codereview.chromium.org/11415089/diff/14002/cc/proxy.h
File cc/proxy.h (left):

https://codereview.chromium.org/11415089/diff/14002/cc/proxy.h#oldcode123
cc/proxy.h:123: : m_proxy(proxy)
On 2012/11/21 20:44:06, piman wrote:
> On 2012/11/21 20:23:59, danakj wrote:
> > Just #ifndef around this and the private variable instead? (Prefer not a
> second
> > version of the class in an else if we can help it).
> 
> If you prefer, but I found that this version was a lot more readable:
> - if debug, this class keeps state and check things
> - if release, this class does nothing
> 
> The alternative is a preprocessor statement nearly every other line (I'm even
a
> little afraid clang will complain about the |proxy| parameter being unused in
> the constructor if I don't ifdef it out too).

Ah, right. I had noticed the parameter in the #else case, but it's without a var
name of course.. blah. Both are kinda ugly. What you've done will work. cc/ LGTM

[commit-bot: I haz the power, 2012-11-21 20:58:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/11415089/14002

[commit-bot: I haz the power, 2012-11-21 23:07:02]

Change committed as 169152