fixup! [NUI] NUI implementation for |SkiaRenderer|

Replacing gl_image_egl with scoped_egl_image.

Change-Id: Iaa7f75b1704d9d156db00f68e82d092c7c156867
Signed-off-by: Akshay Kanagali <a.kanagali@partner.samsung.com>

diff --git a/tizen_src/chromium_impl/components/viz/service/display_embedder/skia_output_device_offscreen_tbm.cc b/tizen_src/chromium_impl/components/viz/service/display_embedder/skia_output_device_offscreen_tbm.cc
index a1e20dbb13a3afa5226fb0be22d92dae08fa2df6..e0aaea9ad47b24732c706e29975fc11f1ab8e31f 100644 (file)
--- a/tizen_src/chromium_impl/components/viz/service/display_embedder/skia_output_device_offscreen_tbm.cc
+++ b/tizen_src/chromium_impl/components/viz/service/display_embedder/skia_output_device_offscreen_tbm.cc
@@ -8,7 +8,6 @@
 #include "third_party/skia/include/core/SkSurface.h"
 
 #include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_image_egl.h"
 
 namespace viz {
 
@@ -34,30 +33,25 @@ void SkiaOutputDeviceOffscreenTBM::EnsureBackbuffer() {
       size_.width(), size_.height(), TBM_FORMAT_ARGB8888);
 
   EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
-  image_egl_ = base::MakeRefCounted<gl::GLImageEGL>(size_);
-  if (!image_egl_->Initialize(EGL_NATIVE_SURFACE_TIZEN,
-                              static_cast<EGLClientBuffer>(tbm_surface_),
-                              attrs, 0, 0)) {
-    return;
-  }
+  egl_image_ =
+      gl::MakeScopedEGLImage(EGL_NO_CONTEXT, EGL_NATIVE_SURFACE_TIZEN,
+                             static_cast<EGLClientBuffer>(tbm_surface_), attrs);
 
   GLuint texture_id = 0;
   glGenTextures(1, &texture_id);
   glBindTexture(GL_TEXTURE_2D, texture_id);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-  image_egl_->BindTexImage(GL_TEXTURE_2D);
 
-  gpu::GetGrBackendTexture(context_state_->feature_info(), GL_TEXTURE_2D,
-                           size_, texture_id, RGBA_8888,
+  glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, egl_image_.get());
+
+  gpu::GetGrBackendTexture(context_state_->feature_info(), GL_TEXTURE_2D, size_,
+                           texture_id, kRGBA_8888_SkColorType,
                            context_state_->gr_context()->threadSafeProxy(),
                            &backend_texture_);
 }
 
 void SkiaOutputDeviceOffscreenTBM::DiscardBackbuffer() {
-  if (image_egl_)
-    image_egl_.release();
-
   if (tbm_surface_) {
     if (tbm_surface_destroy(tbm_surface_) != TBM_SURFACE_ERROR_NONE)
       LOG(ERROR) << "Failed to destroy tbm surface.";

diff --git a/tizen_src/chromium_impl/components/viz/service/display_embedder/skia_output_device_offscreen_tbm.h b/tizen_src/chromium_impl/components/viz/service/display_embedder/skia_output_device_offscreen_tbm.h
index b600f4aa4360c8c05e75a97667c11aff2a1ea570..a816992974c87f6e4dddd6283547ee5cc43570f2 100644 (file)
--- a/tizen_src/chromium_impl/components/viz/service/display_embedder/skia_output_device_offscreen_tbm.h
+++ b/tizen_src/chromium_impl/components/viz/service/display_embedder/skia_output_device_offscreen_tbm.h
@@ -7,10 +7,7 @@
 
 #include "components/viz/service/display_embedder/skia_output_device_offscreen.h"
 #include "ui/gfx/tbm_buffer_handle.h"
-
-namespace gl {
-class GLImageEGL;
-}
+#include "ui/gl/scoped_egl_image.h"
 
 namespace viz {
 
@@ -34,7 +31,7 @@ class SkiaOutputDeviceOffscreenTBM : public SkiaOutputDeviceOffscreen {
 
  private:
   tbm_surface_h tbm_surface_ = 0;
-  scoped_refptr<gl::GLImageEGL> image_egl_;
+  gl::ScopedEGLImage egl_image_;
 };
 
 }  // namespace viz