Use local ids for Surfaces APIs that can only apply to local surfaces

sky/compositor/layer_host.cc

 // Copyright 2014 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 "sky/compositor/layer_host.h"
 
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/gpu/gl_context.h"
 #include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
 #include "mojo/skia/ganesh_context.h"
 #include "sky/compositor/layer.h"
 
 namespace sky {
 
 LayerHost::LayerHost(LayerHostClient* client)
     : client_(client),
-      state_(kWaitingForSurfaceService),
+      state_(kReadyForFrame),
       frame_requested_(false),
       surface_holder_(this, client->GetShell()),
       gl_context_owner_(client->GetShell()),
       ganesh_context_(gl_context()),
       resource_manager_(gl_context()),
       weak_factory_(this) {
 }
 
 LayerHost::~LayerHost() {
 }
 
 void LayerHost::SetNeedsAnimate() {
   if (frame_requested_)
     return;
   frame_requested_ = true;
   if (state_ == kReadyForFrame)
     BeginFrameSoon();
 }
 
 void LayerHost::SetRootLayer(scoped_refptr<Layer> layer) {
   DCHECK(!root_layer_.get());
   root_layer_ = layer;
   root_layer_->set_host(this);
 }
 
 void LayerHost::GetPixelsForTesting(std::vector<unsigned char>* pixels) {
   return root_layer_->GetPixelsForTesting(pixels);
 }
 
-void LayerHost::OnSurfaceConnectionCreated() {
-  DCHECK_EQ(state_, kWaitingForSurfaceService);
-  state_ = kReadyForFrame;
-  if (frame_requested_)
-    BeginFrameSoon();
-}
-
 void LayerHost::OnSurfaceIdAvailable(mojo::SurfaceIdPtr surface_id) {
   client_->OnSurfaceIdAvailable(surface_id.Pass());
 }
 
 void LayerHost::ReturnResources(
     mojo::Array<mojo::ReturnedResourcePtr> resources) {
   resource_manager_.ReturnResources(resources.Pass());
 }
 
 void LayerHost::BeginFrameSoon() {
@@ skipping 88 matching lines @@
 }
 
 void LayerHost::DidCompleteFrame() {
   DCHECK_EQ(state_, kWaitingForFrameAcknowldgement);
   state_ = kReadyForFrame;
   if (frame_requested_)
     BeginFrame();
 }
 
 }  // namespace sky