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

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

Issue 2982009: Revert everything related to the relanding. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 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
« no previous file with comments | « net/url_request/url_request_job.cc ('k') | webkit/glue/weburlloader_impl.cc » ('j') | 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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains PipelineImpl which is the actual media player pipeline, it glues 6 // It contains PipelineImpl which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // PipelineImpl would creates multiple threads and access some public methods 8 // PipelineImpl would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 // list of the main thread. 51 // list of the main thread.
52 52
53 #ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ 53 #ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
54 #define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ 54 #define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
55 55
56 #include <vector> 56 #include <vector>
57 57
58 #include "base/lock.h" 58 #include "base/lock.h"
59 #include "base/message_loop.h" 59 #include "base/message_loop.h"
60 #include "base/ref_counted.h" 60 #include "base/ref_counted.h"
61 #include "base/scoped_ptr.h"
62 #include "base/waitable_event.h" 61 #include "base/waitable_event.h"
63 #include "gfx/rect.h" 62 #include "gfx/rect.h"
64 #include "gfx/size.h" 63 #include "gfx/size.h"
65 #include "media/base/filters.h" 64 #include "media/base/filters.h"
66 #include "media/base/pipeline_impl.h" 65 #include "media/base/pipeline_impl.h"
67 #include "skia/ext/platform_canvas.h" 66 #include "skia/ext/platform_canvas.h"
68 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h" 67 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h"
69 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerClient.h" 68 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerClient.h"
70 69
71 class GURL; 70 class GURL;
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 WebMediaPlayerImpl::Proxy* proxy) = 0; 330 WebMediaPlayerImpl::Proxy* proxy) = 0;
332 331
333 private: 332 private:
334 DISALLOW_COPY_AND_ASSIGN(WebVideoRendererFactoryFactory); 333 DISALLOW_COPY_AND_ASSIGN(WebVideoRendererFactoryFactory);
335 }; 334 };
336 335
337 336
338 } // namespace webkit_glue 337 } // namespace webkit_glue
339 338
340 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ 339 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « net/url_request/url_request_job.cc ('k') | webkit/glue/weburlloader_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698