Title: [188234] trunk/Source/WebCore
- Revision
- 188234
- Author
- mdai...@apple.com
- Date
- 2015-08-10 16:27:55 -0700 (Mon, 10 Aug 2015)
Log Message
HTMLMediaElement needs way to find MediaDeviceInfo
https://bugs.webkit.org/show_bug.cgi?id=147842
Reviewed by Jer Noble.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerMediaDeviceIdentifierStorageDirectory):
* html/HTMLMediaElement.h:
* page/Settings.h:
(WebCore::Settings::setMediaDeviceIdentifierStorageDirectory):
(WebCore::Settings::mediaDeviceIdentifierStorageDirectory):
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::mediaPlayerMediaDeviceIdentifierStorageDirectory):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188233 => 188234)
--- trunk/Source/WebCore/ChangeLog 2015-08-10 22:58:16 UTC (rev 188233)
+++ trunk/Source/WebCore/ChangeLog 2015-08-10 23:27:55 UTC (rev 188234)
@@ -1,3 +1,19 @@
+2015-08-10 Matthew Daiter <mdai...@apple.com>
+
+ HTMLMediaElement needs way to find MediaDeviceInfo
+ https://bugs.webkit.org/show_bug.cgi?id=147842
+
+ Reviewed by Jer Noble.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaPlayerMediaDeviceIdentifierStorageDirectory):
+ * html/HTMLMediaElement.h:
+ * page/Settings.h:
+ (WebCore::Settings::setMediaDeviceIdentifierStorageDirectory):
+ (WebCore::Settings::mediaDeviceIdentifierStorageDirectory):
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::mediaPlayerMediaDeviceIdentifierStorageDirectory):
+
2015-08-10 Chris Dumez <cdu...@apple.com>
Simplify code for making Page-cacheability decision
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (188233 => 188234)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-10 22:58:16 UTC (rev 188233)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-10 23:27:55 UTC (rev 188234)
@@ -2358,6 +2358,25 @@
}
#endif
+#if ENABLE(MEDIA_STREAM)
+String HTMLMediaElement::mediaPlayerMediaDeviceIdentifierStorageDirectory() const
+{
+ Settings* settings = document().settings();
+ if (!settings)
+ return emptyString();
+
+ String storageDirectory = settings->mediaDeviceIdentifierStorageDirectory();
+ if (storageDirectory.isEmpty())
+ return emptyString();
+
+ SecurityOrigin* origin = document().securityOrigin();
+ if (!origin)
+ return emptyString();
+
+ return pathByAppendingComponent(storageDirectory, origin->databaseIdentifier());
+}
+#endif
+
void HTMLMediaElement::progressEventTimerFired()
{
ASSERT(m_player);
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (188233 => 188234)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-08-10 22:58:16 UTC (rev 188233)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-08-10 23:27:55 UTC (rev 188234)
@@ -559,6 +559,10 @@
virtual bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*) override;
virtual String mediaPlayerMediaKeysStorageDirectory() const override;
#endif
+
+#if ENABLE(MEDIA_STREAM)
+ virtual String mediaPlayerMediaDeviceIdentifierStorageDirectory() const override;
+#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
virtual void mediaPlayerCurrentPlaybackTargetIsWirelessChanged(MediaPlayer*) override;
Modified: trunk/Source/WebCore/page/Settings.h (188233 => 188234)
--- trunk/Source/WebCore/page/Settings.h 2015-08-10 22:58:16 UTC (rev 188233)
+++ trunk/Source/WebCore/page/Settings.h 2015-08-10 23:27:55 UTC (rev 188234)
@@ -269,6 +269,11 @@
void setMediaKeysStorageDirectory(const String& directory) { m_mediaKeysStorageDirectory = directory; }
const String& mediaKeysStorageDirectory() const { return m_mediaKeysStorageDirectory; }
#endif
+
+#if ENABLE(MEDIA_STREAM)
+ void setMediaDeviceIdentifierStorageDirectory(const String& directory) { m_mediaDeviceIdentifierStorageDirectory = directory; }
+ const String& mediaDeviceIdentifierStorageDirectory() const { return m_mediaDeviceIdentifierStorageDirectory; }
+#endif
WEBCORE_EXPORT void setForcePendingWebGLPolicy(bool);
bool isForcePendingWebGLPolicy() const { return m_forcePendingWebGLPolicy; }
@@ -353,6 +358,10 @@
#if ENABLE(ENCRYPTED_MEDIA_V2)
String m_mediaKeysStorageDirectory;
#endif
+
+#if ENABLE(MEDIA_STREAM)
+ String m_mediaDeviceIdentifierStorageDirectory;
+#endif
static bool gLowPowerVideoAudioBufferSizeEnabled;
};
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (188233 => 188234)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-08-10 22:58:16 UTC (rev 188233)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-08-10 23:27:55 UTC (rev 188234)
@@ -229,6 +229,11 @@
virtual String mediaPlayerMediaKeysStorageDirectory() const { return emptyString(); }
#endif
+#if ENABLE(MEDIA_STREAM)
+ virtual String mediaPlayerMediaDeviceIdentifierStorageDirectory() const { return emptyString(); }
+#endif
+
+
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
virtual void mediaPlayerCurrentPlaybackTargetIsWirelessChanged(MediaPlayer*) { };
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
