Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/renderer/render_view.h" | 5 #include "content/renderer/render_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1902 collection->AddAudioRenderer(new AudioRendererImpl()); | 1902 collection->AddAudioRenderer(new AudioRendererImpl()); |
| 1903 } | 1903 } |
| 1904 | 1904 |
| 1905 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer; | 1905 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer; |
| 1906 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); | 1906 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); |
| 1907 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( | 1907 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( |
| 1908 new webkit_glue::VideoRendererImpl(pts_logging)); | 1908 new webkit_glue::VideoRendererImpl(pts_logging)); |
| 1909 collection->AddVideoRenderer(renderer); | 1909 collection->AddVideoRenderer(renderer); |
| 1910 video_renderer = renderer; | 1910 video_renderer = renderer; |
| 1911 | 1911 |
| 1912 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( | 1912 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result; |
| 1913 new webkit_glue::WebMediaPlayerImpl(client, | 1913 if (content::GetContentClient()->renderer() |
| 1914 collection.release(), | 1914 ->ShouldOverrideCreateWebMediaPlayer(this)) { |
| 1915 message_loop_factory.release(), | 1915 webkit_glue::WebMediaPlayerImpl* result_ptr; |
| 1916 media_stream_impl_.get(), | 1916 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( |
| 1917 new RenderMediaLog())); | 1917 this, client, collection.release(), message_loop_factory.release(), |
| 1918 media_stream_impl_.get(), new RenderMediaLog(), &result_ptr); | |
| 1919 result.reset(result_ptr); | |
| 1920 } else { | |
| 1921 result.reset(new webkit_glue::WebMediaPlayerImpl(client, | |
| 1922 collection.release(), message_loop_factory.release(), | |
| 1923 media_stream_impl_.get(), new RenderMediaLog())); | |
| 1924 } | |
| 1925 DCHECK(result.get()); | |
|
scherkus (not reviewing)
2011/10/03 18:19:45
should'nt this DCHECK go inside the ShouldOverride
Shishir
2011/10/04 23:02:39
Done.
| |
| 1926 | |
| 1918 if (!result->Initialize(frame, | 1927 if (!result->Initialize(frame, |
| 1919 cmd_line->HasSwitch(switches::kSimpleDataSource), | 1928 cmd_line->HasSwitch(switches::kSimpleDataSource), |
| 1920 video_renderer)) { | 1929 video_renderer)) { |
| 1921 return NULL; | 1930 return NULL; |
| 1922 } | 1931 } |
| 1923 return result.release(); | 1932 return result.release(); |
| 1924 } | 1933 } |
| 1925 | 1934 |
| 1926 WebApplicationCacheHost* RenderView::createApplicationCacheHost( | 1935 WebApplicationCacheHost* RenderView::createApplicationCacheHost( |
| 1927 WebFrame* frame, WebApplicationCacheHostClient* client) { | 1936 WebFrame* frame, WebApplicationCacheHostClient* client) { |
| (...skipping 2469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4397 } | 4406 } |
| 4398 | 4407 |
| 4399 void RenderView::OnLockMouseACK(bool succeeded) { | 4408 void RenderView::OnLockMouseACK(bool succeeded) { |
| 4400 pepper_delegate_.OnLockMouseACK(succeeded); | 4409 pepper_delegate_.OnLockMouseACK(succeeded); |
| 4401 } | 4410 } |
| 4402 | 4411 |
| 4403 void RenderView::OnMouseLockLost() { | 4412 void RenderView::OnMouseLockLost() { |
| 4404 pepper_delegate_.OnMouseLockLost(); | 4413 pepper_delegate_.OnMouseLockLost(); |
| 4405 } | 4414 } |
| 4406 | 4415 |
| OLD | NEW |