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

Unified Diff: remoting/client/display/gl_render_layer.cc

Issue 2591363002: Adding drawable to CRD andorid and iOS gl rendering pipeline. (Closed)
Patch Set: More like GetZIndex. 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
Index: remoting/client/display/gl_render_layer.cc
diff --git a/remoting/client/display/gl_render_layer.cc b/remoting/client/display/gl_render_layer.cc
index 6fcb08cf6947575fb585a139e4fc397f1d691718..2b8d604cec47d142f297d12f08c3717396000d21 100644
--- a/remoting/client/display/gl_render_layer.cc
+++ b/remoting/client/display/gl_render_layer.cc
@@ -39,7 +39,7 @@ void PackDirtyRegion(uint8_t* dest,
} // namespace
-GlRenderLayer::GlRenderLayer(int texture_id, GlCanvas* canvas)
+GlRenderLayer::GlRenderLayer(int texture_id, base::WeakPtr<Canvas> canvas)
: texture_id_(texture_id), canvas_(canvas) {
texture_handle_ = CreateTexture();
buffer_handle_ = CreateBuffer(kVertices, sizeof(kVertices));
@@ -146,7 +146,7 @@ const uint8_t* GlRenderLayer::PrepareTextureBuffer(
return data;
}
- if (stride_multiple_of_bytes_per_pixel && canvas_->GetGlVersion() >= 3) {
+ if (stride_multiple_of_bytes_per_pixel && canvas_->GetVersion() >= 3) {
glPixelStorei(GL_UNPACK_ROW_LENGTH, stride / kBytesPerPixel);
*should_reset_row_length = true;
return data;

Powered by Google App Engine
This is Rietveld 408576698