<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170910] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170910">170910</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-08 22:56:45 -0700 (Tue, 08 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>.: [EFL] Support Encrypted Media Extensions.
https://bugs.webkit.org/show_bug.cgi?id=134750
Patch by Sun-woo Nam <sunny.nam@samsung.com> on 2014-07-08
Reviewed by Gyuyoung Kim.
Webkit needs to play encrypted media contents when media player
is played by Media source extensions and normal video procedure.
* Source/cmake/OptionsEfl.cmake: Turn on ENABLE_ENCRYPTED_MEDIA_V2
Source/WebCore: [EFL] Fix the build break when ENABLE_ENCRYPTED_MEDIA_V2 is turned on.
https://bugs.webkit.org/show_bug.cgi?id=134750
Patch by Sun-woo Nam <sunny.nam@samsung.com> on 2014-07-08
Reviewed by Gyuyoung Kim.
When turning ENABLE_ENCRYPTED_MEDIA_V2 on, build break occurs.
Some source files need to be included in CMakeLists.txt file for build.
And wrap the included header file which is built only on mac and wince.
* CMakeLists.txt:
* Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMPrivateMediaPlayercpp">trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (170909 => 170910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-07-09 05:13:01 UTC (rev 170909)
+++ trunk/ChangeLog 2014-07-09 05:56:45 UTC (rev 170910)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-07-08 Sun-woo Nam <sunny.nam@samsung.com>
+
+ [EFL] Support Encrypted Media Extensions.
+ https://bugs.webkit.org/show_bug.cgi?id=134750
+
+ Reviewed by Gyuyoung Kim.
+
+ Webkit needs to play encrypted media contents when media player
+ is played by Media source extensions and normal video procedure.
+
+ * Source/cmake/OptionsEfl.cmake: Turn on ENABLE_ENCRYPTED_MEDIA_V2
+
</ins><span class="cx"> 2014-07-08 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Steps towards CMake on Windows.
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (170909 => 170910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-07-09 05:13:01 UTC (rev 170909)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-07-09 05:56:45 UTC (rev 170910)
</span><span class="lines">@@ -2767,11 +2767,13 @@
</span><span class="cx"> if (ENABLE_ENCRYPTED_MEDIA OR ENABLE_ENCRYPTED_MEDIA_V2)
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> Modules/encryptedmedia/CDM.cpp
</span><ins>+ Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp
</ins><span class="cx"> Modules/encryptedmedia/MediaKeyMessageEvent.cpp
</span><span class="cx"> Modules/encryptedmedia/MediaKeyNeededEvent.cpp
</span><span class="cx"> Modules/encryptedmedia/MediaKeys.cpp
</span><span class="cx"> Modules/encryptedmedia/MediaKeySession.cpp
</span><span class="cx"> html/MediaKeyEvent.cpp
</span><ins>+ testing/MockCDM.cpp
</ins><span class="cx"> )
</span><span class="cx"> list(APPEND WebCore_IDL_FILES
</span><span class="cx"> Modules/encryptedmedia/MediaKeyMessageEvent.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170909 => 170910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-09 05:13:01 UTC (rev 170909)
+++ trunk/Source/WebCore/ChangeLog 2014-07-09 05:56:45 UTC (rev 170910)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-07-08 Sun-woo Nam <sunny.nam@samsung.com>
+
+ [EFL] Fix the build break when ENABLE_ENCRYPTED_MEDIA_V2 is turned on.
+ https://bugs.webkit.org/show_bug.cgi?id=134750
+
+ Reviewed by Gyuyoung Kim.
+
+ When turning ENABLE_ENCRYPTED_MEDIA_V2 on, build break occurs.
+ Some source files need to be included in CMakeLists.txt file for build.
+ And wrap the included header file which is built only on mac and wince.
+
+ * CMakeLists.txt:
+ * Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp:
+
</ins><span class="cx"> 2014-07-08 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] user caption preferences not applied
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMPrivateMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp (170909 => 170910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp 2014-07-09 05:13:01 UTC (rev 170909)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp 2014-07-09 05:56:45 UTC (rev 170910)
</span><span class="lines">@@ -33,7 +33,10 @@
</span><span class="cx"> #include "ContentType.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "MediaPlayer.h"
</span><ins>+
+#if PLATFORM(IOS) || OS(WINCE)
</ins><span class="cx"> #include "SoftLinking.h"
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (170909 => 170910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-07-09 05:13:01 UTC (rev 170909)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-07-09 05:56:45 UTC (rev 170910)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 OFF)
</del><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD OFF)
</span></span></pre>
</div>
</div>
</body>
</html>