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

Unified Diff: content/common/gpu/image_transport_surface_overlay_mac.mm

Issue 1421903006: ui/gl: Move GLImage into gl namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ozone demo Created 5 years, 2 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
Index: content/common/gpu/image_transport_surface_overlay_mac.mm
diff --git a/content/common/gpu/image_transport_surface_overlay_mac.mm b/content/common/gpu/image_transport_surface_overlay_mac.mm
index 81dcf54b957014c10268a28f2048f75c0fab1de1..770c482cb173b74c92a859010ab72788756e1218 100644
--- a/content/common/gpu/image_transport_surface_overlay_mac.mm
+++ b/content/common/gpu/image_transport_surface_overlay_mac.mm
@@ -661,7 +661,7 @@ bool ImageTransportSurfaceOverlayMac::SetBackbufferAllocation(bool allocated) {
bool ImageTransportSurfaceOverlayMac::ScheduleOverlayPlane(
int z_order,
gfx::OverlayTransform transform,
- gfx::GLImage* image,
+ gl::GLImage* image,
const gfx::Rect& bounds_rect,
const gfx::RectF& crop_rect) {
DCHECK_EQ(transform, gfx::OVERLAY_TRANSFORM_NONE);
@@ -669,8 +669,8 @@ bool ImageTransportSurfaceOverlayMac::ScheduleOverlayPlane(
return false;
linked_ptr<OverlayPlane> plane(new OverlayPlane(
- z_order, static_cast<gfx::GLImageIOSurface*>(image)->io_surface_id().id,
- static_cast<gfx::GLImageIOSurface*>(image)->io_surface(),
+ z_order, static_cast<gl::GLImageIOSurface*>(image)->io_surface_id().id,
+ static_cast<gl::GLImageIOSurface*>(image)->io_surface(),
ConvertRectToDIPF(scale_factor_, bounds_rect), crop_rect));
if (z_order == 0)
pending_root_plane_ = plane;

Powered by Google App Engine
This is Rietveld 408576698