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 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
772 #if defined(OS_ANDROID) | 772 #if defined(OS_ANDROID) |
773 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( | 773 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( |
774 const blink::WebURL& url, | 774 const blink::WebURL& url, |
775 blink::WebMediaPlayerClient* client, | 775 blink::WebMediaPlayerClient* client, |
776 media::MediaPermission* media_permission, | 776 media::MediaPermission* media_permission, |
777 blink::WebContentDecryptionModule* initial_cdm); | 777 blink::WebContentDecryptionModule* initial_cdm); |
778 | 778 |
779 RendererMediaPlayerManager* GetMediaPlayerManager(); | 779 RendererMediaPlayerManager* GetMediaPlayerManager(); |
780 #endif | 780 #endif |
781 | 781 |
782 #if defined(OS_ANDROID) | |
783 bool AllowSecureSurfaces(); | |
ddorwin
2015/05/06 02:17:11
ditto
sandersd (OOO until July 31)
2015/05/08 00:37:42
Done.
| |
784 #endif | |
782 media::MediaPermission* GetMediaPermission(); | 785 media::MediaPermission* GetMediaPermission(); |
783 media::CdmFactory* GetCdmFactory(); | 786 media::CdmFactory* GetCdmFactory(); |
784 | 787 |
785 // Stores the WebLocalFrame we are associated with. This is null from the | 788 // Stores the WebLocalFrame we are associated with. This is null from the |
786 // constructor until SetWebFrame is called, and it is null after | 789 // constructor until SetWebFrame is called, and it is null after |
787 // frameDetached is called until destruction (which is asynchronous in the | 790 // frameDetached is called until destruction (which is asynchronous in the |
788 // case of the main frame, but not subframes). | 791 // case of the main frame, but not subframes). |
789 blink::WebLocalFrame* frame_; | 792 blink::WebLocalFrame* frame_; |
790 | 793 |
791 // Frame is a local root if it is rendered in a process different than parent | 794 // Frame is a local root if it is rendered in a process different than parent |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
946 #endif | 949 #endif |
947 | 950 |
948 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 951 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
949 | 952 |
950 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 953 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
951 }; | 954 }; |
952 | 955 |
953 } // namespace content | 956 } // namespace content |
954 | 957 |
955 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 958 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |