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

Unified Diff: ui/ozone/platform/drm/gpu/screen_manager.cc

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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/drm/gpu/mock_drm_device.cc ('k') | ui/ozone/platform/drm/host/drm_display_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/screen_manager.cc
diff --git a/ui/ozone/platform/drm/gpu/screen_manager.cc b/ui/ozone/platform/drm/gpu/screen_manager.cc
index 8d4bdd7a9e551afb2369bb825074c70851a7cd13..09e9b425728eedb9df82d050c069779659b8c555 100644
--- a/ui/ozone/platform/drm/gpu/screen_manager.cc
+++ b/ui/ozone/platform/drm/gpu/screen_manager.cc
@@ -95,8 +95,8 @@ void ScreenManager::AddDisplayController(const scoped_refptr<DrmDevice>& drm,
HardwareDisplayControllers::iterator it = FindDisplayController(drm, crtc);
// TODO(dnicoara): Turn this into a DCHECK when async display configuration is
// properly supported. (When there can't be a race between forcing initial
- // display configuration in ScreenManager and NativeDisplayDelegate creating
- // the display controllers.)
+ // display configuration in ScreenManager and display::NativeDisplayDelegate
+ // creating the display controllers.)
if (it != controllers_.end()) {
LOG(WARNING) << "Display controller (crtc=" << crtc << ") already present.";
return;
@@ -343,7 +343,7 @@ OverlayPlane ScreenManager::GetModesetBuffer(
return *primary;
}
- gfx::BufferFormat format = ui::DisplaySnapshot::PrimaryFormat();
+ gfx::BufferFormat format = display::DisplaySnapshot::PrimaryFormat();
scoped_refptr<DrmDevice> drm = controller->GetAllocationDrmDevice();
uint32_t fourcc_format = ui::GetFourCCFormatForFramebuffer(format);
scoped_refptr<ScanoutBuffer> buffer =
« no previous file with comments | « ui/ozone/platform/drm/gpu/mock_drm_device.cc ('k') | ui/ozone/platform/drm/host/drm_display_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698