Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / common / gpu / stream_texture_android.cc

diff --git a/src/content/common/gpu/stream_texture_android.cc b/src/content/common/gpu/stream_texture_android.cc
index 27dd0f7..eb7f3bb 100644 (file)
--- a/src/content/common/gpu/stream_texture_android.cc
+++ b/src/content/common/gpu/stream_texture_android.cc
@@ -53,7 +53,7 @@ bool StreamTexture::Create(
                                   GL_UNSIGNED_BYTE,
                                   true);
     texture_manager->SetLevelImage(
-        texture, GL_TEXTURE_EXTERNAL_OES, 0, gl_image);
+        texture, GL_TEXTURE_EXTERNAL_OES, 0, gl_image.get());
     return true;
   }
 
@@ -131,7 +131,7 @@ void StreamTexture::WillUseTexImage() {
       const gpu::gles2::TextureUnit& active_unit =
           state->texture_units[state->active_texture_unit];
       glBindTexture(GL_TEXTURE_EXTERNAL_OES,
-                    active_unit.bound_texture_external_oes
+                    active_unit.bound_texture_external_oes.get()
                         ? active_unit.bound_texture_external_oes->service_id()
                         : 0);
     }
@@ -202,6 +202,10 @@ void StreamTexture::ReleaseTexImage(unsigned target) {
   NOTREACHED();
 }
 
+bool StreamTexture::CopyTexImage(unsigned target) {
+  return false;
+}
+
 bool StreamTexture::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                                          int z_order,
                                          gfx::OverlayTransform transform,