Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Side by Side Diff: content/renderer/media/webmediaplayer_util.cc

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/renderer/media/webmediaplayer_util.h" 5 #include "content/renderer/media/webmediaplayer_util.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include "media/base/media_keys.h" 9 #include "media/base/media_keys.h"
10 #include "third_party/WebKit/public/web/WebMediaPlayerClient.h" 10 #include "third_party/WebKit/public/web/WebMediaPlayerClient.h"
11 11
12 namespace webkit_media { 12 namespace content {
13 13
14 // Compile asserts shared by all platforms. 14 // Compile asserts shared by all platforms.
15 15
16 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ 16 #define COMPILE_ASSERT_MATCHING_ENUM(name) \
17 COMPILE_ASSERT( \ 17 COMPILE_ASSERT( \
18 static_cast<int>(WebKit::WebMediaPlayerClient::MediaKeyErrorCode ## name) == \ 18 static_cast<int>(WebKit::WebMediaPlayerClient::MediaKeyErrorCode ## name) == \
19 static_cast<int>(media::MediaKeys::k ## name ## Error), \ 19 static_cast<int>(media::MediaKeys::k ## name ## Error), \
20 mismatching_enums) 20 mismatching_enums)
21 COMPILE_ASSERT_MATCHING_ENUM(Unknown); 21 COMPILE_ASSERT_MATCHING_ENUM(Unknown);
22 COMPILE_ASSERT_MATCHING_ENUM(Client); 22 COMPILE_ASSERT_MATCHING_ENUM(Client);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 // Webkit (see http://crbug.com/124486). 70 // Webkit (see http://crbug.com/124486).
71 return WebKit::WebMediaPlayer::NetworkStateDecodeError; 71 return WebKit::WebMediaPlayer::NetworkStateDecodeError;
72 72
73 case media::PIPELINE_OK: 73 case media::PIPELINE_OK:
74 case media::PIPELINE_STATUS_MAX: 74 case media::PIPELINE_STATUS_MAX:
75 NOTREACHED() << "Unexpected status! " << error; 75 NOTREACHED() << "Unexpected status! " << error;
76 } 76 }
77 return WebKit::WebMediaPlayer::NetworkStateFormatError; 77 return WebKit::WebMediaPlayer::NetworkStateFormatError;
78 } 78 }
79 79
80 } // namespace webkit_media 80 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698