Mozart: Specify texture origin explicitly.

mojo/ui/gl_renderer.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/ui/gl_renderer.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 #include <GLES2/gl2.h>
@@ skipping 27 matching lines @@
       gl_context_->MakeCurrent();
       glWaitSyncPointCHROMIUM(texture_info.second);
       return std::move(texture_info.first);
     }
   }
 
   return std::unique_ptr<GLTexture>(new GLTexture(gl_context_, requested_size));
 }
 
 mojo::gfx::composition::ResourcePtr GLRenderer::BindTextureResource(
-    std::unique_ptr<GLTexture> texture) {
+    std::unique_ptr<GLTexture> texture,
+    mojo::gfx::composition::MailboxTextureResource::Origin origin) {
   if (!gl_context_)
     return nullptr;
 
   // Produce the texture.
   gl_context_->MakeCurrent();
   glBindTexture(GL_TEXTURE_2D, texture->texture_id());
   GLbyte mailbox[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox);
   glProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox);
   glBindTexture(GL_TEXTURE_2D, 0);
   GLuint sync_point = glInsertSyncPointCHROMIUM();
 
   // Populate the resource description.
   auto resource = mojo::gfx::composition::Resource::New();
   resource->set_mailbox_texture(
       mojo::gfx::composition::MailboxTextureResource::New());
   resource->get_mailbox_texture()->mailbox_name.resize(sizeof(mailbox));
   memcpy(resource->get_mailbox_texture()->mailbox_name.data(), mailbox,
          sizeof(mailbox));
   resource->get_mailbox_texture()->sync_point = sync_point;
   resource->get_mailbox_texture()->size = texture->size().Clone();
+  resource->get_mailbox_texture()->origin = origin;
   resource->get_mailbox_texture()->callback =
       (new GLTextureReleaser(
            weak_factory_.GetWeakPtr(),
            GLRecycledTextureInfo(std::move(texture), sync_point)))
           ->StrongBind()
           .Pass();
 
   bound_textures_++;
   DVLOG(2) << "bind: bound_textures=" << bound_textures_;
   return resource;
@@ skipping 72 matching lines @@
 
 void GLRenderer::GLTextureReleaser::Release(bool recyclable) {
   if (provider_) {
     provider_->ReleaseTexture(std::move(texture_info_), recyclable);
     provider_.reset();
   }
 }
 
 }  // namespace ui
 }  // namespace mojo