Source/web/FrameLoaderClientImpl.h - Issue 1055503002: Eliminate MediaPlayer & MediaPlayerClient abstractions

Side by Side Diff: Source/web/FrameLoaderClientImpl.h

Issue 1055503002: Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Added separate interface for EncryptedMedia 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

« Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp ('K') | « Source/web/AssertMatchingEnums.cpp ('k') | Source/web/FrameLoaderClientImpl.cpp » ('j') | Source/web/FrameLoaderClientImpl.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.

3 * Copyright (C) 2011 Apple Inc. All rights reserved.	3 * Copyright (C) 2011 Apple Inc. All rights reserved.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions are	6 * modification, are permitted provided that the following conditions are

7 * met:	7 * met:

8 *	8 *

9 * * Redistributions of source code must retain the above copyright	9 * * Redistributions of source code must retain the above copyright

10 * notice, this list of conditions and the following disclaimer.	10 * notice, this list of conditions and the following disclaimer.

(...skipping 113 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
124 const String& mimeType, bool loadManually) override;	124 const String& mimeType, bool loadManually) override;

125 virtual PassRefPtrWillBeRawPtr<Widget> createPlugin(	125 virtual PassRefPtrWillBeRawPtr<Widget> createPlugin(

126 HTMLPlugInElement*, const KURL&,	126 HTMLPlugInElement*, const KURL&,

127 const Vector<WTF::String>&, const Vector<WTF::String>&,	127 const Vector<WTF::String>&, const Vector<WTF::String>&,

128 const WTF::String&, bool loadManually, DetachedPluginPolicy) override;	128 const WTF::String&, bool loadManually, DetachedPluginPolicy) override;

129 virtual PassRefPtrWillBeRawPtr<Widget> createJavaAppletWidget(	129 virtual PassRefPtrWillBeRawPtr<Widget> createJavaAppletWidget(

130 HTMLAppletElement*,	130 HTMLAppletElement*,

131 const KURL& /* base_url */,	131 const KURL& /* base_url */,

132 const Vector<WTF::String>& paramNames,	132 const Vector<WTF::String>& paramNames,

133 const Vector<WTF::String>& paramValues) override;	133 const Vector<WTF::String>& paramValues) override;

	134 virtual PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement*, c onst WebURL&) override;

134 virtual ObjectContentType objectContentType(	135 virtual ObjectContentType objectContentType(

135 const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForIma ges) override;	136 const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForIma ges) override;

136 virtual void didChangeScrollOffset() override;	137 virtual void didChangeScrollOffset() override;

137 virtual void didUpdateCurrentHistoryItem() override;	138 virtual void didUpdateCurrentHistoryItem() override;

138 virtual void didRemoveAllPendingStylesheet() override;	139 virtual void didRemoveAllPendingStylesheet() override;

139 virtual bool allowScript(bool enabledPerSettings) override;	140 virtual bool allowScript(bool enabledPerSettings) override;

140 virtual bool allowScriptFromSource(bool enabledPerSettings, const KURL& scri ptURL) override;	141 virtual bool allowScriptFromSource(bool enabledPerSettings, const KURL& scri ptURL) override;

141 virtual bool allowPlugins(bool enabledPerSettings) override;	142 virtual bool allowPlugins(bool enabledPerSettings) override;

142 virtual bool allowImage(bool enabledPerSettings, const KURL& imageURL) overr ide;	143 virtual bool allowImage(bool enabledPerSettings, const KURL& imageURL) overr ide;

143 virtual bool allowMedia(const KURL& mediaURL) override;	144 virtual bool allowMedia(const KURL& mediaURL) override;

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
186 // The WebFrame that owns this object and manages its lifetime. Therefore,	187 // The WebFrame that owns this object and manages its lifetime. Therefore,

187 // the web frame object is guaranteed to exist.	188 // the web frame object is guaranteed to exist.

188 WebLocalFrameImpl* m_webFrame;	189 WebLocalFrameImpl* m_webFrame;

189 };	190 };

190	191

191 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl());	192 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl());

192	193

193 } // namespace blink	194 } // namespace blink

194	195

195 #endif	196 #endif

OLD	NEW