<!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>[205702] releases/WebKitGTK/webkit-2.14/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/205702">205702</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-09 01:15:29 -0700 (Fri, 09 Sep 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205457">r205457</a> - [CMake] Duplicated IDL files in WebCore_IDL_FILES
https://bugs.webkit.org/show_bug.cgi?id=161592

Patch by Fujii Hironori &lt;Hironori.Fujii@sony.com&gt; on 2016-09-05
Reviewed by Darin Adler.

* CMakeLists.txt: Removed duplicated IDL files.
* DerivedSources.cpp: Added #if ENABLE(USER_MESSAGE_HANDLERS)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreCMakeListstxt">releases/WebKitGTK/webkit-2.14/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreDerivedSourcescpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/DerivedSources.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/CMakeLists.txt (205701 => 205702)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/CMakeLists.txt        2016-09-09 07:42:56 UTC (rev 205701)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/CMakeLists.txt        2016-09-09 08:15:29 UTC (rev 205702)
</span><span class="lines">@@ -542,7 +542,6 @@
</span><span class="cx">     html/ValidityState.idl
</span><span class="cx">     html/VoidCallback.idl
</span><span class="cx"> 
</span><del>-    html/canvas/ANGLEInstancedArrays.idl
</del><span class="cx">     html/canvas/CanvasGradient.idl
</span><span class="cx">     html/canvas/CanvasPath.idl
</span><span class="cx">     html/canvas/CanvasPattern.idl
</span><span class="lines">@@ -549,61 +548,7 @@
</span><span class="cx">     html/canvas/CanvasProxy.idl
</span><span class="cx">     html/canvas/CanvasRenderingContext2D.idl
</span><span class="cx">     html/canvas/DOMPath.idl
</span><del>-    html/canvas/EXTBlendMinMax.idl
-    html/canvas/EXTFragDepth.idl
-    html/canvas/EXTShaderTextureLOD.idl
-    html/canvas/EXTTextureFilterAnisotropic.idl
-    html/canvas/EXTsRGB.idl
-    html/canvas/OESElementIndexUint.idl
-    html/canvas/OESStandardDerivatives.idl
-    html/canvas/OESTextureFloat.idl
-    html/canvas/OESTextureFloatLinear.idl
-    html/canvas/OESTextureHalfFloat.idl
-    html/canvas/OESTextureHalfFloatLinear.idl
-    html/canvas/OESVertexArrayObject.idl
-    html/canvas/WebGL2RenderingContext.idl
-    html/canvas/WebGLActiveInfo.idl
-    html/canvas/WebGLBuffer.idl
-    html/canvas/WebGLCompressedTextureATC.idl
-    html/canvas/WebGLCompressedTexturePVRTC.idl
-    html/canvas/WebGLCompressedTextureS3TC.idl
-    html/canvas/WebGLContextAttributes.idl
-    html/canvas/WebGLContextEvent.idl
-    html/canvas/WebGLDebugRendererInfo.idl
-    html/canvas/WebGLDebugShaders.idl
-    html/canvas/WebGLDepthTexture.idl
-    html/canvas/WebGLDrawBuffers.idl
-    html/canvas/WebGLFramebuffer.idl
-    html/canvas/WebGLLoseContext.idl
-    html/canvas/WebGLProgram.idl
-    html/canvas/WebGLQuery.idl
-    html/canvas/WebGLRenderbuffer.idl
-    html/canvas/WebGLRenderingContext.idl
-    html/canvas/WebGLRenderingContextBase.idl
-    html/canvas/WebGLSampler.idl
-    html/canvas/WebGLShader.idl
-    html/canvas/WebGLShaderPrecisionFormat.idl
-    html/canvas/WebGLSync.idl
-    html/canvas/WebGLTexture.idl
-    html/canvas/WebGLTransformFeedback.idl
-    html/canvas/WebGLUniformLocation.idl
-    html/canvas/WebGLVertexArrayObject.idl
-    html/canvas/WebGLVertexArrayObjectOES.idl
</del><span class="cx"> 
</span><del>-    html/track/AudioTrack.idl
-    html/track/AudioTrackList.idl
-    html/track/DataCue.idl
-    html/track/TextTrack.idl
-    html/track/TextTrackCue.idl
-    html/track/TextTrackCueList.idl
-    html/track/TextTrackList.idl
-    html/track/TrackEvent.idl
-    html/track/VTTCue.idl
-    html/track/VTTRegion.idl
-    html/track/VTTRegionList.idl
-    html/track/VideoTrack.idl
-    html/track/VideoTrackList.idl
-
</del><span class="cx">     inspector/CommandLineAPIHost.idl
</span><span class="cx">     inspector/InspectorFrontendHost.idl
</span><span class="cx"> 
</span><span class="lines">@@ -630,9 +575,6 @@
</span><span class="cx">     page/PerformanceResourceTiming.idl
</span><span class="cx">     page/PerformanceTiming.idl
</span><span class="cx">     page/Screen.idl
</span><del>-    page/UserMessageHandler.idl
-    page/UserMessageHandlersNamespace.idl
-    page/WebKitNamespace.idl
</del><span class="cx">     page/WebKitPoint.idl
</span><span class="cx">     page/WindowEventHandlers.idl
</span><span class="cx">     page/WindowOrWorkerGlobalScope.idl
</span><span class="lines">@@ -3161,6 +3103,8 @@
</span><span class="cx">         html/track/TextTrackList.idl
</span><span class="cx">         html/track/TrackEvent.idl
</span><span class="cx">         html/track/VTTCue.idl
</span><ins>+        html/track/VTTRegion.idl
+        html/track/VTTRegionList.idl
</ins><span class="cx">         html/track/VideoTrack.idl
</span><span class="cx">         html/track/VideoTrackList.idl
</span><span class="cx">     )
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205701 => 205702)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog        2016-09-09 07:42:56 UTC (rev 205701)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog        2016-09-09 08:15:29 UTC (rev 205702)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-05  Fujii Hironori  &lt;Hironori.Fujii@sony.com&gt;
+
+        [CMake] Duplicated IDL files in WebCore_IDL_FILES
+        https://bugs.webkit.org/show_bug.cgi?id=161592
+
+        Reviewed by Darin Adler.
+
+        * CMakeLists.txt: Removed duplicated IDL files.
+        * DerivedSources.cpp: Added #if ENABLE(USER_MESSAGE_HANDLERS)
+
</ins><span class="cx"> 2016-09-05  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         MediaPlayerPrivateGStreamerBase: improve build guards in nativeImageForCurrentTime()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/DerivedSources.cpp (205701 => 205702)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/DerivedSources.cpp        2016-09-09 07:42:56 UTC (rev 205701)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/DerivedSources.cpp        2016-09-09 08:15:29 UTC (rev 205702)
</span><span class="lines">@@ -630,8 +630,11 @@
</span><span class="cx"> #include &quot;JSUIEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSUIRequestEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSURLUtils.cpp&quot;
</span><ins>+#if ENABLE(USER_MESSAGE_HANDLERS)
</ins><span class="cx"> #include &quot;JSUserMessageHandler.cpp&quot;
</span><span class="cx"> #include &quot;JSUserMessageHandlersNamespace.cpp&quot;
</span><ins>+#include &quot;JSWebKitNamespace.cpp&quot;
+#endif
</ins><span class="cx"> #include &quot;JSValidityState.cpp&quot;
</span><span class="cx"> #include &quot;JSVideoPlaybackQuality.cpp&quot;
</span><span class="cx"> #include &quot;JSVoidCallback.cpp&quot;
</span><span class="lines">@@ -643,7 +646,6 @@
</span><span class="cx"> #include &quot;JSWebKitCSSRegionRule.cpp&quot;
</span><span class="cx"> #include &quot;JSWebKitCSSViewportRule.cpp&quot;
</span><span class="cx"> #include &quot;JSWebKitNamedFlow.cpp&quot;
</span><del>-#include &quot;JSWebKitNamespace.cpp&quot;
</del><span class="cx"> #include &quot;JSWebKitPlaybackTargetAvailabilityEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSWebKitPoint.cpp&quot;
</span><span class="cx"> #include &quot;JSWebKitSubtleCrypto.cpp&quot;
</span></span></pre>
</div>
</div>

</body>
</html>