From c4d866d7cb9d3826d6bf568ed8805672bf16020f Mon Sep 17 00:00:00 2001
From: "fischman@chromium.org"
 <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 31 Jul 2012 19:48:35 +0000
Subject: Remove a bunch of dead fields found by Scythe.

Review URL: https://chromiumcodereview.appspot.com/10825108

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149251 0039d316-1c4b-4281-b951-d872f2087c98
---
 media/webm/webm_cluster_parser.h | 4 ----
 media/webm/webm_stream_parser.cc | 2 +-
 media/webm/webm_tracks_parser.cc | 5 ++---
 media/webm/webm_tracks_parser.h  | 6 ++----
 4 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'media/webm')

diff --git a/media/webm/webm_cluster_parser.h b/media/webm/webm_cluster_parser.h
index 926e6a1..bbcbf37 100644
--- a/media/webm/webm_cluster_parser.h
+++ b/media/webm/webm_cluster_parser.h
@@ -19,10 +19,6 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
 
-  // Size is defined by the WebM encryption specification.
-  // http://wiki.webmproject.org/encryption/webm-encryption-rfc
-  static const int kIvSize = 8;
-
   WebMClusterParser(int64 timecode_scale,
                     int audio_track_num,
                     int video_track_num,
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc
index f27f7e7..5119d1e 100644
--- a/media/webm/webm_stream_parser.cc
+++ b/media/webm/webm_stream_parser.cc
@@ -327,7 +327,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
   cur_size -= result;
   bytes_parsed += result;
 
-  WebMTracksParser tracks_parser(info_parser.timecode_scale());
+  WebMTracksParser tracks_parser;
   result = tracks_parser.Parse(cur, cur_size);
 
   if (result <= 0)
diff --git a/media/webm/webm_tracks_parser.cc b/media/webm/webm_tracks_parser.cc
index 77cb0d0..29c8f2f 100644
--- a/media/webm/webm_tracks_parser.cc
+++ b/media/webm/webm_tracks_parser.cc
@@ -16,9 +16,8 @@ namespace media {
 static const int kWebMTrackTypeVideo = 1;
 static const int kWebMTrackTypeAudio = 2;
 
-WebMTracksParser::WebMTracksParser(int64 timecode_scale)
-    : timecode_scale_(timecode_scale),
-      track_type_(-1),
+WebMTracksParser::WebMTracksParser()
+    : track_type_(-1),
       track_num_(-1),
       audio_track_num_(-1),
       video_track_num_(-1) {
diff --git a/media/webm/webm_tracks_parser.h b/media/webm/webm_tracks_parser.h
index 8b8cb32..ec7b790 100644
--- a/media/webm/webm_tracks_parser.h
+++ b/media/webm/webm_tracks_parser.h
@@ -16,7 +16,7 @@ namespace media {
 // Parser for WebM Tracks element.
 class WebMTracksParser : public WebMParserClient {
  public:
-  explicit WebMTracksParser(int64 timecode_scale);
+  explicit WebMTracksParser();
   virtual ~WebMTracksParser();
 
   // Parses a WebM Tracks element in |buf|.
@@ -41,8 +41,6 @@ class WebMTracksParser : public WebMParserClient {
   virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE;
   virtual bool OnString(int id, const std::string& str) OVERRIDE;
 
-  int64 timecode_scale_;
-
   int64 track_type_;
   int64 track_num_;
   scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_;
@@ -53,7 +51,7 @@ class WebMTracksParser : public WebMParserClient {
   int64 video_track_num_;
   scoped_ptr<WebMContentEncodingsClient> video_content_encodings_client_;
 
-  DISALLOW_IMPLICIT_CONSTRUCTORS(WebMTracksParser);
+  DISALLOW_COPY_AND_ASSIGN(WebMTracksParser);
 };
 
 }  // namespace media
-- 
cgit v1.1