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

Side by Side Diff: webkit/glue/webmediaplayer_impl.cc

Issue 6026013: Revert 70267 - Refactor PipelineImpl to use CompositeFilter to manage Filter ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/glue/webmediaplayer_impl.h" 5 #include "webkit/glue/webmediaplayer_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS: 730 case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
731 case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD: 731 case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
732 // Format error. 732 // Format error.
733 SetNetworkState(WebMediaPlayer::FormatError); 733 SetNetworkState(WebMediaPlayer::FormatError);
734 break; 734 break;
735 735
736 case media::PIPELINE_ERROR_DECODE: 736 case media::PIPELINE_ERROR_DECODE:
737 case media::PIPELINE_ERROR_ABORT: 737 case media::PIPELINE_ERROR_ABORT:
738 case media::PIPELINE_ERROR_OUT_OF_MEMORY: 738 case media::PIPELINE_ERROR_OUT_OF_MEMORY:
739 case media::PIPELINE_ERROR_AUDIO_HARDWARE: 739 case media::PIPELINE_ERROR_AUDIO_HARDWARE:
740 case media::PIPELINE_ERROR_OPERATION_PENDING:
741 case media::PIPELINE_ERROR_INVALID_STATE:
742 // Decode error. 740 // Decode error.
743 SetNetworkState(WebMediaPlayer::DecodeError); 741 SetNetworkState(WebMediaPlayer::DecodeError);
744 break; 742 break;
745 } 743 }
746 744
747 // Repaint to trigger UI update. 745 // Repaint to trigger UI update.
748 Repaint(); 746 Repaint();
749 } 747 }
750 748
751 void WebMediaPlayerImpl::OnNetworkEvent() { 749 void WebMediaPlayerImpl::OnNetworkEvent() {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 pipeline_stopped_.Signal(); 807 pipeline_stopped_.Signal();
810 } 808 }
811 809
812 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { 810 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
813 DCHECK(MessageLoop::current() == main_loop_); 811 DCHECK(MessageLoop::current() == main_loop_);
814 DCHECK(client_); 812 DCHECK(client_);
815 return client_; 813 return client_;
816 } 814 }
817 815
818 } // namespace webkit_glue 816 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698