Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ui / ozone / public / surface_factory_ozone.cc

diff --git a/src/ui/ozone/public/surface_factory_ozone.cc b/src/ui/ozone/public/surface_factory_ozone.cc
index 9d33be4..e6fd1a3 100644 (file)
--- a/src/ui/ozone/public/surface_factory_ozone.cc
+++ b/src/ui/ozone/public/surface_factory_ozone.cc
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 
 #include "base/command_line.h"
+#include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 
@@ -16,17 +17,17 @@ namespace ui {
 SurfaceFactoryOzone* SurfaceFactoryOzone::impl_ = NULL;
 
 SurfaceFactoryOzone::SurfaceFactoryOzone() {
-  CHECK(!impl_) << "There should only be a single SurfaceFactoryOzone.";
+  DCHECK(!impl_) << "There should only be a single SurfaceFactoryOzone.";
   impl_ = this;
 }
 
 SurfaceFactoryOzone::~SurfaceFactoryOzone() {
-  CHECK_EQ(impl_, this);
+  DCHECK_EQ(impl_, this);
   impl_ = NULL;
 }
 
 SurfaceFactoryOzone* SurfaceFactoryOzone::GetInstance() {
-  CHECK(impl_) << "No SurfaceFactoryOzone implementation set.";
+  DCHECK(impl_) << "No SurfaceFactoryOzone implementation set.";
   return impl_;
 }
 
@@ -56,20 +57,23 @@ ui::OverlayCandidatesOzone* SurfaceFactoryOzone::GetOverlayCandidates(
   return NULL;
 }
 
-void SurfaceFactoryOzone::ScheduleOverlayPlane(
-    gfx::AcceleratedWidget w,
+scoped_refptr<ui::NativePixmap> SurfaceFactoryOzone::CreateNativePixmap(
+    gfx::Size size,
+    BufferFormat format) {
+  return NULL;
+}
+
+bool SurfaceFactoryOzone::ScheduleOverlayPlane(
+    gfx::AcceleratedWidget widget,
     int plane_z_order,
     gfx::OverlayTransform plane_transform,
-    ui::NativeBufferOzone buffer,
+    scoped_refptr<NativePixmap> buffer,
     const gfx::Rect& display_bounds,
-    gfx::RectF crop_rect) {
-  NOTREACHED();
+    const gfx::RectF& crop_rect) {
+  return false;
 }
 
-ui::NativeBufferOzone SurfaceFactoryOzone::CreateNativeBuffer(
-    gfx::Size size,
-    BufferFormat format) {
-  return 0;
+bool SurfaceFactoryOzone::CanShowPrimaryPlaneAsOverlay() {
+  return false;
 }
-
 }  // namespace ui