Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(834)

Unified Diff: ui/ozone/platform/dri/dri_surface_factory.cc

Issue 406093002: ozone: Remove GetAcceleratedWidget from SurfaceFactoryOzone (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/dri/dri_surface_factory.h ('k') | ui/ozone/platform/dri/dri_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « ui/ozone/platform/dri/dri_surface_factory.h ('k') | ui/ozone/platform/dri/dri_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698