| Index: ui/ozone/platform/dri/dri_surface_factory.cc
|
| diff --git a/ui/ozone/platform/dri/dri_surface_factory.cc b/ui/ozone/platform/dri/dri_surface_factory.cc
|
| index d497b39b3bb6d2060b67ff1a950fb4690b0dfcf7..c7a4ad5e79f1fa486ccd68cff6902114b91d713b 100644
|
| --- a/ui/ozone/platform/dri/dri_surface_factory.cc
|
| +++ b/ui/ozone/platform/dri/dri_surface_factory.cc
|
| @@ -91,14 +91,6 @@ void DriSurfaceFactory::ShutdownHardware() {
|
| state_ = UNINITIALIZED;
|
| }
|
|
|
| -gfx::AcceleratedWidget DriSurfaceFactory::GetAcceleratedWidget() {
|
| - CHECK(state_ != FAILED);
|
| -
|
| - // We're not using 0 since other code assumes that a 0 AcceleratedWidget is an
|
| - // invalid widget.
|
| - return ++allocated_widgets_;
|
| -}
|
| -
|
| scoped_ptr<ui::SurfaceOzoneCanvas> DriSurfaceFactory::CreateCanvasForWidget(
|
| gfx::AcceleratedWidget w) {
|
| CHECK(state_ == INITIALIZED);
|
| @@ -115,6 +107,14 @@ bool DriSurfaceFactory::LoadEGLGLES2Bindings(
|
| return false;
|
| }
|
|
|
| +gfx::AcceleratedWidget DriSurfaceFactory::GetAcceleratedWidget() {
|
| + CHECK(state_ != FAILED);
|
| +
|
| + // We're not using 0 since other code assumes that a 0 AcceleratedWidget is an
|
| + // invalid widget.
|
| + return ++allocated_widgets_;
|
| +}
|
| +
|
| gfx::Size DriSurfaceFactory::GetWidgetSize(gfx::AcceleratedWidget w) {
|
| base::WeakPtr<HardwareDisplayController> controller =
|
| screen_manager_->GetDisplayController(w);
|
|
|