Revert 259154 "Remove HasAudio(), HasVideo(), GetInitialNaturalS..."

trunk/src/content/renderer/media/webmediaplayer_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 148 matching lines @@
   // This path is slower than notifying the compositor directly as it performs
   // more work and can trigger layouts. It should only be used in two cases:
   //   1) Major state changes (e.g., first frame available, run time error
   //      occured)
   //   2) Compositing not available
   void InvalidateOnMainThread();
 
   void OnPipelineSeek(media::PipelineStatus status);
   void OnPipelineEnded();
   void OnPipelineError(media::PipelineStatus error);
-  void OnPipelineMetadata(media::PipelineMetadata metadata);
-  void OnPipelinePrerollCompleted();
+  void OnPipelineBufferingState(
+      media::Pipeline::BufferingState buffering_state);
   void OnDemuxerOpened();
   void OnKeyAdded(const std::string& session_id);
   void OnKeyError(const std::string& session_id,
                   media::MediaKeys::KeyError error_code,
                   uint32 system_code);
   void OnKeyMessage(const std::string& session_id,
                     const std::vector<uint8>& message,
                     const std::string& default_url);
   void OnNeedKey(const std::string& type,
                  const std::vector<uint8>& init_data);
@@ skipping 73 matching lines @@
   scoped_refptr<media::MediaLog> media_log_;
   media::Pipeline pipeline_;
 
   // The currently selected key system. Empty string means that no key system
   // has been selected.
   std::string current_key_system_;
 
   // The LoadType passed in the |load_type| parameter of the load() call.
   LoadType load_type_;
 
-  // Cache of metadata for answering hasAudio(), hasVideo(), and naturalSize().
-  media::PipelineMetadata pipeline_metadata_;
-
   // Playback state.
   //
   // TODO(scherkus): we have these because Pipeline favours the simplicity of a
   // single "playback rate" over worrying about paused/stopped etc...  It forces
   // all clients to manage the pause+playback rate externally, but is that
   // really a bad thing?
   //
   // TODO(scherkus): since SetPlaybackRate(0) is asynchronous and we don't want
   // to hang the render thread during pause(), we record the time at the same
   // time we pause and then return that value in currentTime().  Otherwise our
@@ skipping 42 matching lines @@
   scoped_ptr<media::Demuxer> demuxer_;
   media::ChunkDemuxer* chunk_demuxer_;
 
   // Temporary for EME v0.1. In the future the init data type should be passed
   // through GenerateKeyRequest() directly from WebKit.
   std::string init_data_type_;
 
   // Video rendering members.
   VideoFrameCompositor compositor_;
   media::SkCanvasVideoRenderer skcanvas_video_renderer_;
+  gfx::Size natural_size_;
 
   // The compositor layer for displaying the video content when using composited
   // playback.
   scoped_ptr<webkit::WebLayerImpl> video_weblayer_;
 
   // Text track objects get a unique index value when they're created.
   int text_track_index_;
 
   // Manages decryption keys and decrypts encrypted frames.
   scoped_ptr<ProxyDecryptor> proxy_decryptor_;
 
   // Non-owned pointer to the CDM. Updated via calls to
   // setContentDecryptionModule().
   WebContentDecryptionModuleImpl* web_cdm_;
 
   media::DecryptorReadyCB decryptor_ready_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_