| OLD | NEW |
| 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 "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1965 params_to_use.mimeType = WebString::fromUTF8(mime_type); | 1965 params_to_use.mimeType = WebString::fromUTF8(mime_type); |
| 1966 return CreatePlugin(frame, info, params_to_use, nullptr /* throttler */); | 1966 return CreatePlugin(frame, info, params_to_use, nullptr /* throttler */); |
| 1967 #else | 1967 #else |
| 1968 return NULL; | 1968 return NULL; |
| 1969 #endif // defined(ENABLE_PLUGINS) | 1969 #endif // defined(ENABLE_PLUGINS) |
| 1970 } | 1970 } |
| 1971 | 1971 |
| 1972 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( | 1972 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( |
| 1973 blink::WebLocalFrame* frame, | 1973 blink::WebLocalFrame* frame, |
| 1974 const blink::WebURL& url, | 1974 const blink::WebURL& url, |
| 1975 blink::WebMediaPlayerClient* client) { | |
| 1976 return createMediaPlayer(frame, url, client, nullptr); | |
| 1977 } | |
| 1978 | |
| 1979 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( | |
| 1980 blink::WebLocalFrame* frame, | |
| 1981 const blink::WebURL& url, | |
| 1982 blink::WebMediaPlayerClient* client, | 1975 blink::WebMediaPlayerClient* client, |
| 1983 blink::WebContentDecryptionModule* initial_cdm) { | 1976 blink::WebContentDecryptionModule* initial_cdm) { |
| 1984 #if defined(VIDEO_HOLE) | 1977 #if defined(VIDEO_HOLE) |
| 1985 if (!contains_media_player_) { | 1978 if (!contains_media_player_) { |
| 1986 render_view_->RegisterVideoHoleFrame(this); | 1979 render_view_->RegisterVideoHoleFrame(this); |
| 1987 contains_media_player_ = true; | 1980 contains_media_player_ = true; |
| 1988 } | 1981 } |
| 1989 #endif // defined(VIDEO_HOLE) | 1982 #endif // defined(VIDEO_HOLE) |
| 1990 | 1983 |
| 1991 blink::WebMediaStream web_stream( | 1984 blink::WebMediaStream web_stream( |
| (...skipping 2921 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4913 #elif defined(ENABLE_BROWSER_CDMS) | 4906 #elif defined(ENABLE_BROWSER_CDMS) |
| 4914 cdm_manager_, | 4907 cdm_manager_, |
| 4915 #endif | 4908 #endif |
| 4916 this); | 4909 this); |
| 4917 } | 4910 } |
| 4918 | 4911 |
| 4919 return cdm_factory_; | 4912 return cdm_factory_; |
| 4920 } | 4913 } |
| 4921 | 4914 |
| 4922 } // namespace content | 4915 } // namespace content |
| OLD | NEW |