<!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>[151522] trunk/Source</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/151522">151522</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2013-06-12 13:18:16 -0700 (Wed, 12 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Move more build targets for source code that's free of layer violations into libPlatform
https://bugs.webkit.org/show_bug.cgi?id=115936

Reviewed by Martin Robinson.

Source/Platform: 

* GNUmakefile.am: Add additional Source/WebCore/platform subdirectories to the list of the directories
that are specific to the platform layer but still located in WebCore. Add Enchant and Freetype dependencies'
CFLAGS to the list of libPlatform CPPFLAGS. Add GStreamer dependency's CFLAGS to the list of libPlatformGtk
CPPFLAGS.

Source/WebCore: 

No new tests - no new functionality.

* GNUmakefile.list.am: Move more build targets under the platform_sources and platformgtk_sources listing.
These build targets represent source files that are already free of platform layer violations and are as such
ready to be pushed down from the WebCore layer into the Platform layer.

Source/WebKit2: 

* GNUmakefile.am: Add GStreamer dependency's CFLAGS to the list of libPlatformGtk2 CPPFLAGS.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcePlatformChangeLog">trunk/Source/Platform/ChangeLog</a></li>
<li><a href="#trunkSourcePlatformGNUmakefileam">trunk/Source/Platform/GNUmakefile.am</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2GNUmakefileam">trunk/Source/WebKit2/GNUmakefile.am</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcePlatformChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/Platform/ChangeLog (151521 => 151522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/Platform/ChangeLog        2013-06-12 20:07:39 UTC (rev 151521)
+++ trunk/Source/Platform/ChangeLog        2013-06-12 20:18:16 UTC (rev 151522)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-06-12  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
+
+        [GTK] Move more build targets for source code that's free of layer violations into libPlatform
+        https://bugs.webkit.org/show_bug.cgi?id=115936
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Add additional Source/WebCore/platform subdirectories to the list of the directories
+        that are specific to the platform layer but still located in WebCore. Add Enchant and Freetype dependencies'
+        CFLAGS to the list of libPlatform CPPFLAGS. Add GStreamer dependency's CFLAGS to the list of libPlatformGtk
+        CPPFLAGS.
+
</ins><span class="cx"> 2013-05-14  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into libPlatform
</span></span></pre></div>
<a id="trunkSourcePlatformGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/Platform/GNUmakefile.am (151521 => 151522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/Platform/GNUmakefile.am        2013-06-12 20:07:39 UTC (rev 151521)
+++ trunk/Source/Platform/GNUmakefile.am        2013-06-12 20:18:16 UTC (rev 151522)
</span><span class="lines">@@ -30,8 +30,16 @@
</span><span class="cx">         -I$(srcdir)/Source/WebCore/platform/geoclue \
</span><span class="cx">         -I$(srcdir)/Source/WebCore/platform/graphics \
</span><span class="cx">         -I$(srcdir)/Source/WebCore/platform/graphics/cairo \
</span><ins>+        -I$(srcdir)/Source/WebCore/platform/graphics/cpu/arm \
+        -I$(srcdir)/Source/WebCore/platform/graphics/cpu/arm/filters \
+        -I$(srcdir)/Source/WebCore/platform/graphics/egl \
+        -I$(srcdir)/Source/WebCore/platform/graphics/filters \
+        -I$(srcdir)/Source/WebCore/platform/graphics/glx \
+        -I$(srcdir)/Source/WebCore/platform/graphics/gpu \
</ins><span class="cx">         -I$(srcdir)/Source/WebCore/platform/graphics/gstreamer \
</span><span class="cx">         -I$(srcdir)/Source/WebCore/platform/graphics/gtk \
</span><ins>+        -I$(srcdir)/Source/WebCore/platform/graphics/harfbuzz \
+        -I$(srcdir)/Source/WebCore/platform/graphics/texmap \
</ins><span class="cx">         -I$(srcdir)/Source/WebCore/platform/graphics/transforms \
</span><span class="cx">         -I$(srcdir)/Source/WebCore/platform/gtk \
</span><span class="cx">         -I$(srcdir)/Source/WebCore/platform/image-decoders \
</span><span class="lines">@@ -45,7 +53,8 @@
</span><span class="cx">         -I$(srcdir)/Source/WebCore/platform/network \
</span><span class="cx">         -I$(srcdir)/Source/WebCore/platform/network/gtk \
</span><span class="cx">         -I$(srcdir)/Source/WebCore/platform/network/soup \
</span><del>-        -I$(srcdir)/Source/WebCore/platform/text
</del><ins>+        -I$(srcdir)/Source/WebCore/platform/text \
+        -I$(srcdir)/Source/WebCore/platform/text/transcoder
</ins><span class="cx"> 
</span><span class="cx"> noinst_LTLIBRARIES += \
</span><span class="cx">         libPlatform.la \
</span><span class="lines">@@ -80,6 +89,8 @@
</span><span class="cx">         $(javascriptcore_cppflags) \
</span><span class="cx">         -fno-strict-aliasing \
</span><span class="cx">         $(CAIRO_CFLAGS) \
</span><ins>+        $(ENCHANT_CFLAGS) \
+        $(FREETYPE_CFLAGS) \
</ins><span class="cx">         $(GEOCLUE_CFLAGS) \
</span><span class="cx">         $(GSTREAMER_CFLAGS) \
</span><span class="cx">         $(LIBSOUP_CFLAGS)
</span><span class="lines">@@ -103,6 +114,7 @@
</span><span class="cx">         $(platform_webcore_cppflags) \
</span><span class="cx">         $(javascriptcore_cppflags) \
</span><span class="cx">         -fno-strict-aliasing \
</span><ins>+        $(GSTREAMER_CFLAGS) \
</ins><span class="cx">         $(GTK_CFLAGS) \
</span><span class="cx">         $(LIBSECRET_CFLAGS) \
</span><span class="cx">         $(LIBSOUP_CFLAGS)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (151521 => 151522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-06-12 20:07:39 UTC (rev 151521)
+++ trunk/Source/WebCore/ChangeLog        2013-06-12 20:18:16 UTC (rev 151522)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-06-12  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
+
+        [GTK] Move more build targets for source code that's free of layer violations into libPlatform
+        https://bugs.webkit.org/show_bug.cgi?id=115936
+
+        Reviewed by Martin Robinson.
+
+        No new tests - no new functionality.
+
+        * GNUmakefile.list.am: Move more build targets under the platform_sources and platformgtk_sources listing.
+        These build targets represent source files that are already free of platform layer violations and are as such
+        ready to be pushed down from the WebCore layer into the Platform layer.
+
</ins><span class="cx"> 2013-06-12  Ruth Fong  &lt;ruth_fong@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         &quot;Open Video in New Window&quot; doesn't make sense in fullscreen
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (151521 => 151522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am        2013-06-12 20:07:39 UTC (rev 151521)
+++ trunk/Source/WebCore/GNUmakefile.list.am        2013-06-12 20:18:16 UTC (rev 151522)
</span><span class="lines">@@ -4332,17 +4332,6 @@
</span><span class="cx">         Source/WebCore/page/WindowFocusAllowedIndicator.h \
</span><span class="cx">         Source/WebCore/page/WorkerNavigator.cpp \
</span><span class="cx">         Source/WebCore/page/WorkerNavigator.h \
</span><del>-        Source/WebCore/platform/graphics/cairo/FontCairoHarfbuzzNG.cpp \
-        Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp \
-        Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp \
-        Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp \
-        Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp \
-        Source/WebCore/platform/graphics/freetype/UTF16UChar32Iterator.h \
-        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.cpp \
-        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.h \
-        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp \
-        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp \
-        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.h \
</del><span class="cx">         Source/WebCore/plugins/npapi.h \
</span><span class="cx">         Source/WebCore/plugins/npruntime.h \
</span><span class="cx">         Source/WebCore/plugins/nptypes.h \
</span><span class="lines">@@ -5360,8 +5349,242 @@
</span><span class="cx">         Source/WebCore/platform/animation/Animation.h \
</span><span class="cx">         Source/WebCore/platform/animation/AnimationList.cpp \
</span><span class="cx">         Source/WebCore/platform/animation/AnimationList.h \
</span><ins>+        Source/WebCore/platform/audio/HRTFDatabase.cpp \
+        Source/WebCore/platform/audio/HRTFDatabase.h \
+        Source/WebCore/platform/audio/HRTFDatabaseLoader.cpp \
+        Source/WebCore/platform/audio/HRTFDatabaseLoader.h \
+        Source/WebCore/platform/audio/HRTFElevation.cpp \
+        Source/WebCore/platform/audio/HRTFElevation.h \
+        Source/WebCore/platform/audio/HRTFKernel.cpp \
+        Source/WebCore/platform/audio/HRTFKernel.h \
+        Source/WebCore/platform/audio/HRTFPanner.cpp \
+        Source/WebCore/platform/audio/HRTFPanner.h \
+        Source/WebCore/platform/audio/Panner.cpp \
+        Source/WebCore/platform/audio/Panner.h \
+        Source/WebCore/platform/AsyncFileSystem.cpp \
+        Source/WebCore/platform/AsyncFileSystem.h \
+        Source/WebCore/platform/AsyncFileSystemCallbacks.h \
+        Source/WebCore/platform/CalculationValue.cpp \
+        Source/WebCore/platform/CalculationValue.h \
+        Source/WebCore/platform/CrossThreadCopier.cpp \
+        Source/WebCore/platform/CrossThreadCopier.h \
+        Source/WebCore/platform/DatabaseStrategy.cpp \
+        Source/WebCore/platform/DatabaseStrategy.h \
+        Source/WebCore/platform/DragData.cpp \
+        Source/WebCore/platform/DragData.h \
+        Source/WebCore/platform/DragImage.cpp \
+        Source/WebCore/platform/DragImage.h \
+        Source/WebCore/platform/EventLoop.h \
+        Source/WebCore/platform/Gamepads.h \
+        Source/WebCore/platform/graphics/filters/DistantLightSource.cpp \
+        Source/WebCore/platform/graphics/filters/DistantLightSource.h \
+        Source/WebCore/platform/graphics/filters/FEBlend.cpp \
+        Source/WebCore/platform/graphics/filters/FEBlend.h \
+        Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp \
+        Source/WebCore/platform/graphics/filters/FEColorMatrix.h \
+        Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp \
+        Source/WebCore/platform/graphics/filters/FEComponentTransfer.h \
+        Source/WebCore/platform/graphics/filters/FEComposite.cpp \
+        Source/WebCore/platform/graphics/filters/FEComposite.h \
+        Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp \
+        Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h \
+        Source/WebCore/platform/graphics/filters/FECustomFilter.cpp \
+        Source/WebCore/platform/graphics/filters/FECustomFilter.h \
+        Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp \
+        Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h \
+        Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp \
+        Source/WebCore/platform/graphics/filters/FEDisplacementMap.h \
+        Source/WebCore/platform/graphics/filters/FEDropShadow.cpp \
+        Source/WebCore/platform/graphics/filters/FEDropShadow.h \
+        Source/WebCore/platform/graphics/filters/FEFlood.cpp \
+        Source/WebCore/platform/graphics/filters/FEFlood.h \
+        Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp \
+        Source/WebCore/platform/graphics/filters/FEGaussianBlur.h \
+        Source/WebCore/platform/graphics/filters/FEMerge.cpp \
+        Source/WebCore/platform/graphics/filters/FEMerge.h \
+        Source/WebCore/platform/graphics/filters/FEMorphology.cpp \
+        Source/WebCore/platform/graphics/filters/FEMorphology.h \
+        Source/WebCore/platform/graphics/filters/FEOffset.cpp \
+        Source/WebCore/platform/graphics/filters/FEOffset.h \
+        Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp \
+        Source/WebCore/platform/graphics/filters/FESpecularLighting.h \
+        Source/WebCore/platform/graphics/filters/FETile.cpp \
+        Source/WebCore/platform/graphics/filters/FETile.h \
+        Source/WebCore/platform/graphics/filters/FETurbulence.cpp \
+        Source/WebCore/platform/graphics/filters/FETurbulence.h \
+        Source/WebCore/platform/graphics/filters/FilterOperation.h \
+        Source/WebCore/platform/graphics/filters/FilterOperation.cpp \
+        Source/WebCore/platform/graphics/filters/FilterOperations.cpp \
+        Source/WebCore/platform/graphics/filters/FilterOperations.h \
+        Source/WebCore/platform/graphics/filters/SourceAlpha.cpp \
+        Source/WebCore/platform/graphics/filters/SourceAlpha.h \
+        Source/WebCore/platform/graphics/filters/SourceGraphic.cpp \
+        Source/WebCore/platform/graphics/filters/SourceGraphic.h \
+        Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp \
+        Source/WebCore/platform/graphics/gpu/DrawingBuffer.h \
+        Source/WebCore/platform/graphics/GraphicsContext3D.cpp \
+        Source/WebCore/platform/graphics/GraphicsContext3D.h \
+        Source/WebCore/platform/graphics/GraphicsLayer.h \
+        Source/WebCore/platform/graphics/GraphicsLayer.cpp \
+        Source/WebCore/platform/graphics/GraphicsLayerClient.h \
+        Source/WebCore/platform/graphics/GraphicsLayerFactory.h \
+        Source/WebCore/platform/graphics/GraphicsLayerUpdater.h \
+        Source/WebCore/platform/graphics/GraphicsLayerUpdater.cpp \
+        Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp \
+        Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h \
+        Source/WebCore/platform/graphics/Latin1TextIterator.h \
+        Source/WebCore/platform/graphics/MediaPlayer.cpp \
+        Source/WebCore/platform/graphics/MediaPlayer.h \
+        Source/WebCore/platform/graphics/MediaPlayerPrivate.h \
+        Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp \
+        Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.h \
+        Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp \
+        Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h \
+        Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp \
+        Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h \
+        Source/WebCore/platform/gtk/ErrorsGtk.cpp \
+        Source/WebCore/platform/gtk/ErrorsGtk.h \
+        Source/WebCore/platform/gtk/GamepadsGtk.cpp \
+        Source/WebCore/platform/LengthBox.cpp \
+        Source/WebCore/platform/LengthBox.h \
+        Source/WebCore/platform/Length.cpp \
+        Source/WebCore/platform/Length.h \
+        Source/WebCore/platform/LengthSize.h \
+        Source/WebCore/platform/LocalizedStrings.h \
+        Source/WebCore/platform/MainThreadTask.h \
+        Source/WebCore/platform/MIMETypeRegistry.cpp \
+        Source/WebCore/platform/MIMETypeRegistry.h \
+        Source/WebCore/platform/linux/GamepadDeviceLinux.cpp \
+        Source/WebCore/platform/linux/GamepadDeviceLinux.h \
+        Source/WebCore/platform/mediastream/MediaConstraints.h \
+        Source/WebCore/platform/mediastream/MediaStreamCenter.cpp \
+        Source/WebCore/platform/mediastream/MediaStreamCenter.h \
+        Source/WebCore/platform/mediastream/MediaStreamComponent.h \
+        Source/WebCore/platform/mediastream/MediaStreamDescriptor.h \
+        Source/WebCore/platform/mediastream/MediaStreamSource.cpp \
+        Source/WebCore/platform/mediastream/MediaStreamSource.h \
+        Source/WebCore/platform/mediastream/MediaStreamSourcesQueryClient.h \
+        Source/WebCore/platform/mediastream/RTCConfiguration.h \
+        Source/WebCore/platform/mediastream/RTCDTMFSenderHandler.h \
+        Source/WebCore/platform/mediastream/RTCDTMFSenderHandlerClient.h \
+        Source/WebCore/platform/mediastream/RTCDataChannelHandler.h \
+        Source/WebCore/platform/mediastream/RTCDataChannelHandlerClient.h \
+        Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.cpp \
+        Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.h \
+        Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp \
+        Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h \
+        Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h \
+        Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h \
+        Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.cpp \
+        Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h \
+        Source/WebCore/platform/mediastream/RTCStatsRequest.h \
+        Source/WebCore/platform/mediastream/RTCVoidRequest.h \
+        Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp \
+        Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h \
+        Source/WebCore/platform/mock/DeviceMotionClientMock.cpp \
+        Source/WebCore/platform/mock/DeviceMotionClientMock.h \
+        Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp \
+        Source/WebCore/platform/mock/DeviceOrientationClientMock.h \
+        Source/WebCore/platform/mock/GeolocationClientMock.cpp \
+        Source/WebCore/platform/mock/GeolocationClientMock.h \
+        Source/WebCore/platform/mock/ScrollbarThemeMock.cpp \
+        Source/WebCore/platform/mock/ScrollbarThemeMock.h \
+        Source/WebCore/platform/network/BlobData.cpp \
+        Source/WebCore/platform/network/BlobData.h \
+        Source/WebCore/platform/network/BlobRegistry.h \
+        Source/WebCore/platform/network/BlobRegistry.cpp \
+        Source/WebCore/platform/network/BlobRegistryImpl.cpp \
+        Source/WebCore/platform/network/BlobRegistryImpl.h \
+        Source/WebCore/platform/network/BlobResourceHandle.cpp \
+        Source/WebCore/platform/network/BlobResourceHandle.h \
+        Source/WebCore/platform/network/BlobStorageData.h \
+        Source/WebCore/platform/network/CookieStorage.h \
+        Source/WebCore/platform/network/FormDataBuilder.cpp \
+        Source/WebCore/platform/network/FormDataBuilder.h \
+        Source/WebCore/platform/network/FormData.cpp \
+        Source/WebCore/platform/network/FormData.h \
+        Source/WebCore/platform/network/HTTPParsers.cpp \
+        Source/WebCore/platform/network/HTTPParsers.h \
+        Source/WebCore/platform/network/NetworkingContext.h \
+        Source/WebCore/platform/network/NetworkStateNotifier.cpp \
+        Source/WebCore/platform/network/NetworkStateNotifier.h \
+        Source/WebCore/platform/network/NetworkStorageSession.h \
+        Source/WebCore/platform/network/PlatformCookieJar.h \
+        Source/WebCore/platform/network/ResourceErrorBase.cpp \
+        Source/WebCore/platform/network/ResourceErrorBase.h \
+        Source/WebCore/platform/network/ResourceHandleClient.cpp \
+        Source/WebCore/platform/network/ResourceHandleClient.h \
+        Source/WebCore/platform/network/ResourceHandle.cpp \
+        Source/WebCore/platform/network/ResourceHandle.h \
+        Source/WebCore/platform/network/ResourceHandleInternal.h \
+        Source/WebCore/platform/network/ResourceHandleTypes.h \
+        Source/WebCore/platform/network/ResourceLoadPriority.h \
+        Source/WebCore/platform/network/ResourceLoadTiming.cpp \
+        Source/WebCore/platform/network/ResourceLoadTiming.h \
+        Source/WebCore/platform/network/ResourceRequestBase.cpp \
+        Source/WebCore/platform/network/ResourceRequestBase.h \
+        Source/WebCore/platform/network/ResourceResponseBase.cpp \
+        Source/WebCore/platform/network/ResourceResponseBase.h \
+        Source/WebCore/platform/network/SocketStreamErrorBase.cpp \
+        Source/WebCore/platform/network/SocketStreamErrorBase.h \
+        Source/WebCore/platform/network/SocketStreamHandleBase.cpp \
+        Source/WebCore/platform/network/SocketStreamHandleBase.h \
+        Source/WebCore/platform/network/SocketStreamHandleClient.h \
+        Source/WebCore/platform/network/soup/AuthenticationChallenge.h \
+        Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp \
+        Source/WebCore/platform/network/soup/CookieJarSoup.cpp \
+        Source/WebCore/platform/network/soup/CookieJarSoup.h \
+        Source/WebCore/platform/network/soup/CookieStorageSoup.cpp \
+        Source/WebCore/platform/network/soup/CredentialStorageSoup.cpp \
+        Source/WebCore/platform/network/soup/DNSSoup.cpp \
+        Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp \
+        Source/WebCore/platform/network/soup/ProxyServerSoup.cpp \
+        Source/WebCore/platform/network/soup/ResourceError.h \
+        Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp \
+        Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp \
+        Source/WebCore/platform/network/soup/ResourceRequest.h \
+        Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp \
+        Source/WebCore/platform/network/soup/ResourceResponse.h \
+        Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp \
+        Source/WebCore/platform/network/soup/SocketStreamError.h \
+        Source/WebCore/platform/network/soup/SocketStreamHandle.h \
+        Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp \
+        Source/WebCore/platform/ScrollableArea.cpp \
+        Source/WebCore/platform/ScrollableArea.h \
+        Source/WebCore/platform/ScrollbarThemeClient.h \
+        Source/WebCore/platform/ScrollbarThemeComposite.cpp \
+        Source/WebCore/platform/ScrollbarThemeComposite.h \
+        Source/WebCore/platform/ScrollbarTheme.cpp \
+        Source/WebCore/platform/ScrollbarTheme.h \
+        Source/WebCore/platform/ScrollView.cpp \
+        Source/WebCore/platform/ScrollView.h \
+        Source/WebCore/platform/sql/SQLiteAuthorizer.cpp \
+        Source/WebCore/platform/sql/SQLiteDatabase.cpp \
+        Source/WebCore/platform/sql/SQLiteDatabase.h \
+        Source/WebCore/platform/sql/SQLiteFileSystem.cpp \
+        Source/WebCore/platform/sql/SQLiteFileSystem.h \
+        Source/WebCore/platform/sql/SQLiteStatement.cpp \
+        Source/WebCore/platform/sql/SQLiteStatement.h \
+        Source/WebCore/platform/sql/SQLiteTransaction.cpp \
+        Source/WebCore/platform/sql/SQLiteTransaction.h \
+        Source/WebCore/platform/sql/SQLValue.cpp \
+        Source/WebCore/platform/sql/SQLValue.h \
+        Source/WebCore/platform/ScrollAnimator.cpp \
+        Source/WebCore/platform/ScrollAnimator.h \
+        Source/WebCore/platform/ScrollAnimatorNone.cpp \
+        Source/WebCore/platform/ScrollAnimatorNone.h \
+        Source/WebCore/platform/ThreadGlobalData.cpp \
+        Source/WebCore/platform/ThreadGlobalData.h
+
+platform_sources += \
</ins><span class="cx">         Source/WebCore/platform/animation/AnimationUtilities.h \
</span><span class="cx">         Source/WebCore/platform/animation/TimingFunction.h \
</span><ins>+        Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp \
+        Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.h \
+        Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp \
+        Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp \
+        Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp \
+        Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.h \
</ins><span class="cx">         Source/WebCore/platform/audio/AudioArray.h \
</span><span class="cx">         Source/WebCore/platform/audio/AudioBus.cpp \
</span><span class="cx">         Source/WebCore/platform/audio/AudioBus.h \
</span><span class="lines">@@ -5402,28 +5625,16 @@
</span><span class="cx">         Source/WebCore/platform/audio/FFTFrame.cpp \
</span><span class="cx">         Source/WebCore/platform/audio/FFTFrame.h \
</span><span class="cx">         Source/WebCore/platform/audio/FFTFrameStub.cpp \
</span><del>-        Source/WebCore/platform/audio/HRTFDatabase.cpp \
-        Source/WebCore/platform/audio/HRTFDatabase.h \
-        Source/WebCore/platform/audio/HRTFDatabaseLoader.cpp \
-        Source/WebCore/platform/audio/HRTFDatabaseLoader.h \
-        Source/WebCore/platform/audio/HRTFElevation.cpp \
-        Source/WebCore/platform/audio/HRTFElevation.h \
-        Source/WebCore/platform/audio/HRTFKernel.cpp \
-        Source/WebCore/platform/audio/HRTFKernel.h \
-        Source/WebCore/platform/audio/HRTFPanner.cpp \
-        Source/WebCore/platform/audio/HRTFPanner.h \
</del><span class="cx">         Source/WebCore/platform/audio/MultiChannelResampler.cpp \
</span><span class="cx">         Source/WebCore/platform/audio/MultiChannelResampler.h \
</span><del>-        Source/WebCore/platform/audio/Panner.cpp \
-        Source/WebCore/platform/audio/Panner.h \
</del><ins>+        Source/WebCore/platform/audio/Reverb.cpp \
+        Source/WebCore/platform/audio/Reverb.h \
</ins><span class="cx">         Source/WebCore/platform/audio/ReverbAccumulationBuffer.cpp \
</span><span class="cx">         Source/WebCore/platform/audio/ReverbAccumulationBuffer.h \
</span><span class="cx">         Source/WebCore/platform/audio/ReverbConvolver.cpp \
</span><span class="cx">         Source/WebCore/platform/audio/ReverbConvolver.h \
</span><span class="cx">         Source/WebCore/platform/audio/ReverbConvolverStage.cpp \
</span><span class="cx">         Source/WebCore/platform/audio/ReverbConvolverStage.h \
</span><del>-        Source/WebCore/platform/audio/Reverb.cpp \
-        Source/WebCore/platform/audio/Reverb.h \
</del><span class="cx">         Source/WebCore/platform/audio/ReverbInputBuffer.cpp \
</span><span class="cx">         Source/WebCore/platform/audio/ReverbInputBuffer.h \
</span><span class="cx">         Source/WebCore/platform/audio/SincResampler.cpp \
</span><span class="lines">@@ -5432,93 +5643,39 @@
</span><span class="cx">         Source/WebCore/platform/audio/VectorMath.h \
</span><span class="cx">         Source/WebCore/platform/audio/ZeroPole.cpp \
</span><span class="cx">         Source/WebCore/platform/audio/ZeroPole.h \
</span><del>-        Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp \
-        Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.h \
-        Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp \
-        Source/WebCore/platform/Arena.cpp \
-        Source/WebCore/platform/Arena.h \
-        Source/WebCore/platform/AsyncFileSystem.cpp \
-        Source/WebCore/platform/AsyncFileSystem.h \
-        Source/WebCore/platform/AsyncFileSystemCallbacks.h \
-        Source/WebCore/platform/CalculationValue.cpp \
-        Source/WebCore/platform/CalculationValue.h \
-        Source/WebCore/platform/Clock.cpp \
-        Source/WebCore/platform/Clock.h \
-        Source/WebCore/platform/ClockGeneric.cpp \
-        Source/WebCore/platform/ClockGeneric.h \
-        Source/WebCore/platform/ColorChooser.h \
-        Source/WebCore/platform/ColorChooserClient.h \
-        Source/WebCore/platform/ContentType.cpp \
-        Source/WebCore/platform/ContentType.h \
-        Source/WebCore/platform/ContextMenu.h \
-        Source/WebCore/platform/ContextMenuItem.h \
-        Source/WebCore/platform/Cookie.h \
-        Source/WebCore/platform/CookiesStrategy.h \
-        Source/WebCore/platform/CrossThreadCopier.cpp \
-        Source/WebCore/platform/CrossThreadCopier.h \
-        Source/WebCore/platform/Cursor.cpp \
-        Source/WebCore/platform/Cursor.h \
-        Source/WebCore/platform/DatabaseStrategy.cpp \
-        Source/WebCore/platform/DatabaseStrategy.h \
-        Source/WebCore/platform/DateComponents.cpp \
-        Source/WebCore/platform/DateComponents.h \
-        Source/WebCore/platform/DateTimeChooser.h \
-        Source/WebCore/platform/DateTimeChooserClient.h \
-        Source/WebCore/platform/Decimal.cpp \
-        Source/WebCore/platform/Decimal.h \
-        Source/WebCore/platform/DragData.cpp \
-        Source/WebCore/platform/DragData.h \
-        Source/WebCore/platform/DragImage.cpp \
-        Source/WebCore/platform/DragImage.h \
-        Source/WebCore/platform/EventLoop.h \
-        Source/WebCore/platform/PlatformInstrumentation.cpp \
-        Source/WebCore/platform/PlatformInstrumentation.h \
-        Source/WebCore/platform/FileChooser.cpp \
-        Source/WebCore/platform/FileChooser.h \
-        Source/WebCore/platform/FileMetadata.h \
-        Source/WebCore/platform/FileStreamClient.h \
-        Source/WebCore/platform/FileStream.cpp \
-        Source/WebCore/platform/FileStream.h \
-        Source/WebCore/platform/FileSystem.cpp \
-        Source/WebCore/platform/FileSystem.h \
-        Source/WebCore/platform/FloatConversion.h \
-        Source/WebCore/platform/LayoutUnit.h \
-        Source/WebCore/platform/Gamepads.h \
-        Source/WebCore/platform/HashTools.h \
-        Source/WebCore/platform/InitializeLogging.h \
-        Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp \
-        Source/WebCore/platform/graphics/ANGLEWebKitBridge.h \
-        Source/WebCore/platform/graphics/AudioTrackPrivate.h \
-        Source/WebCore/platform/graphics/cpu/arm/GraphicsContext3DNEON.h \
-        Source/WebCore/platform/graphics/cpu/arm/filters/NEONHelpers.h \
-        Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h \
-        Source/WebCore/platform/graphics/cpu/arm/filters/FECompositeArithmeticNEON.h \
-        Source/WebCore/platform/graphics/cpu/arm/filters/FEGaussianBlurNEON.h \
-        Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp \
-        Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h \
-        Source/WebCore/platform/graphics/BitmapImage.cpp \
-        Source/WebCore/platform/graphics/BitmapImage.h \
-        Source/WebCore/platform/graphics/Color.cpp \
-        Source/WebCore/platform/graphics/Color.h \
-        Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp \
-        Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h \
-        Source/WebCore/platform/graphics/ColorSpace.h \
-        Source/WebCore/platform/graphics/DashArray.h \
-        Source/WebCore/platform/graphics/DisplayRefreshMonitor.h \
-        Source/WebCore/platform/graphics/Extensions3D.h \
-        Source/WebCore/platform/graphics/NativeImagePtr.h \
</del><ins>+        Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.h \
+        Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp \
+        Source/WebCore/platform/geoclue/GeolocationProviderGeoclueClient.h \
</ins><span class="cx">         Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp \
</span><ins>+        Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp \
+        Source/WebCore/platform/graphics/cairo/CairoUtilities.h \
</ins><span class="cx">         Source/WebCore/platform/graphics/cairo/FloatRectCairo.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/cairo/FontCairo.cpp \
</span><ins>+        Source/WebCore/platform/graphics/cairo/FontCairoHarfbuzzNG.cpp \
</ins><span class="cx">         Source/WebCore/platform/graphics/cairo/FontCustomPlatformData.h \
</span><span class="cx">         Source/WebCore/platform/graphics/cairo/GradientCairo.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h \
</span><span class="cx">         Source/WebCore/platform/graphics/cairo/ImageCairo.cpp \
</span><ins>+        Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp \
+        Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp \
+        Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h \
</ins><span class="cx">         Source/WebCore/platform/graphics/cairo/PathCairo.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/cairo/PatternCairo.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h \
</span><ins>+        Source/WebCore/platform/graphics/cairo/PlatformPathCairo.h \
+        Source/WebCore/platform/graphics/cairo/PlatformPathCairo.cpp \
+        Source/WebCore/platform/graphics/cairo/RefPtrCairo.cpp \
+        Source/WebCore/platform/graphics/cairo/RefPtrCairo.h \
+        Source/WebCore/platform/graphics/cairo/TransformationMatrixCairo.cpp \
+        Source/WebCore/platform/graphics/cpu/arm/GraphicsContext3DNEON.h \
+        Source/WebCore/platform/graphics/cpu/arm/filters/NEONHelpers.h \
+        Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h \
+        Source/WebCore/platform/graphics/cpu/arm/filters/FECompositeArithmeticNEON.h \
+        Source/WebCore/platform/graphics/cpu/arm/filters/FEGaussianBlurNEON.h \
+        Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp \
+        Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h \
</ins><span class="cx">         Source/WebCore/platform/graphics/filters/CustomFilterArrayParameter.h \
</span><span class="cx">         Source/WebCore/platform/graphics/filters/CustomFilterColorParameter.h \
</span><span class="cx">         Source/WebCore/platform/graphics/filters/CustomFilterConstants.h \
</span><span class="lines">@@ -5548,60 +5705,66 @@
</span><span class="cx">         Source/WebCore/platform/graphics/filters/CustomFilterTransformParameter.h \
</span><span class="cx">         Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.h \
</span><del>-        Source/WebCore/platform/graphics/filters/DistantLightSource.cpp \
-        Source/WebCore/platform/graphics/filters/DistantLightSource.h \
-        Source/WebCore/platform/graphics/filters/FEBlend.cpp \
-        Source/WebCore/platform/graphics/filters/FEBlend.h \
-        Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp \
-        Source/WebCore/platform/graphics/filters/FEColorMatrix.h \
-        Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp \
-        Source/WebCore/platform/graphics/filters/FEComponentTransfer.h \
-        Source/WebCore/platform/graphics/filters/FEComposite.cpp \
-        Source/WebCore/platform/graphics/filters/FEComposite.h \
-        Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp \
-        Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h \
-        Source/WebCore/platform/graphics/filters/FECustomFilter.cpp \
-        Source/WebCore/platform/graphics/filters/FECustomFilter.h \
-        Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp \
-        Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h \
-        Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp \
-        Source/WebCore/platform/graphics/filters/FEDisplacementMap.h \
-        Source/WebCore/platform/graphics/filters/FEDropShadow.cpp \
-        Source/WebCore/platform/graphics/filters/FEDropShadow.h \
-        Source/WebCore/platform/graphics/filters/FEFlood.cpp \
-        Source/WebCore/platform/graphics/filters/FEFlood.h \
-        Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp \
-        Source/WebCore/platform/graphics/filters/FEGaussianBlur.h \
</del><span class="cx">         Source/WebCore/platform/graphics/filters/FELighting.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/filters/FELighting.h \
</span><del>-        Source/WebCore/platform/graphics/filters/FEMerge.cpp \
-        Source/WebCore/platform/graphics/filters/FEMerge.h \
-        Source/WebCore/platform/graphics/filters/FEMorphology.cpp \
-        Source/WebCore/platform/graphics/filters/FEMorphology.h \
-        Source/WebCore/platform/graphics/filters/FEOffset.cpp \
-        Source/WebCore/platform/graphics/filters/FEOffset.h \
-        Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp \
-        Source/WebCore/platform/graphics/filters/FESpecularLighting.h \
-        Source/WebCore/platform/graphics/filters/FETile.cpp \
-        Source/WebCore/platform/graphics/filters/FETile.h \
-        Source/WebCore/platform/graphics/filters/FETurbulence.cpp \
-        Source/WebCore/platform/graphics/filters/FETurbulence.h \
</del><span class="cx">         Source/WebCore/platform/graphics/filters/Filter.h \
</span><span class="cx">         Source/WebCore/platform/graphics/filters/FilterEffect.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/filters/FilterEffect.h \
</span><del>-        Source/WebCore/platform/graphics/filters/FilterOperation.h \
-        Source/WebCore/platform/graphics/filters/FilterOperation.cpp \
-        Source/WebCore/platform/graphics/filters/FilterOperations.cpp \
-        Source/WebCore/platform/graphics/filters/FilterOperations.h \
</del><span class="cx">         Source/WebCore/platform/graphics/filters/LightSource.h \
</span><span class="cx">         Source/WebCore/platform/graphics/filters/PointLightSource.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/filters/PointLightSource.h \
</span><del>-        Source/WebCore/platform/graphics/filters/SourceAlpha.cpp \
-        Source/WebCore/platform/graphics/filters/SourceAlpha.h \
-        Source/WebCore/platform/graphics/filters/SourceGraphic.cpp \
-        Source/WebCore/platform/graphics/filters/SourceGraphic.h \
</del><span class="cx">         Source/WebCore/platform/graphics/filters/SpotLightSource.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/filters/SpotLightSource.h \
</span><ins>+        Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp \
+        Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp \
+        Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp \
+        Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp \
+        Source/WebCore/platform/graphics/freetype/UTF16UChar32Iterator.h \
+        Source/WebCore/platform/graphics/gpu/Texture.cpp \
+        Source/WebCore/platform/graphics/gpu/Texture.h \
+        Source/WebCore/platform/graphics/gpu/TilingData.cpp \
+        Source/WebCore/platform/graphics/gpu/TilingData.h \
+        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.cpp \
+        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.h \
+        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp \
+        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp \
+        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.h \
+        Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp \
+        Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h \
+        Source/WebCore/platform/graphics/transforms/AffineTransform.cpp \
+        Source/WebCore/platform/graphics/transforms/AffineTransform.h \
+        Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h \
+        Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp \
+        Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h \
+        Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp \
+        Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h \
+        Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp \
+        Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h \
+        Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp \
+        Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h \
+        Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp \
+        Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h \
+        Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp \
+        Source/WebCore/platform/graphics/transforms/TransformationMatrix.h \
+        Source/WebCore/platform/graphics/transforms/TransformOperation.h \
+        Source/WebCore/platform/graphics/transforms/TransformOperations.cpp \
+        Source/WebCore/platform/graphics/transforms/TransformOperations.h \
+        Source/WebCore/platform/graphics/transforms/TransformState.cpp \
+        Source/WebCore/platform/graphics/transforms/TransformState.h \
+        Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp \
+        Source/WebCore/platform/graphics/ANGLEWebKitBridge.h \
+        Source/WebCore/platform/graphics/AudioTrackPrivate.h \
+        Source/WebCore/platform/graphics/BitmapImage.cpp \
+        Source/WebCore/platform/graphics/BitmapImage.h \
+        Source/WebCore/platform/graphics/Color.cpp \
+        Source/WebCore/platform/graphics/Color.h \
+        Source/WebCore/platform/graphics/ColorSpace.h \
+        Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp \
+        Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h \
+        Source/WebCore/platform/graphics/DashArray.h \
+        Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp \
+        Source/WebCore/platform/graphics/DisplayRefreshMonitor.h \
+        Source/WebCore/platform/graphics/Extensions3D.h \
</ins><span class="cx">         Source/WebCore/platform/graphics/FloatPoint3D.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/FloatPoint3D.h \
</span><span class="cx">         Source/WebCore/platform/graphics/FloatPoint.cpp \
</span><span class="lines">@@ -5638,12 +5801,6 @@
</span><span class="cx">         Source/WebCore/platform/graphics/FontSmoothingMode.h \
</span><span class="cx">         Source/WebCore/platform/graphics/FontTraitsMask.h \
</span><span class="cx">         Source/WebCore/platform/graphics/FontWidthVariant.h \
</span><del>-        Source/WebCore/platform/graphics/LayoutBoxExtent.cpp \
-        Source/WebCore/platform/graphics/LayoutBoxExtent.h \
-        Source/WebCore/platform/graphics/LayoutPoint.h \
-        Source/WebCore/platform/graphics/LayoutRect.cpp \
-        Source/WebCore/platform/graphics/LayoutRect.h \
-        Source/WebCore/platform/graphics/LayoutSize.h \
</del><span class="cx">         Source/WebCore/platform/graphics/GeneratedImage.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/GeneratedImage.h \
</span><span class="cx">         Source/WebCore/platform/graphics/GeneratorGeneratedImage.cpp \
</span><span class="lines">@@ -5654,35 +5811,19 @@
</span><span class="cx">         Source/WebCore/platform/graphics/GlyphPage.h \
</span><span class="cx">         Source/WebCore/platform/graphics/GlyphPageTreeNode.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/GlyphPageTreeNode.h \
</span><del>-        Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp \
-        Source/WebCore/platform/graphics/gpu/DrawingBuffer.h \
-        Source/WebCore/platform/graphics/gpu/Texture.cpp \
-        Source/WebCore/platform/graphics/gpu/Texture.h \
-        Source/WebCore/platform/graphics/gpu/TilingData.cpp \
-        Source/WebCore/platform/graphics/gpu/TilingData.h \
</del><span class="cx">         Source/WebCore/platform/graphics/Gradient.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/Gradient.h \
</span><span class="cx">         Source/WebCore/platform/graphics/GraphicsContext.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/GraphicsContext.h \
</span><del>-        Source/WebCore/platform/graphics/GraphicsContext3D.cpp \
-        Source/WebCore/platform/graphics/GraphicsContext3D.h \
-        Source/WebCore/platform/graphics/GraphicsLayer.h \
-        Source/WebCore/platform/graphics/GraphicsLayer.cpp \
-        Source/WebCore/platform/graphics/GraphicsLayerClient.h \
-        Source/WebCore/platform/graphics/GraphicsLayerFactory.h \
-        Source/WebCore/platform/graphics/GraphicsLayerUpdater.h \
-        Source/WebCore/platform/graphics/GraphicsLayerUpdater.cpp \
</del><span class="cx">         Source/WebCore/platform/graphics/GraphicsTypes.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/GraphicsTypes.h \
</span><span class="cx">         Source/WebCore/platform/graphics/GraphicsTypes3D.h \
</span><del>-        Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp \
-        Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h \
</del><span class="cx">         Source/WebCore/platform/graphics/Icon.h \
</span><ins>+        Source/WebCore/platform/graphics/Image.cpp \
+        Source/WebCore/platform/graphics/Image.h \
</ins><span class="cx">         Source/WebCore/platform/graphics/ImageBuffer.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/ImageBuffer.h \
</span><span class="cx">         Source/WebCore/platform/graphics/ImageBufferData.h \
</span><del>-        Source/WebCore/platform/graphics/Image.cpp \
-        Source/WebCore/platform/graphics/Image.h \
</del><span class="cx">         Source/WebCore/platform/graphics/ImageObserver.h \
</span><span class="cx">         Source/WebCore/platform/graphics/ImageOrientation.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/ImageOrientation.h \
</span><span class="lines">@@ -5697,14 +5838,13 @@
</span><span class="cx">         Source/WebCore/platform/graphics/IntRectExtent.h \
</span><span class="cx">         Source/WebCore/platform/graphics/IntSize.h \
</span><span class="cx">         Source/WebCore/platform/graphics/IntSizeHash.h \
</span><del>-        Source/WebCore/platform/graphics/Latin1TextIterator.h \
-        Source/WebCore/platform/graphics/MediaPlayer.cpp \
-        Source/WebCore/platform/graphics/MediaPlayer.h \
-        Source/WebCore/platform/graphics/MediaPlayerPrivate.h \
-        Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp \
-        Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h \
-        Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp \
-        Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.h \
</del><ins>+        Source/WebCore/platform/graphics/LayoutBoxExtent.cpp \
+        Source/WebCore/platform/graphics/LayoutBoxExtent.h \
+        Source/WebCore/platform/graphics/LayoutPoint.h \
+        Source/WebCore/platform/graphics/LayoutRect.cpp \
+        Source/WebCore/platform/graphics/LayoutRect.h \
+        Source/WebCore/platform/graphics/LayoutSize.h \
+        Source/WebCore/platform/graphics/NativeImagePtr.h \
</ins><span class="cx">         Source/WebCore/platform/graphics/Path.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/Path.h \
</span><span class="cx">         Source/WebCore/platform/graphics/PathTraversalState.cpp \
</span><span class="lines">@@ -5733,30 +5873,6 @@
</span><span class="cx">         Source/WebCore/platform/graphics/TextTrackRepresentation.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/TextTrackRepresentation.h \
</span><span class="cx">         Source/WebCore/platform/graphics/TiledBacking.h \
</span><del>-        Source/WebCore/platform/graphics/transforms/AffineTransform.cpp \
-        Source/WebCore/platform/graphics/transforms/AffineTransform.h \
-        Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h \
-        Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp \
-        Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h \
-        Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp \
-        Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h \
-        Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp \
-        Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h \
-        Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp \
-        Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h \
-        Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp \
-        Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h \
-        Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp \
-        Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h \
-        Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp \
-        Source/WebCore/platform/graphics/transforms/TransformationMatrix.h \
-        Source/WebCore/platform/graphics/transforms/TransformOperation.h \
-        Source/WebCore/platform/graphics/transforms/TransformOperations.cpp \
-        Source/WebCore/platform/graphics/transforms/TransformOperations.h \
-        Source/WebCore/platform/graphics/transforms/TransformState.cpp \
-        Source/WebCore/platform/graphics/transforms/TransformState.h \
-        Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp \
-        Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h \
</del><span class="cx">         Source/WebCore/platform/graphics/TypesettingFeatures.h \
</span><span class="cx">         Source/WebCore/platform/graphics/UnitBezier.h \
</span><span class="cx">         Source/WebCore/platform/graphics/VideoTrackPrivate.h \
</span><span class="lines">@@ -5766,74 +5882,41 @@
</span><span class="cx">         Source/WebCore/platform/graphics/WindRule.h \
</span><span class="cx">         Source/WebCore/platform/graphics/WOFFFileFormat.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/WOFFFileFormat.h \
</span><del>-        Source/WebCore/platform/gtk/ErrorsGtk.cpp \
-        Source/WebCore/platform/gtk/ErrorsGtk.h \
-        Source/WebCore/platform/gtk/GamepadsGtk.cpp \
-        Source/WebCore/platform/HostWindow.h \
-        Source/WebCore/platform/KillRing.h \
-        Source/WebCore/platform/KillRingNone.cpp \
-        Source/WebCore/platform/KURL.cpp \
-        Source/WebCore/platform/KURL.h \
-        Source/WebCore/platform/KURLHash.h \
-        Source/WebCore/platform/Language.cpp \
-        Source/WebCore/platform/Language.h \
-        Source/WebCore/platform/LengthBox.cpp \
-        Source/WebCore/platform/LengthBox.h \
-        Source/WebCore/platform/Length.cpp \
-        Source/WebCore/platform/Length.h \
-        Source/WebCore/platform/LengthSize.h \
-        Source/WebCore/platform/LocalizedStrings.h \
-        Source/WebCore/platform/MainThreadTask.h \
-        Source/WebCore/platform/MIMETypeRegistry.cpp \
-        Source/WebCore/platform/MIMETypeRegistry.h \
-        Source/WebCore/platform/linux/GamepadDeviceLinux.cpp \
-        Source/WebCore/platform/linux/GamepadDeviceLinux.h \
-        Source/WebCore/platform/mediastream/MediaConstraints.h \
-        Source/WebCore/platform/mediastream/MediaStreamCenter.cpp \
-        Source/WebCore/platform/mediastream/MediaStreamCenter.h \
-        Source/WebCore/platform/mediastream/MediaStreamComponent.h \
-        Source/WebCore/platform/mediastream/MediaStreamDescriptor.h \
-        Source/WebCore/platform/mediastream/MediaStreamSource.cpp \
-        Source/WebCore/platform/mediastream/MediaStreamSource.h \
-        Source/WebCore/platform/mediastream/MediaStreamSourcesQueryClient.h \
-        Source/WebCore/platform/mediastream/RTCConfiguration.h \
-        Source/WebCore/platform/mediastream/RTCDTMFSenderHandler.h \
-        Source/WebCore/platform/mediastream/RTCDTMFSenderHandlerClient.h \
-        Source/WebCore/platform/mediastream/RTCDataChannelHandler.h \
-        Source/WebCore/platform/mediastream/RTCDataChannelHandlerClient.h \
-        Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.cpp \
-        Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.h \
-        Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp \
-        Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h \
-        Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h \
-        Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h \
-        Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.cpp \
-        Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h \
-        Source/WebCore/platform/mediastream/RTCStatsRequest.h \
-        Source/WebCore/platform/mediastream/RTCVoidRequest.h \
-        Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp \
-        Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h \
-        Source/WebCore/platform/mock/DeviceMotionClientMock.cpp \
-        Source/WebCore/platform/mock/DeviceMotionClientMock.h \
-        Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp \
-        Source/WebCore/platform/mock/DeviceOrientationClientMock.h \
-        Source/WebCore/platform/mock/GeolocationClientMock.cpp \
-        Source/WebCore/platform/mock/GeolocationClientMock.h \
-        Source/WebCore/platform/mock/ScrollbarThemeMock.cpp \
-        Source/WebCore/platform/mock/ScrollbarThemeMock.h \
</del><ins>+        Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp \
+        Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h \
+        Source/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp \
+        Source/WebCore/platform/image-decoders/bmp/BMPImageReader.h \
+        Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp \
+        Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp \
+        Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h \
+        Source/WebCore/platform/image-decoders/gif/GIFImageReader.cpp \
+        Source/WebCore/platform/image-decoders/gif/GIFImageReader.h \
+        Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp \
+        Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h \
+        Source/WebCore/platform/image-decoders/ImageDecoder.cpp \
+        Source/WebCore/platform/image-decoders/ImageDecoder.h \
+        Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp \
+        Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h \
+        Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp \
+        Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h \
+        Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp \
+        Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h \
+        Source/WebCore/platform/leveldb/LevelDBComparator.h \
+        Source/WebCore/platform/leveldb/LevelDBDatabase.cpp \
+        Source/WebCore/platform/leveldb/LevelDBDatabase.h \
+        Source/WebCore/platform/leveldb/LevelDBIterator.h \
+        Source/WebCore/platform/leveldb/LevelDBSlice.h \
+        Source/WebCore/platform/leveldb/LevelDBTransaction.h \
+        Source/WebCore/platform/leveldb/LevelDBTransaction.cpp \
+        Source/WebCore/platform/leveldb/LevelDBWriteBatch.h \
+        Source/WebCore/platform/leveldb/LevelDBWriteBatch.cpp \
+        Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp \
+        Source/WebCore/platform/network/soup/GOwnPtrSoup.h \
+        Source/WebCore/platform/network/soup/SoupURIUtils.cpp \
+        Source/WebCore/platform/network/soup/SoupURIUtils.h \
</ins><span class="cx">         Source/WebCore/platform/network/AuthenticationChallengeBase.cpp \
</span><span class="cx">         Source/WebCore/platform/network/AuthenticationChallengeBase.h \
</span><span class="cx">         Source/WebCore/platform/network/AuthenticationClient.h \
</span><del>-        Source/WebCore/platform/network/BlobData.cpp \
-        Source/WebCore/platform/network/BlobData.h \
-        Source/WebCore/platform/network/BlobRegistry.h \
-        Source/WebCore/platform/network/BlobRegistry.cpp \
-        Source/WebCore/platform/network/BlobRegistryImpl.cpp \
-        Source/WebCore/platform/network/BlobRegistryImpl.h \
-        Source/WebCore/platform/network/BlobResourceHandle.cpp \
-        Source/WebCore/platform/network/BlobResourceHandle.h \
-        Source/WebCore/platform/network/BlobStorageData.h \
-        Source/WebCore/platform/network/CookieStorage.h \
</del><span class="cx">         Source/WebCore/platform/network/Credential.cpp \
</span><span class="cx">         Source/WebCore/platform/network/Credential.h \
</span><span class="cx">         Source/WebCore/platform/network/CredentialStorage.cpp \
</span><span class="lines">@@ -5841,134 +5924,21 @@
</span><span class="cx">         Source/WebCore/platform/network/DNS.h \
</span><span class="cx">         Source/WebCore/platform/network/DNSResolveQueue.cpp \
</span><span class="cx">         Source/WebCore/platform/network/DNSResolveQueue.h \
</span><del>-        Source/WebCore/platform/network/FormDataBuilder.cpp \
-        Source/WebCore/platform/network/FormDataBuilder.h \
-        Source/WebCore/platform/network/FormData.cpp \
-        Source/WebCore/platform/network/FormData.h \
</del><span class="cx">         Source/WebCore/platform/network/HTTPHeaderMap.cpp \
</span><span class="cx">         Source/WebCore/platform/network/HTTPHeaderMap.h \
</span><del>-        Source/WebCore/platform/network/HTTPParsers.cpp \
-        Source/WebCore/platform/network/HTTPParsers.h \
</del><span class="cx">         Source/WebCore/platform/network/MIMEHeader.cpp \
</span><span class="cx">         Source/WebCore/platform/network/MIMEHeader.h \
</span><del>-        Source/WebCore/platform/network/NetworkingContext.h \
-        Source/WebCore/platform/network/ProxyServer.cpp \
-        Source/WebCore/platform/network/ProxyServer.h \
-        Source/WebCore/platform/network/NetworkStateNotifier.cpp \
-        Source/WebCore/platform/network/NetworkStateNotifier.h \
-        Source/WebCore/platform/network/NetworkStorageSession.h \
</del><span class="cx">         Source/WebCore/platform/network/ParsedContentType.cpp \
</span><span class="cx">         Source/WebCore/platform/network/ParsedContentType.h \
</span><del>-        Source/WebCore/platform/network/PlatformCookieJar.h \
</del><span class="cx">         Source/WebCore/platform/network/ProtectionSpaceHash.h \
</span><span class="cx">         Source/WebCore/platform/network/ProtectionSpace.cpp \
</span><span class="cx">         Source/WebCore/platform/network/ProtectionSpace.h \
</span><del>-        Source/WebCore/platform/network/ResourceErrorBase.cpp \
-        Source/WebCore/platform/network/ResourceErrorBase.h \
-        Source/WebCore/platform/network/ResourceHandleClient.cpp \
-        Source/WebCore/platform/network/ResourceHandleClient.h \
-        Source/WebCore/platform/network/ResourceHandle.cpp \
-        Source/WebCore/platform/network/ResourceHandle.h \
-        Source/WebCore/platform/network/ResourceHandleInternal.h \
-        Source/WebCore/platform/network/ResourceHandleTypes.h \
-        Source/WebCore/platform/network/ResourceLoadPriority.h \
-        Source/WebCore/platform/network/ResourceLoadTiming.cpp \
-        Source/WebCore/platform/network/ResourceLoadTiming.h \
-        Source/WebCore/platform/network/ResourceRequestBase.cpp \
-        Source/WebCore/platform/network/ResourceRequestBase.h \
-        Source/WebCore/platform/network/ResourceResponseBase.cpp \
-        Source/WebCore/platform/network/ResourceResponseBase.h \
-        Source/WebCore/platform/network/SocketStreamErrorBase.cpp \
-        Source/WebCore/platform/network/SocketStreamErrorBase.h \
-        Source/WebCore/platform/network/SocketStreamHandleBase.cpp \
-        Source/WebCore/platform/network/SocketStreamHandleBase.h \
-        Source/WebCore/platform/network/SocketStreamHandleClient.h \
-        Source/WebCore/platform/network/soup/AuthenticationChallenge.h \
-        Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp \
-        Source/WebCore/platform/network/soup/CookieJarSoup.cpp \
-        Source/WebCore/platform/network/soup/CookieJarSoup.h \
-        Source/WebCore/platform/network/soup/CookieStorageSoup.cpp \
-        Source/WebCore/platform/network/soup/CredentialStorageSoup.cpp \
-        Source/WebCore/platform/network/soup/DNSSoup.cpp \
-        Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp \
-        Source/WebCore/platform/network/soup/ProxyServerSoup.cpp \
-        Source/WebCore/platform/network/soup/ResourceError.h \
-        Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp \
-        Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp \
-        Source/WebCore/platform/network/soup/ResourceRequest.h \
-        Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp \
-        Source/WebCore/platform/network/soup/ResourceResponse.h \
-        Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp \
-        Source/WebCore/platform/network/soup/SocketStreamError.h \
-        Source/WebCore/platform/network/soup/SocketStreamHandle.h \
-        Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp \
-        Source/WebCore/platform/Pasteboard.h \
-        Source/WebCore/platform/PasteboardStrategy.h \
-        Source/WebCore/platform/PlatformEvent.cpp \
-        Source/WebCore/platform/PlatformEvent.h \
-        Source/WebCore/platform/PlatformExportMacros.h \
-        Source/WebCore/platform/PlatformKeyboardEvent.h \
-        Source/WebCore/platform/PlatformMenuDescription.h \
-        Source/WebCore/platform/PlatformMouseEvent.h \
-        Source/WebCore/platform/PlatformPasteboard.h \
-        Source/WebCore/platform/PlatformScreen.h \
-        Source/WebCore/platform/PlatformStrategies.cpp \
-        Source/WebCore/platform/PlatformStrategies.h \
-        Source/WebCore/platform/PlatformWheelEvent.h \
-        Source/WebCore/platform/PODArena.h \
-        Source/WebCore/platform/PODFreeListArena.h \
-        Source/WebCore/platform/PODInterval.h \
-        Source/WebCore/platform/PODIntervalTree.h \
-        Source/WebCore/platform/PODRedBlackTree.h \
-        Source/WebCore/platform/PopupMenuClient.h \
-        Source/WebCore/platform/PopupMenu.h \
-        Source/WebCore/platform/PopupMenuStyle.h \
-        Source/WebCore/platform/PublicSuffix.h \
-        Source/WebCore/platform/PurgeableBuffer.h \
-        Source/WebCore/platform/PurgePriority.h \
-        Source/WebCore/platform/RefCountedSupplement.h \
-        Source/WebCore/platform/ReferrerPolicy.h \
-        Source/WebCore/platform/SchemeRegistry.cpp \
-        Source/WebCore/platform/SchemeRegistry.h \
-        Source/WebCore/platform/ScrollAnimator.cpp \
-        Source/WebCore/platform/ScrollAnimator.h \
-        Source/WebCore/platform/ScrollAnimatorNone.cpp \
-        Source/WebCore/platform/ScrollAnimatorNone.h \
-        Source/WebCore/platform/ScrollableArea.cpp \
-        Source/WebCore/platform/ScrollableArea.h \
-        Source/WebCore/platform/Scrollbar.cpp \
-        Source/WebCore/platform/Scrollbar.h \
-        Source/WebCore/platform/ScrollbarThemeClient.h \
-        Source/WebCore/platform/ScrollbarThemeComposite.cpp \
-        Source/WebCore/platform/ScrollbarThemeComposite.h \
-        Source/WebCore/platform/ScrollbarTheme.cpp \
-        Source/WebCore/platform/ScrollbarTheme.h \
-        Source/WebCore/platform/ScrollTypes.h \
-        Source/WebCore/platform/ScrollView.cpp \
-        Source/WebCore/platform/ScrollView.h \
-        Source/WebCore/platform/SearchPopupMenu.h \
-        Source/WebCore/platform/SharedBuffer.cpp \
-        Source/WebCore/platform/SharedBuffer.h \
-        Source/WebCore/platform/SharedBufferChunkReader.cpp \
-        Source/WebCore/platform/SharedBufferChunkReader.h \
-        Source/WebCore/platform/SharedTimer.h \
-        Source/WebCore/platform/Sound.h \
-        Source/WebCore/platform/sql/SQLiteAuthorizer.cpp \
-        Source/WebCore/platform/sql/SQLiteDatabase.cpp \
-        Source/WebCore/platform/sql/SQLiteDatabase.h \
-        Source/WebCore/platform/sql/SQLiteFileSystem.cpp \
-        Source/WebCore/platform/sql/SQLiteFileSystem.h \
-        Source/WebCore/platform/sql/SQLiteStatement.cpp \
-        Source/WebCore/platform/sql/SQLiteStatement.h \
-        Source/WebCore/platform/sql/SQLiteTransaction.cpp \
-        Source/WebCore/platform/sql/SQLiteTransaction.h \
-        Source/WebCore/platform/sql/SQLValue.cpp \
-        Source/WebCore/platform/sql/SQLValue.h \
-        Source/WebCore/platform/SSLKeyGenerator.h \
-        Source/WebCore/platform/SuddenTermination.h \
-        Source/WebCore/platform/Supplementable.h \
</del><ins>+        Source/WebCore/platform/network/ProxyServer.cpp \
+        Source/WebCore/platform/network/ProxyServer.h \
</ins><span class="cx">         Source/WebCore/platform/text/enchant/TextCheckerEnchant.h \
</span><span class="cx">         Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp \
</span><ins>+        Source/WebCore/platform/text/transcoder/FontTranscoder.cpp \
+        Source/WebCore/platform/text/transcoder/FontTranscoder.h \
</ins><span class="cx">         Source/WebCore/platform/text/BidiContext.cpp \
</span><span class="cx">         Source/WebCore/platform/text/BidiContext.h \
</span><span class="cx">         Source/WebCore/platform/text/BidiResolver.h \
</span><span class="lines">@@ -5999,9 +5969,9 @@
</span><span class="cx">         Source/WebCore/platform/text/TextBoundaries.cpp \
</span><span class="cx">         Source/WebCore/platform/text/TextBoundaries.h \
</span><span class="cx">         Source/WebCore/platform/text/TextBreakIterator.cpp \
</span><ins>+        Source/WebCore/platform/text/TextBreakIterator.h \
</ins><span class="cx">         Source/WebCore/platform/text/TextBreakIteratorICU.cpp \
</span><span class="cx">         Source/WebCore/platform/text/TextBreakIteratorInternalICU.h \
</span><del>-        Source/WebCore/platform/text/TextBreakIterator.h \
</del><span class="cx">         Source/WebCore/platform/text/TextCheckerClient.h \
</span><span class="cx">         Source/WebCore/platform/text/TextChecking.h \
</span><span class="cx">         Source/WebCore/platform/text/TextCodec.cpp \
</span><span class="lines">@@ -6019,84 +5989,63 @@
</span><span class="cx">         Source/WebCore/platform/text/TextCodecICU.h \
</span><span class="cx">         Source/WebCore/platform/text/TextDirection.h \
</span><span class="cx">         Source/WebCore/platform/text/TextEncoding.cpp \
</span><ins>+        Source/WebCore/platform/text/TextEncoding.h \
</ins><span class="cx">         Source/WebCore/platform/text/TextEncodingDetector.h \
</span><span class="cx">         Source/WebCore/platform/text/TextEncodingDetectorNone.cpp \
</span><del>-        Source/WebCore/platform/text/TextEncoding.h \
</del><span class="cx">         Source/WebCore/platform/text/TextEncodingRegistry.cpp \
</span><span class="cx">         Source/WebCore/platform/text/TextEncodingRegistry.h \
</span><span class="cx">         Source/WebCore/platform/text/TextStream.cpp \
</span><span class="cx">         Source/WebCore/platform/text/TextStream.h \
</span><del>-        Source/WebCore/platform/text/transcoder/FontTranscoder.cpp \
-        Source/WebCore/platform/text/transcoder/FontTranscoder.h \
</del><span class="cx">         Source/WebCore/platform/text/UnicodeBidi.h \
</span><span class="cx">         Source/WebCore/platform/text/UnicodeRange.cpp \
</span><span class="cx">         Source/WebCore/platform/text/UnicodeRange.h \
</span><span class="cx">         Source/WebCore/platform/text/WritingMode.h \
</span><del>-        Source/WebCore/platform/ThemeTypes.h \
-        Source/WebCore/platform/ThreadCheck.h \
-        Source/WebCore/platform/ThreadGlobalData.cpp \
-        Source/WebCore/platform/ThreadGlobalData.h \
-        Source/WebCore/platform/ThreadTimers.cpp \
-        Source/WebCore/platform/ThreadTimers.h \
-        Source/WebCore/platform/Timer.cpp \
-        Source/WebCore/platform/Timer.h \
-        Source/WebCore/platform/TreeShared.h \
-        Source/WebCore/platform/VisitedLinkStrategy.h \
-        Source/WebCore/platform/Widget.cpp \
-        Source/WebCore/platform/Widget.h \
-        Source/WebCore/platform/WindowsKeyboardCodes.h
-
-platform_sources += \
-        Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp \
-        Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp \
-        Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.h \
-        Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.h \
-        Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp \
-        Source/WebCore/platform/geoclue/GeolocationProviderGeoclueClient.h \
-        Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp \
-        Source/WebCore/platform/graphics/cairo/CairoUtilities.h \
-        Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp \
-        Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp \
-        Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h \
-        Source/WebCore/platform/graphics/cairo/PlatformPathCairo.h \
-        Source/WebCore/platform/graphics/cairo/PlatformPathCairo.cpp \
-        Source/WebCore/platform/graphics/cairo/RefPtrCairo.cpp \
-        Source/WebCore/platform/graphics/cairo/RefPtrCairo.h \
-        Source/WebCore/platform/graphics/cairo/TransformationMatrixCairo.cpp \
-        Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp \
-        Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h \
-        Source/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp \
-        Source/WebCore/platform/image-decoders/bmp/BMPImageReader.h \
-        Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp \
-        Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp \
-        Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h \
-        Source/WebCore/platform/image-decoders/gif/GIFImageReader.cpp \
-        Source/WebCore/platform/image-decoders/gif/GIFImageReader.h \
-        Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp \
-        Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h \
-        Source/WebCore/platform/image-decoders/ImageDecoder.cpp \
-        Source/WebCore/platform/image-decoders/ImageDecoder.h \
-        Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp \
-        Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h \
-        Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp \
-        Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h \
-        Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp \
-        Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h \
-        Source/WebCore/platform/leveldb/LevelDBComparator.h \
-        Source/WebCore/platform/leveldb/LevelDBDatabase.cpp \
-        Source/WebCore/platform/leveldb/LevelDBDatabase.h \
-        Source/WebCore/platform/leveldb/LevelDBIterator.h \
-        Source/WebCore/platform/leveldb/LevelDBSlice.h \
-        Source/WebCore/platform/leveldb/LevelDBTransaction.h \
-        Source/WebCore/platform/leveldb/LevelDBTransaction.cpp \
-        Source/WebCore/platform/leveldb/LevelDBWriteBatch.h \
-        Source/WebCore/platform/leveldb/LevelDBWriteBatch.cpp \
-        Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp \
-        Source/WebCore/platform/network/soup/GOwnPtrSoup.h \
-        Source/WebCore/platform/network/soup/SoupURIUtils.cpp \
-        Source/WebCore/platform/network/soup/SoupURIUtils.h \
</del><ins>+        Source/WebCore/platform/Arena.cpp \
+        Source/WebCore/platform/Arena.h \
+        Source/WebCore/platform/Clock.cpp \
+        Source/WebCore/platform/Clock.h \
+        Source/WebCore/platform/ClockGeneric.cpp \
+        Source/WebCore/platform/ClockGeneric.h \
+        Source/WebCore/platform/ColorChooser.h \
+        Source/WebCore/platform/ColorChooserClient.h \
+        Source/WebCore/platform/ContentType.cpp \
+        Source/WebCore/platform/ContentType.h \
+        Source/WebCore/platform/ContextMenu.cpp \
+        Source/WebCore/platform/ContextMenu.h \
+        Source/WebCore/platform/ContextMenuItem.cpp \
+        Source/WebCore/platform/ContextMenuItem.h \
+        Source/WebCore/platform/Cookie.h \
+        Source/WebCore/platform/CookiesStrategy.h \
+        Source/WebCore/platform/Cursor.cpp \
+        Source/WebCore/platform/Cursor.h \
+        Source/WebCore/platform/DateComponents.cpp \
+        Source/WebCore/platform/DateComponents.h \
+        Source/WebCore/platform/DateTimeChooser.h \
+        Source/WebCore/platform/DateTimeChooserClient.h \
+        Source/WebCore/platform/Decimal.cpp \
+        Source/WebCore/platform/Decimal.h \
+    Source/WebCore/platform/FileChooser.cpp \
+    Source/WebCore/platform/FileChooser.h \
+    Source/WebCore/platform/FileMetadata.h \
+        Source/WebCore/platform/FileStreamClient.h \
+        Source/WebCore/platform/FileStream.cpp \
+        Source/WebCore/platform/FileStream.h \
+        Source/WebCore/platform/FileSystem.cpp \
+        Source/WebCore/platform/FileSystem.h \
+        Source/WebCore/platform/FloatConversion.h \
+        Source/WebCore/platform/HashTools.h \
</ins><span class="cx">         Source/WebCore/platform/HistogramSupport.cpp \
</span><span class="cx">         Source/WebCore/platform/HistogramSupport.h \
</span><ins>+        Source/WebCore/platform/HostWindow.h \
+        Source/WebCore/platform/InitializeLogging.h \
+        Source/WebCore/platform/KURL.cpp \
+        Source/WebCore/platform/KURL.h \
+        Source/WebCore/platform/KURLHash.h \
+        Source/WebCore/platform/KillRing.h \
+        Source/WebCore/platform/KillRingNone.cpp \
+        Source/WebCore/platform/Language.cpp \
+        Source/WebCore/platform/Language.h \
+        Source/WebCore/platform/LayoutUnit.h \
</ins><span class="cx">         Source/WebCore/platform/LinkHash.cpp \
</span><span class="cx">         Source/WebCore/platform/LinkHash.h \
</span><span class="cx">         Source/WebCore/platform/Logging.cpp \
</span><span class="lines">@@ -6105,12 +6054,69 @@
</span><span class="cx">         Source/WebCore/platform/MemoryPressureHandler.h \
</span><span class="cx">         Source/WebCore/platform/NotImplemented.cpp \
</span><span class="cx">         Source/WebCore/platform/NotImplemented.h \
</span><ins>+        Source/WebCore/platform/Pasteboard.h \
+        Source/WebCore/platform/PasteboardStrategy.h \
+        Source/WebCore/platform/PlatformEvent.cpp \
+        Source/WebCore/platform/PlatformEvent.h \
+        Source/WebCore/platform/PlatformExportMacros.h \
+        Source/WebCore/platform/PlatformInstrumentation.cpp \
+        Source/WebCore/platform/PlatformInstrumentation.h \
+        Source/WebCore/platform/PlatformKeyboardEvent.h \
+        Source/WebCore/platform/PlatformMenuDescription.h \
+        Source/WebCore/platform/PlatformMouseEvent.h \
+        Source/WebCore/platform/PlatformPasteboard.h \
+        Source/WebCore/platform/PlatformScreen.h \
+        Source/WebCore/platform/PlatformStrategies.cpp \
+        Source/WebCore/platform/PlatformStrategies.h \
+        Source/WebCore/platform/PlatformWheelEvent.h \
+        Source/WebCore/platform/PopupMenuClient.h \
+        Source/WebCore/platform/PopupMenu.h \
+        Source/WebCore/platform/PopupMenuStyle.h \
+        Source/WebCore/platform/PrerenderClient.h \
+        Source/WebCore/platform/PrerenderHandle.h \
+        Source/WebCore/platform/PublicSuffix.h \
+        Source/WebCore/platform/PurgeableBuffer.h \
+        Source/WebCore/platform/PurgePriority.h \
+        Source/WebCore/platform/PODArena.h \
+        Source/WebCore/platform/PODFreeListArena.h \
+        Source/WebCore/platform/PODInterval.h \
+        Source/WebCore/platform/PODIntervalTree.h \
+        Source/WebCore/platform/PODRedBlackTree.h \
+        Source/WebCore/platform/ReferrerPolicy.h \
+        Source/WebCore/platform/RefCountedSupplement.h \
</ins><span class="cx">         Source/WebCore/platform/RunLoop.cpp \
</span><span class="cx">         Source/WebCore/platform/RunLoop.h \
</span><span class="cx">         Source/WebCore/platform/RuntimeApplicationChecks.cpp \
</span><span class="cx">         Source/WebCore/platform/RuntimeApplicationChecks.h \
</span><ins>+        Source/WebCore/platform/SearchPopupMenu.h \
+        Source/WebCore/platform/SchemeRegistry.cpp \
+        Source/WebCore/platform/SchemeRegistry.h \
+        Source/WebCore/platform/Scrollbar.cpp \
+        Source/WebCore/platform/Scrollbar.h \
+        Source/WebCore/platform/ScrollTypes.h \
+        Source/WebCore/platform/SharedBuffer.cpp \
+        Source/WebCore/platform/SharedBuffer.h \
+        Source/WebCore/platform/SharedBufferChunkReader.cpp \
+        Source/WebCore/platform/SharedBufferChunkReader.h \
+        Source/WebCore/platform/SharedTimer.h \
+        Source/WebCore/platform/Sound.h \
+        Source/WebCore/platform/SuddenTermination.h \
+        Source/WebCore/platform/Supplementable.h \
+        Source/WebCore/platform/SystemTime.h \
+        Source/WebCore/platform/SSLKeyGenerator.h \
+        Source/WebCore/platform/ThemeTypes.h \
+        Source/WebCore/platform/ThreadCheck.h \
+        Source/WebCore/platform/ThreadTimers.cpp \
+        Source/WebCore/platform/ThreadTimers.h \
+        Source/WebCore/platform/Timer.cpp \
+        Source/WebCore/platform/Timer.h \
+        Source/WebCore/platform/TreeShared.h \
</ins><span class="cx">         Source/WebCore/platform/UUID.cpp \
</span><del>-        Source/WebCore/platform/UUID.h
</del><ins>+        Source/WebCore/platform/UUID.h \
+        Source/WebCore/platform/VisitedLinkStrategy.h \
+        Source/WebCore/platform/Widget.cpp \
+        Source/WebCore/platform/Widget.h \
+        Source/WebCore/platform/WindowsKeyboardCodes.h
</ins><span class="cx"> 
</span><span class="cx"> # WebCore files that use GTK/GDK or any other dependency that requires GTK+.
</span><span class="cx"> webcoregtk_sources += \
</span><span class="lines">@@ -6148,24 +6154,12 @@
</span><span class="cx">         Source/WebCore/page/gtk/DragControllerGtk.cpp \
</span><span class="cx">         Source/WebCore/page/gtk/EventHandlerGtk.cpp \
</span><span class="cx">         Source/WebCore/platform/cairo/WidgetBackingStore.h \
</span><del>-        Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp \
-        Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h \
-        Source/WebCore/platform/graphics/freetype/FontPlatformData.h \
-        Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp \
</del><span class="cx">         Source/WebCore/platform/graphics/gstreamer/FullscreenVideoControllerGStreamer.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/gstreamer/FullscreenVideoControllerGStreamer.h \
</span><del>-        Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp \
-        Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h \
-        Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp \
-        Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h \
</del><span class="cx">         Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h \
</span><span class="cx">         Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h \
</span><del>-        Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp \
-        Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h \
-        Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp \
-        Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h \
</del><span class="cx">         Source/WebCore/platform/graphics/gtk/FullscreenVideoControllerGtk.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/gtk/FullscreenVideoControllerGtk.h \
</span><span class="cx">         Source/WebCore/platform/graphics/gtk/IconGtk.cpp \
</span><span class="lines">@@ -6197,13 +6191,29 @@
</span><span class="cx">         Source/WebCore/platform/gtk/ScrollbarThemeGtk.h \
</span><span class="cx">         Source/WebCore/platform/gtk/ScrollbarThemeGtk2.cpp \
</span><span class="cx">         Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp \
</span><del>-        Source/WebCore/platform/gtk/SearchPopupMenuGtk.cpp \
-        Source/WebCore/platform/gtk/SearchPopupMenuGtk.h \
-        Source/WebCore/platform/gtk/WidgetGtk.cpp \
</del><span class="cx">         Source/WebCore/platform/gtk/WidgetRenderingContext.cpp \
</span><span class="cx">         Source/WebCore/platform/gtk/WidgetRenderingContext.h
</span><span class="cx"> 
</span><span class="cx"> platformgtk_sources += \
</span><ins>+        Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp \
+        Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp \
+        Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h \
+        Source/WebCore/platform/graphics/freetype/FontPlatformData.h \
+        Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp \
+        Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp \
+        Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h \
+        Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp \
+        Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h \
+        Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp \
+        Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h \
+        Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp \
+        Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h \
+        Source/WebCore/platform/graphics/gtk/ColorGtk.cpp \
+        Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp \
+        Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.h \
+        Source/WebCore/platform/graphics/gtk/ImageGtk.cpp \
+        Source/WebCore/platform/graphics/gtk/IntPointGtk.cpp \
+        Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp \
</ins><span class="cx">         Source/WebCore/platform/gtk/CompositionResults.h \
</span><span class="cx">         Source/WebCore/platform/gtk/ContextMenuGtk.cpp \
</span><span class="cx">         Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp \
</span><span class="lines">@@ -6240,6 +6250,8 @@
</span><span class="cx">         Source/WebCore/platform/gtk/PlatformScreenGtk.cpp \
</span><span class="cx">         Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp \
</span><span class="cx">         Source/WebCore/platform/gtk/RunLoopGtk.cpp \
</span><ins>+        Source/WebCore/platform/gtk/SearchPopupMenuGtk.cpp \
+        Source/WebCore/platform/gtk/SearchPopupMenuGtk.h \
</ins><span class="cx">         Source/WebCore/platform/gtk/SharedBufferGtk.cpp \
</span><span class="cx">         Source/WebCore/platform/gtk/SharedTimerGtk.cpp \
</span><span class="cx">         Source/WebCore/platform/gtk/SoundGtk.cpp \
</span><span class="lines">@@ -6248,13 +6260,7 @@
</span><span class="cx">         Source/WebCore/platform/gtk/UserAgentGtk.h \
</span><span class="cx">         Source/WebCore/platform/gtk/WebKitAuthenticationWidget.cpp \
</span><span class="cx">         Source/WebCore/platform/gtk/WebKitAuthenticationWidget.h \
</span><del>-        Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp \
-        Source/WebCore/platform/graphics/gtk/ColorGtk.cpp \
-        Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp \
-        Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.h \
-        Source/WebCore/platform/graphics/gtk/ImageGtk.cpp \
-        Source/WebCore/platform/graphics/gtk/IntPointGtk.cpp \
-        Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp \
</del><ins>+        Source/WebCore/platform/gtk/WidgetGtk.cpp \
</ins><span class="cx">         Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp \
</span><span class="cx">         Source/WebCore/platform/network/gtk/CredentialBackingStore.h \
</span><span class="cx">         Source/WebCore/platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp
</span><span class="lines">@@ -6272,10 +6278,9 @@
</span><span class="cx">         Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
</span><span class="cx">         Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
</span><span class="cx"> if USE_OPENGL
</span><del>-webcoregtk_sources += \
</del><ins>+platformgtk_sources += \
</ins><span class="cx">         Source/WebCore/platform/graphics/cairo/GLContext.cpp \
</span><del>-        Source/WebCore/platform/graphics/cairo/GLContext.h
-platformgtk_sources += \
</del><ins>+        Source/WebCore/platform/graphics/cairo/GLContext.h \
</ins><span class="cx">         Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
</span><span class="cx">         Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
</span><span class="cx"> endif # END USE_OPENGL
</span><span class="lines">@@ -6336,7 +6341,7 @@
</span><span class="cx"> endif # END USE_GLES2
</span><span class="cx"> 
</span><span class="cx"> if USE_GSTREAMER
</span><del>-webcoregtk_sources += \
</del><ins>+platform_sources += \
</ins><span class="cx">         Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp \
</span><span class="cx">         Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h \
</span><span class="cx">         Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp \
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (151521 => 151522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-06-12 20:07:39 UTC (rev 151521)
+++ trunk/Source/WebKit2/ChangeLog        2013-06-12 20:18:16 UTC (rev 151522)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-06-12  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
+
+        [GTK] Move more build targets for source code that's free of layer violations into libPlatform
+        https://bugs.webkit.org/show_bug.cgi?id=115936
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Add GStreamer dependency's CFLAGS to the list of libPlatformGtk2 CPPFLAGS.
+
</ins><span class="cx"> 2013-06-12  Ruth Fong  &lt;ruth_fong@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         &quot;Open Video in New Window&quot; doesn't make sense in fullscreen
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.am (151521 => 151522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/GNUmakefile.am        2013-06-12 20:07:39 UTC (rev 151521)
+++ trunk/Source/WebKit2/GNUmakefile.am        2013-06-12 20:18:16 UTC (rev 151522)
</span><span class="lines">@@ -520,6 +520,7 @@
</span><span class="cx">         $(platform_webcore_cppflags) \
</span><span class="cx">         $(javascriptcore_cppflags) \
</span><span class="cx">         -fno-strict-aliasing \
</span><ins>+        $(GSTREAMER_CFLAGS) \
</ins><span class="cx">         $(GTK2_CFLAGS) \
</span><span class="cx">         $(LIBSECRET_CFLAGS) \
</span><span class="cx">         $(LIBSOUP_CFLAGS)
</span></span></pre>
</div>
</div>

</body>
</html>