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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 1137993004: Revert of Restrict use of hardware-secure codecs based on the RendererPreference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setsecurity
Patch Set: Created 5 years, 7 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 | « components/html_viewer/html_document.cc ('k') | content/renderer/render_frame_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 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 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 #if defined(OS_ANDROID) 806 #if defined(OS_ANDROID)
807 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( 807 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
808 const blink::WebURL& url, 808 const blink::WebURL& url,
809 blink::WebMediaPlayerClient* client, 809 blink::WebMediaPlayerClient* client,
810 media::MediaPermission* media_permission, 810 media::MediaPermission* media_permission,
811 blink::WebContentDecryptionModule* initial_cdm); 811 blink::WebContentDecryptionModule* initial_cdm);
812 812
813 RendererMediaPlayerManager* GetMediaPlayerManager(); 813 RendererMediaPlayerManager* GetMediaPlayerManager();
814 #endif 814 #endif
815 815
816 bool AreSecureCodecsSupported();
817 media::MediaPermission* GetMediaPermission(); 816 media::MediaPermission* GetMediaPermission();
818 media::CdmFactory* GetCdmFactory(); 817 media::CdmFactory* GetCdmFactory();
819 818
820 // Stores the WebLocalFrame we are associated with. This is null from the 819 // Stores the WebLocalFrame we are associated with. This is null from the
821 // constructor until SetWebFrame is called, and it is null after 820 // constructor until SetWebFrame is called, and it is null after
822 // frameDetached is called until destruction (which is asynchronous in the 821 // frameDetached is called until destruction (which is asynchronous in the
823 // case of the main frame, but not subframes). 822 // case of the main frame, but not subframes).
824 blink::WebLocalFrame* frame_; 823 blink::WebLocalFrame* frame_;
825 824
826 // Boolean value indicating whether this RenderFrameImpl object is for a 825 // Boolean value indicating whether this RenderFrameImpl object is for a
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 #endif 988 #endif
990 989
991 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 990 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
992 991
993 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 992 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
994 }; 993 };
995 994
996 } // namespace content 995 } // namespace content
997 996
998 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 997 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « components/html_viewer/html_document.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698