Explicitly represent "no surface ID yet" in WMPI.

media/blink/webmediaplayer_impl.cc

 // Copyright 2013 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 "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <string>
@@ skipping 323 matching lines @@
 #if defined(OS_ANDROID)
   return true;
 #else
   return false;
 #endif
 }
 
 void WebMediaPlayerImpl::EnableOverlay() {
   overlay_enabled_ = true;
   if (surface_manager_) {
+    overlay_surface_id_.reset();
     surface_created_cb_.Reset(
         base::Bind(&WebMediaPlayerImpl::OnSurfaceCreated, AsWeakPtr()));
     surface_manager_->CreateFullscreenSurface(pipeline_metadata_.natural_size,
                                               surface_created_cb_.callback());
   }
 
   if (decoder_requires_restart_for_overlay_)
     ScheduleRestart();
 }
 
 void WebMediaPlayerImpl::DisableOverlay() {
   overlay_enabled_ = false;
   surface_created_cb_.Cancel();
   overlay_surface_id_ = SurfaceManager::kNoSurfaceID;
 
   if (decoder_requires_restart_for_overlay_)
     ScheduleRestart();
   else if (!set_surface_cb_.is_null())
-    set_surface_cb_.Run(overlay_surface_id_);
+    set_surface_cb_.Run(*overlay_surface_id_);
 }
 
 void WebMediaPlayerImpl::EnteredFullscreen() {
   // |force_video_overlays_| implies that we're already in overlay mode, so take
   // no action here.  Otherwise, switch to an overlay if it's allowed and if
   // it will display properly.
   if (!force_video_overlays_ && enable_fullscreen_video_overlays_ &&
       DoesOverlaySupportMetadata()) {
     EnableOverlay();
   }
@@ skipping 1328 matching lines @@
   //
   // If |decoder_requires_restart_for_overlay| is true, we must restart the
   // pipeline for fullscreen transitions. The decoder is unable to switch
   // surfaces otherwise. If false, we simply need to tell the decoder about the
   // new surface and it will handle things seamlessly.
   decoder_requires_restart_for_overlay_ = decoder_requires_restart_for_overlay;
   set_surface_cb_ = set_surface_cb;
 
   // If we're waiting for the surface to arrive, OnSurfaceCreated() will be
   // called later when it arrives; so do nothing for now.
-  if (overlay_enabled_ && overlay_surface_id_ == SurfaceManager::kNoSurfaceID)
+  if (!overlay_surface_id_)
     return;
 
-  OnSurfaceCreated(overlay_surface_id_);
+  OnSurfaceCreated(*overlay_surface_id_);
 }
 
 std::unique_ptr<Renderer> WebMediaPlayerImpl::CreateRenderer() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   if (force_video_overlays_)
     EnableOverlay();
 
   RequestSurfaceCB request_surface_cb;
 #if defined(OS_ANDROID)
@@ skipping 670 matching lines @@
 
   if (is_encrypted_)
     UMA_HISTOGRAM_VIDEO_HEIGHT("Media.VideoHeight.Initial.EME", height);
 
   UMA_HISTOGRAM_VIDEO_HEIGHT("Media.VideoHeight.Initial.All", height);
 }
 
 #undef UMA_HISTOGRAM_VIDEO_HEIGHT
 
 }  // namespace media