Merge Compositor and CompositorCC

Merge Compositor and CompositorCC

This also removes a few unused calls.

BUG=None
TEST=compiles, tests pass


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

[Ben Goodger (Google), 2012-01-28 00:40:13]

LGTM

https://chromiumcodereview.appspot.com/9297041/diff/1/content/browser/rendere...
File content/browser/renderer_host/accelerated_surface_container_linux.h
(right):

https://chromiumcodereview.appspot.com/9297041/diff/1/content/browser/rendere...
content/browser/renderer_host/accelerated_surface_container_linux.h:19: class
AcceleratedSurfaceContainerLinux: public ui::Texture {
nit: space before :

https://chromiumcodereview.appspot.com/9297041/diff/1/ui/views/widget/native_...
File ui/views/widget/native_widget_gtk.cc (right):

https://chromiumcodereview.appspot.com/9297041/diff/1/ui/views/widget/native_...
ui/views/widget/native_widget_gtk.cc:652: if
(View::get_use_acceleration_when_possible()) {
I bet not, and this could probablybe removed.

[piman, 2012-01-28 01:50:35]

Couple of build fixes too. I'll wait for the trybot results and then kick it to
the cq, unless you scream first.

https://chromiumcodereview.appspot.com/9297041/diff/1/content/browser/rendere...
File content/browser/renderer_host/accelerated_surface_container_linux.h
(right):

https://chromiumcodereview.appspot.com/9297041/diff/1/content/browser/rendere...
content/browser/renderer_host/accelerated_surface_container_linux.h:19: class
AcceleratedSurfaceContainerLinux: public ui::Texture {
On 2012/01/28 00:40:13, Ben Goodger (Google) wrote:
> nit: space before :

Done.

https://chromiumcodereview.appspot.com/9297041/diff/1/ui/views/widget/native_...
File ui/views/widget/native_widget_gtk.cc (right):

https://chromiumcodereview.appspot.com/9297041/diff/1/ui/views/widget/native_...
ui/views/widget/native_widget_gtk.cc:652: if
(View::get_use_acceleration_when_possible()) {
On 2012/01/28 00:40:13, Ben Goodger (Google) wrote:
> I bet not, and this could probablybe removed.

Done.

[Ben Goodger (Google), 2012-01-28 04:26:07]

Nope. SG.

On Fri, Jan 27, 2012 at 5:50 PM, <piman@chromium.org> wrote:

> Couple of build fixes too. I'll wait for the trybot results and then kick
> it to
> the cq, unless you scream first.
>
>
>
> https://chromiumcodereview.**appspot.com/9297041/diff/1/**
>
content/browser/renderer_host/**accelerated_surface_container_**linux.h<https://chromiumcodereview.appspot.com/9297041/diff/1/content/browser/renderer_host/accelerated_surface_container_linux.h>
> File content/browser/renderer_host/**accelerated_surface_container_**
> linux.h
> (right):
>
> https://chromiumcodereview.**appspot.com/9297041/diff/1/**
> content/browser/renderer_host/**accelerated_surface_container_**
>
linux.h#newcode19<https://chromiumcodereview.appspot.com/9297041/diff/1/content/browser/renderer_host/accelerated_surface_container_linux.h#newcode19>
> content/browser/renderer_host/**accelerated_surface_container_**
> linux.h:19:
> class AcceleratedSurfaceContainerLin**ux: public ui::Texture {
> On 2012/01/28 00:40:13, Ben Goodger (Google) wrote:
>
>> nit: space before :
>>
>
> Done.
>
>
> https://chromiumcodereview.**appspot.com/9297041/diff/1/ui/**
>
views/widget/native_widget_**gtk.cc<https://chromiumcodereview.appspot.com/9297041/diff/1/ui/views/widget/native_widget_gtk.cc>
> File ui/views/widget/native_widget_**gtk.cc (right):
>
> https://chromiumcodereview.**appspot.com/9297041/diff/1/ui/**
>
views/widget/native_widget_**gtk.cc#newcode652<https://chromiumcodereview.appspot.com/9297041/diff/1/ui/views/widget/native_widget_gtk.cc#newcode652>
> ui/views/widget/native_widget_**gtk.cc:652: if
> (View::get_use_acceleration_**when_possible()) {
> On 2012/01/28 00:40:13, Ben Goodger (Google) wrote:
>
>> I bet not, and this could probablybe removed.
>>
>
> Done.
>
>
https://chromiumcodereview.**appspot.com/9297041/<https://chromiumcodereview....
>

[commit-bot: I haz the power, 2012-01-29 17:41:58]

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

[commit-bot: I haz the power, 2012-01-29 17:42:06]

Can't apply patch for file ui/gfx/compositor/layer.cc.
While running patch -p1 --forward --force;
patching file ui/gfx/compositor/layer.cc
Hunk #1 succeeded at 23 (offset 1 line).
Hunk #2 FAILED at 220.
Hunk #3 FAILED at 248.
Hunk #4 succeeded at 482 (offset 17 lines).
2 out of 4 hunks FAILED -- saving rejects to file ui/gfx/compositor/layer.cc.rej

[commit-bot: I haz the power, 2012-01-29 18:06:40]

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

[commit-bot: I haz the power, 2012-01-29 21:22:16]

Change committed as 119645