<!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>[190059] trunk/Source/WebCore</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/190059">190059</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-09-21 10:00:45 -0700 (Mon, 21 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Generate WebCoreHeaderDetection.h with CMake on Windows
https://bugs.webkit.org/show_bug.cgi?id=135861
Reviewed by Brent Fulgham.
This fixes many of the failing media tests.
* AVFoundationSupport.py:
(lookFor):
(fileContains):
Use a command line parameter for the WebKitLibraries directory
to not require the WEBKIT_LIBRARIES environment variable with the CMake build.
* DerivedSources.make:
Pass WEBKIT_LIBRARIES as a command line parameter.
* PlatformAppleWin.cmake:
Added missing sources for video.
* PlatformWin.cmake:
Generate WebCoreHeaderDetection.h correctly and copy the media controls sources to WebKit.resources.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreAVFoundationSupportpy">trunk/Source/WebCore/AVFoundationSupport.py</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCorePlatformAppleWincmake">trunk/Source/WebCore/PlatformAppleWin.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreAVFoundationSupportpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/AVFoundationSupport.py (190058 => 190059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/AVFoundationSupport.py 2015-09-21 16:30:22 UTC (rev 190058)
+++ trunk/Source/WebCore/AVFoundationSupport.py 2015-09-21 17:00:45 UTC (rev 190059)
</span><span class="lines">@@ -31,11 +31,11 @@
</span><span class="cx"> import os
</span><span class="cx">
</span><span class="cx"> def lookFor(relativePath):
</span><del>- return os.path.isfile(os.environ['WEBKIT_LIBRARIES'] + relativePath)
</del><ins>+ return os.path.isfile(sys.argv[1] + relativePath)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def fileContains(relativePath, regexp):
</span><del>- with open(os.environ['WEBKIT_LIBRARIES'] + relativePath) as file:
</del><ins>+ with open(sys.argv[1] + relativePath) as file:
</ins><span class="cx"> for line in file:
</span><span class="cx"> if regexp.search(line):
</span><span class="cx"> return True
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190058 => 190059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-21 16:30:22 UTC (rev 190058)
+++ trunk/Source/WebCore/ChangeLog 2015-09-21 17:00:45 UTC (rev 190059)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-09-21 Alex Christensen <achristensen@webkit.org>
+
+ Generate WebCoreHeaderDetection.h with CMake on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=135861
+
+ Reviewed by Brent Fulgham.
+
+ This fixes many of the failing media tests.
+
+ * AVFoundationSupport.py:
+ (lookFor):
+ (fileContains):
+ Use a command line parameter for the WebKitLibraries directory
+ to not require the WEBKIT_LIBRARIES environment variable with the CMake build.
+ * DerivedSources.make:
+ Pass WEBKIT_LIBRARIES as a command line parameter.
+ * PlatformAppleWin.cmake:
+ Added missing sources for video.
+ * PlatformWin.cmake:
+ Generate WebCoreHeaderDetection.h correctly and copy the media controls sources to WebKit.resources.
+
</ins><span class="cx"> 2015-09-21 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> [GTK] media controls does not show up when playing video finishes.
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (190058 => 190059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2015-09-21 16:30:22 UTC (rev 190058)
+++ trunk/Source/WebCore/DerivedSources.make 2015-09-21 17:00:45 UTC (rev 190059)
</span><span class="lines">@@ -1295,6 +1295,6 @@
</span><span class="cx"> all : WebCoreHeaderDetection.h
</span><span class="cx">
</span><span class="cx"> WebCoreHeaderDetection.h : $(WebCore)/AVFoundationSupport.py DerivedSources.make
</span><del>- $(PYTHON) $(WebCore)/AVFoundationSupport.py > $@
</del><ins>+ $(PYTHON) $(WebCore)/AVFoundationSupport.py $(WEBKIT_LIBRARIES) > $@
</ins><span class="cx">
</span><span class="cx"> endif # Windows_NT
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformAppleWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformAppleWin.cmake (190058 => 190059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformAppleWin.cmake 2015-09-21 16:30:22 UTC (rev 190058)
+++ trunk/Source/WebCore/PlatformAppleWin.cmake 2015-09-21 17:00:45 UTC (rev 190059)
</span><span class="lines">@@ -17,9 +17,13 @@
</span><span class="cx">
</span><span class="cx"> loader/cf/ResourceLoaderCFNet.cpp
</span><span class="cx">
</span><ins>+ page/CaptionUserPreferencesMediaAF.cpp
+
</ins><span class="cx"> page/win/FrameCGWin.cpp
</span><span class="cx">
</span><span class="cx"> platform/cf/CFURLExtras.cpp
</span><ins>+ platform/cf/CoreMediaSoftLink.cpp
+ platform/cf/MediaAccessibilitySoftLink.cpp
</ins><span class="cx"> platform/cf/URLCF.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (190058 => 190059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2015-09-21 16:30:22 UTC (rev 190058)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-09-21 17:00:45 UTC (rev 190059)
</span><span class="lines">@@ -248,12 +248,10 @@
</span><span class="cx"> include(PlatformAppleWin.cmake)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-# FIXME: This should test if AVF headers are available.
-# https://bugs.webkit.org/show_bug.cgi?id=135861
</del><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
</span><span class="cx"> WORKING_DIRECTORY "${DERIVED_SOURCES_WEBCORE_DIR}"
</span><del>- COMMAND echo /* Identifying AVFoundation Support */ > WebCoreHeaderDetection.h
</del><ins>+ COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/AVFoundationSupport.py ${WEBKIT_LIBRARIES_DIR} > WebCoreHeaderDetection.h
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj)
</span><span class="lines">@@ -263,6 +261,12 @@
</span><span class="cx"> DESTINATION
</span><span class="cx"> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj
</span><span class="cx"> )
</span><ins>+file(COPY
+ "${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.css"
+ "${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.js"
+ DESTINATION
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources
+)
</ins><span class="cx"> if (WTF_PLATFORM_WIN_CAIRO AND EXISTS ${WEBKIT_LIBRARIES_DIR}/cacert.pem)
</span><span class="cx"> make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/certificates)
</span><span class="cx"> file(COPY
</span></span></pre>
</div>
</div>
</body>
</html>