Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / mojo / services / surfaces / surfaces_impl.cc

diff --git a/src/mojo/services/surfaces/surfaces_impl.cc b/src/mojo/services/surfaces/surfaces_impl.cc
index b05e16a..52a1efe 100644 (file)
--- a/src/mojo/services/surfaces/surfaces_impl.cc
+++ b/src/mojo/services/surfaces/surfaces_impl.cc
@@ -26,10 +26,6 @@ SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager,
 SurfacesImpl::~SurfacesImpl() {
 }
 
-void SurfacesImpl::OnConnectionEstablished() {
-  client()->SetIdNamespace(id_namespace_);
-}
-
 void SurfacesImpl::CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) {
   cc::SurfaceId cc_id = id.To<cc::SurfaceId>();
   if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) {
@@ -44,10 +40,14 @@ void SurfacesImpl::SubmitFrame(SurfaceIdPtr id, FramePtr frame_ptr) {
   cc::SurfaceId cc_id = id.To<cc::SurfaceId>();
   if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) {
     // Bad message, do something bad to the caller?
-    NOTREACHED();
+    LOG(FATAL) << "Received frame for id " << cc_id.id << " namespace "
+               << cc::SurfaceIdAllocator::NamespaceForId(cc_id)
+               << " should be namespace " << id_namespace_;
     return;
   }
-  factory_.SubmitFrame(id.To<cc::SurfaceId>(), mojo::ConvertTo(frame_ptr));
+  factory_.SubmitFrame(id.To<cc::SurfaceId>(),
+                       frame_ptr.To<scoped_ptr<cc::CompositorFrame> >(),
+                       base::Closure());
   client_->FrameSubmitted();
 }
 
@@ -69,7 +69,9 @@ void SurfacesImpl::CreateGLES2BoundSurface(CommandBufferPtr gles2_client,
   cc::SurfaceId cc_id = id.To<cc::SurfaceId>();
   if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) {
     // Bad message, do something bad to the caller?
-    NOTREACHED();
+    LOG(FATAL) << "Received request for id " << cc_id.id << " namespace "
+               << cc::SurfaceIdAllocator::NamespaceForId(cc_id)
+               << " should be namespace " << id_namespace_;
     return;
   }
   if (!display_) {
@@ -93,4 +95,17 @@ scoped_ptr<cc::OutputSurface> SurfacesImpl::CreateOutputSurface() {
       new ContextProviderMojo(command_buffer_handle_.Pass())));
 }
 
+void SurfacesImpl::DisplayDamaged() {
+}
+
+void SurfacesImpl::DidSwapBuffers() {
+}
+
+void SurfacesImpl::DidSwapBuffersComplete() {
+}
+
+void SurfacesImpl::CommitVSyncParameters(base::TimeTicks timebase,
+                                         base::TimeDelta interval) {
+}
+
 }  // namespace mojo