diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 03:29:37 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 03:29:37 +0000 |
| commit | eb5d608b4b2a345da0ae80097ecfc7e522301590 (patch) | |
| tree | 4471d19b8dbc00ca48944381910955d4cd22eed3 /webkit | |
| parent | 47c7ec8be8c6829d7973568fe453f46046c2e818 (diff) | |
| download | chromium_src-eb5d608b4b2a345da0ae80097ecfc7e522301590.zip chromium_src-eb5d608b4b2a345da0ae80097ecfc7e522301590.tar.gz chromium_src-eb5d608b4b2a345da0ae80097ecfc7e522301590.tar.bz2 | |
buffers.cc: replaced global TimeDelta constants with fully-inlined functions.
media_log.cc: replaced global AtomicSequenceNumber with LazyInstance.
BUG=94925
TEST=none
Review URL: http://codereview.chromium.org/9225001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/media/video_renderer_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/media/video_renderer_impl_unittest.cc | 4 | ||||
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/webkit/media/video_renderer_impl.cc b/webkit/media/video_renderer_impl.cc index 4663acc..7860f04 100644 --- a/webkit/media/video_renderer_impl.cc +++ b/webkit/media/video_renderer_impl.cc @@ -230,7 +230,7 @@ static void ConvertVideoFrameToBitmap( } VideoRendererImpl::VideoRendererImpl() - : last_frame_timestamp_(media::kNoTimestamp) { + : last_frame_timestamp_(media::kNoTimestamp()) { } VideoRendererImpl::~VideoRendererImpl() {} diff --git a/webkit/media/video_renderer_impl_unittest.cc b/webkit/media/video_renderer_impl_unittest.cc index 0bd95a7..3afe623 100644 --- a/webkit/media/video_renderer_impl_unittest.cc +++ b/webkit/media/video_renderer_impl_unittest.cc @@ -167,14 +167,14 @@ TEST_F(VideoRendererImplTest, SlowPaint_Smaller) { TEST_F(VideoRendererImplTest, FastPaint_NoTimestamp) { VideoFrame* video_frame = natural_frame(); - video_frame->SetTimestamp(media::kNoTimestamp); + video_frame->SetTimestamp(media::kNoTimestamp()); Paint(video_frame, fast_path_canvas(), kRed); EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas())); } TEST_F(VideoRendererImplTest, SlowPaint_NoTimestamp) { VideoFrame* video_frame = natural_frame(); - video_frame->SetTimestamp(media::kNoTimestamp); + video_frame->SetTimestamp(media::kNoTimestamp()); Paint(video_frame, slow_path_canvas(), kRed); EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas())); } diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index 4c6c92c..aa41171 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -480,7 +480,7 @@ float WebMediaPlayerImpl::duration() const { // Return positive infinity if the resource is unbounded. // http://www.whatwg.org/specs/web-apps/current-work/multipage/video.html#dom-media-duration - if (duration == media::kInfiniteDuration) + if (duration == media::kInfiniteDuration()) return std::numeric_limits<float>::infinity(); return static_cast<float>(duration.InSecondsF()); |