<!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>[236118] releases/WebKitGTK/webkit-2.22/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/236118">236118</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2018-09-18 06:31:38 -0700 (Tue, 18 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/235521">r235521</a> - Bundle unified sources more tightly in projects with deep directory structures
https://bugs.webkit.org/show_bug.cgi?id=189009

Reviewed by Simon Fraser.

* Scripts/generate-unified-source-bundles.rb:
It turns out our plan to switch unified source bundle every time the directory
changes is not a good fit for projects like WebKit2 with many small directories.
It leaves many unified source bundles with only a single source file,
achieving only ~40% density.

Instead, switch unified source bundles every time the top-level directory changes.
This still achieves the goal of *usually* only rebuilding the one top-level
directory you touched, and increases source bundle density wildly, to ~95%.

Fix a variety of unification errors due to reshuffling the bundles.

* Modules/mediastream/RTCController.cpp:
* SourcesCocoa.txt:
* WebCore.xcodeproj/project.pbxproj:
* crypto/algorithms/CryptoAlgorithmECDSA.cpp:
(WebCore::CryptoAlgorithmECDSA::importKey):
* dom/Document.h:
* html/parser/HTMLTreeBuilder.cpp:
* loader/appcache/ApplicationCacheResourceLoader.h:
* page/AlternativeTextClient.h:
* platform/Pasteboard.h:
* platform/graphics/DisplayRefreshMonitor.cpp:
* platform/graphics/FontFamilySpecificationNull.cpp:
* platform/graphics/cocoa/WebGLLayer.mm:
(-[WebGLLayer initWithGraphicsContext3D:]):
(-[WebGLLayer copyImageSnapshotWithColorSpace:]):
(-[WebGLLayer display]):
(-[WebGLLayer allocateIOSurfaceBackingStoreWithSize:usingAlpha:]):
* platform/graphics/cocoa/WebGPULayer.mm:
(-[WebGPULayer initWithGPUDevice:]):
* platform/graphics/metal/GPUCommandQueueMetal.mm:
* platform/mac/PasteboardMac.mm:
* platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp:
* platform/network/ResourceRequestBase.cpp:
* rendering/updating/RenderTreeBuilderBlockFlow.cpp:
* rendering/updating/RenderTreeBuilderInline.cpp:

* Shared/APIWebArchive.mm:
* Shared/APIWebArchiveResource.mm:
* Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
* Shared/Plugins/Netscape/mac/PluginInformationMac.mm:
* SourcesCocoa.txt:
* SourcesGTK.txt:
* UIProcess/API/APIAutomationSessionClient.h:
(API::AutomationSessionClient::sessionIdentifier const):
(API::AutomationSessionClient::messageOfCurrentJavaScriptDialogOnPage):
(API::AutomationSessionClient::setUserInputForCurrentJavaScriptPromptOnPage):
* UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm:
(-[WKCustomProtocolLoader initWithLegacyCustomProtocolManagerProxy:customProtocolID:request:]):
(-[WKCustomProtocolLoader connection:didFailWithError:]):
(-[WKCustomProtocolLoader connection:didReceiveResponse:]):
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::generatePluginProcessCallbackID):
(WebKit::PluginProcessProxy::fetchWebsiteData):
(WebKit::PluginProcessProxy::deleteWebsiteData):
(WebKit::PluginProcessProxy::deleteWebsiteDataForHostNames):
(WebKit::generateCallbackID): Deleted.
* UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
(-[WKScrollingNodeScrollViewDelegate scrollViewWillEndDragging:withVelocity:targetContentOffset:]):
* UIProcess/Storage/StorageProcessProxy.cpp:
(WebKit::generateStorageProcessCallbackID):
(WebKit::StorageProcessProxy::fetchWebsiteData):
(WebKit::StorageProcessProxy::deleteWebsiteData):
(WebKit::StorageProcessProxy::deleteWebsiteDataForOrigins):
(WebKit::generateCallbackID): Deleted.
* WebKit.xcodeproj/project.pbxproj:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(-[WKPDFPluginAccessibilityObject accessibilityPerformAction:]):
(-[WKPDFPluginAccessibilityObject accessibilityFocusedUIElement]):
(-[WKPDFPluginAccessibilityObject accessibilityAssociatedControlForAnnotation:]):
(-[WKPDFPluginAccessibilityObject accessibilityHitTest:]):
(-[WKPDFLayerControllerDelegate updateScrollPosition:]):
(WebKit::PDFPlugin::updateCursor):
(WebKit::coreCursor):
(appendValuesInPDFNameSubtreeToVector): Deleted.
(getAllValuesInPDFNameTree): Deleted.
(getAllScriptsInPDFDocument): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit222SourceWTFChangeLog">releases/WebKitGTK/webkit-2.22/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWTFScriptsgenerateunifiedsourcebundlesrb">releases/WebKitGTK/webkit-2.22/Source/WTF/Scripts/generate-unified-source-bundles.rb</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWTFwtfPlatformh">releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWTFwtftextStringBufferh">releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/text/StringBuffer.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreModulescacheWorkerCacheStorageConnectioncpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreModulesmediastreamRTCControllercpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediastream/RTCController.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreModulespaymentrequestPaymentRequestUpdateEventcpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreModuleswebvrVRDisplaycpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/webvr/VRDisplay.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCorePALpalcryptogcryptUtilitiesh">releases/WebKitGTK/webkit-2.22/Source/WebCore/PAL/pal/crypto/gcrypt/Utilities.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreSourcesCocoatxt">releases/WebKitGTK/webkit-2.22/Source/WebCore/SourcesCocoa.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreSourcesGTKtxt">releases/WebKitGTK/webkit-2.22/Source/WebCore/SourcesGTK.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCorecryptoalgorithmsCryptoAlgorithmECDSAcpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDSA.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCorecryptogcryptGCryptUtilitiesh">releases/WebKitGTK/webkit-2.22/Source/WebCore/crypto/gcrypt/GCryptUtilities.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoredomDocumenth">releases/WebKitGTK/webkit-2.22/Source/WebCore/dom/Document.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCorehtmlparserHTMLTreeBuildercpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/html/parser/HTMLTreeBuilder.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreloaderappcacheApplicationCacheResourceLoaderh">releases/WebKitGTK/webkit-2.22/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCorepageAlternativeTextClienth">releases/WebKitGTK/webkit-2.22/Source/WebCore/page/AlternativeTextClient.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformPasteboardh">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/Pasteboard.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformaudiomacAudioSessionMaccpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFontFamilySpecificationNullcpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFontGenericFamiliesh">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontGenericFamilies.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFontTaggedSettingscpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontTaggedSettings.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicscairoFontCairocpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cairo/FontCairo.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicscocoaWebGLLayermm">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicscocoaWebGPULayermm">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsmetalGPUCommandQueueMetalmm">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformmacPasteboardMacmm">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mac/PasteboardMac.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformmediastreammacDisplayCaptureManagerCocoacpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformnetworkResourceRequestBasecpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/network/ResourceRequestBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformnetworksoupSoupNetworkSessionh">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/network/soup/SoupNetworkSession.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformtextTextCodecUTF8cpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/text/TextCodecUTF8.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformtextTextCodecUTF8h">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/text/TextCodecUTF8.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCorerenderingupdatingRenderTreeBuilderBlockFlowcpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderBlockFlow.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCorerenderingupdatingRenderTreeBuilderFormControlscpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCorerenderingupdatingRenderTreeBuilderInlinecpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCorerenderingupdatingRenderTreeBuilderRubycpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCorerenderingupdatingRenderTreeUpdatercpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitChangeLog">releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitSharedAPIWebArchivemm">releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/APIWebArchive.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitSharedAPIWebArchiveResourcemm">releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/APIWebArchiveResource.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitSharedPluginsNetscapemacNetscapePluginModuleMacmm">releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitSharedPluginsNetscapemacPluginInformationMacmm">releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/Plugins/Netscape/mac/PluginInformationMac.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitSourcesCocoatxt">releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesCocoa.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitSourcesGTKtxt">releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesGTK.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitUIProcessAPIAPIAutomationSessionClienth">releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/APIAutomationSessionClient.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitUIProcessCocoaLegacyCustomProtocolManagerClientmm">releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitUIProcessPluginsPluginProcessProxycpp">releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitUIProcessRemoteLayerTreeiosScrollingTreeScrollingNodeDelegateIOSmm">releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitUIProcessStorageStorageProcessProxycpp">releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebKitUIProcessWebPageProxyh">releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/WebPageProxy.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit222SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WTF/ChangeLog (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WTF/ChangeLog      2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WTF/ChangeLog 2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2018-08-30  Tim Horton  <timothy_horton@apple.com>
+
+        Bundle unified sources more tightly in projects with deep directory structures
+        https://bugs.webkit.org/show_bug.cgi?id=189009
+
+        Reviewed by Simon Fraser.
+
+        * Scripts/generate-unified-source-bundles.rb:
+        It turns out our plan to switch unified source bundle every time the directory
+        changes is not a good fit for projects like WebKit2 with many small directories.
+        It leaves many unified source bundles with only a single source file,
+        achieving only ~40% density.
+
+        Instead, switch unified source bundles every time the top-level directory changes.
+        This still achieves the goal of *usually* only rebuilding the one top-level
+        directory you touched, and increases source bundle density wildly, to ~95%.
+
+        * wtf/Platform.h:
+
</ins><span class="cx"> 2018-08-25  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
</span><span class="cx"> 
</span><span class="cx">         Shrink size of XMLHttpRequest
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWTFScriptsgenerateunifiedsourcebundlesrb"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WTF/Scripts/generate-unified-source-bundles.rb (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WTF/Scripts/generate-unified-source-bundles.rb     2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WTF/Scripts/generate-unified-source-bundles.rb        2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -210,10 +210,20 @@
</span><span class="cx">     end
</span><span class="cx"> end
</span><span class="cx"> 
</span><ins>+def TopLevelDirectoryForPath(path)
+    if !path
+        return nil
+    end
+    while path.dirname != path.dirname.dirname
+        path = path.dirname
+    end
+    return path
+end
+
</ins><span class="cx"> def ProcessFileForUnifiedSourceGeneration(sourceFile)
</span><span class="cx">     path = sourceFile.path
</span><del>-    if ($currentDirectory != path.dirname)
-        log("Flushing because new dirname; old: #{$currentDirectory}, new: #{path.dirname}")
</del><ins>+    if (TopLevelDirectoryForPath($currentDirectory) != TopLevelDirectoryForPath(path.dirname))
+        log("Flushing because new top level directory; old: #{$currentDirectory}, new: #{path.dirname}")
</ins><span class="cx">         $bundleManagers.each_value { |x| x.flush }
</span><span class="cx">         $currentDirectory = path.dirname
</span><span class="cx">     end
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/Platform.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/Platform.h 2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/Platform.h    2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -1314,6 +1314,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #define HAVE_TOUCH_BAR 1
</span><span class="cx"> #define HAVE_ADVANCED_SPELL_CHECKING 1
</span><ins>+#define USE_DICTATION_ALTERNATIVES 1
</ins><span class="cx"> 
</span><span class="cx"> #if defined(__LP64__)
</span><span class="cx"> #define ENABLE_WEB_PLAYBACK_CONTROLS_MANAGER 1
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWTFwtftextStringBufferh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/text/StringBuffer.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/text/StringBuffer.h        2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WTF/wtf/text/StringBuffer.h   2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -29,9 +29,10 @@
</span><span class="cx"> #ifndef StringBuffer_h
</span><span class="cx"> #define StringBuffer_h
</span><span class="cx"> 
</span><del>-#include <wtf/Assertions.h>
</del><span class="cx"> #include <limits>
</span><span class="cx"> #include <unicode/utypes.h>
</span><ins>+#include <wtf/Assertions.h>
+#include <wtf/MallocPtr.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WTF {
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog  2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog     2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2018-08-30  Tim Horton  <timothy_horton@apple.com>
+
+        Bundle unified sources more tightly in projects with deep directory structures
+        https://bugs.webkit.org/show_bug.cgi?id=189009
+
+        Reviewed by Simon Fraser.
+
+        Fix a variety of unification errors due to reshuffling the bundles.
+
+        * Modules/mediastream/RTCController.cpp:
+        * SourcesCocoa.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * crypto/algorithms/CryptoAlgorithmECDSA.cpp:
+        (WebCore::CryptoAlgorithmECDSA::importKey):
+        * dom/Document.h:
+        * html/parser/HTMLTreeBuilder.cpp:
+        * loader/appcache/ApplicationCacheResourceLoader.h:
+        * page/AlternativeTextClient.h:
+        * platform/Pasteboard.h:
+        * platform/graphics/DisplayRefreshMonitor.cpp:
+        * platform/graphics/FontFamilySpecificationNull.cpp:
+        * platform/graphics/cocoa/WebGLLayer.mm:
+        (-[WebGLLayer initWithGraphicsContext3D:]):
+        (-[WebGLLayer copyImageSnapshotWithColorSpace:]):
+        (-[WebGLLayer display]):
+        (-[WebGLLayer allocateIOSurfaceBackingStoreWithSize:usingAlpha:]):
+        * platform/graphics/cocoa/WebGPULayer.mm:
+        (-[WebGPULayer initWithGPUDevice:]):
+        * platform/graphics/metal/GPUCommandQueueMetal.mm:
+        * platform/mac/PasteboardMac.mm:
+        * platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp:
+        * platform/network/ResourceRequestBase.cpp:
+        * rendering/updating/RenderTreeBuilderBlockFlow.cpp:
+        * rendering/updating/RenderTreeBuilderInline.cpp:
+
</ins><span class="cx"> 2018-08-29  Daniel Bates  <dabates@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r226138): WebCore::subdivide() may return an empty vector; Web process can crash when performing find in Epiphany
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreModulescacheWorkerCacheStorageConnectioncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp     2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp        2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "CacheQueryOptions.h"
</span><span class="cx"> #include "CacheStorageProvider.h"
</span><ins>+#include "ClientOrigin.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="lines">@@ -36,7 +37,6 @@
</span><span class="cx"> #include "WorkerRunLoop.h"
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> using namespace WebCore::DOMCacheEngine;
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreModulesmediastreamRTCControllercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediastream/RTCController.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediastream/RTCController.cpp      2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediastream/RTCController.cpp 2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx"> 
</span><ins>+#include "Document.h"
</ins><span class="cx"> #include "LibWebRTCProvider.h"
</span><span class="cx"> #include "RTCPeerConnection.h"
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreModulespaymentrequestPaymentRequestUpdateEventcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp       2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp  2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(PAYMENT_REQUEST)
</span><span class="cx"> 
</span><ins>+#include "EventNames.h"
</ins><span class="cx"> #include "PaymentRequest.h"
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreModuleswebvrVRDisplaycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/webvr/VRDisplay.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/webvr/VRDisplay.cpp        2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/webvr/VRDisplay.cpp   2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "CanvasRenderingContext.h"
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "DOMException.h"
</span><ins>+#include "DOMWindow.h"
</ins><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "ScriptedAnimationController.h"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCorePALpalcryptogcryptUtilitiesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/PAL/pal/crypto/gcrypt/Utilities.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/PAL/pal/crypto/gcrypt/Utilities.h  2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/PAL/pal/crypto/gcrypt/Utilities.h     2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include <gcrypt.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace PAL {
</span><span class="cx"> namespace GCrypt {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreSourcesCocoatxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/SourcesCocoa.txt (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/SourcesCocoa.txt   2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/SourcesCocoa.txt      2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> platform/ios/PlatformSpeechSynthesizerIOS.mm @no-unify
</span><span class="cx"> platform/ios/PlaybackSessionInterfaceAVKit.mm @no-unify
</span><span class="cx"> platform/ios/QuickLook.mm
</span><del>-platform/ios/QuickLookSoftLink.mm
</del><ins>+platform/ios/QuickLookSoftLink.mm @no-unify
</ins><span class="cx"> platform/ios/RemoteCommandListenerIOS.mm
</span><span class="cx"> platform/ios/ScrollAnimatorIOS.mm
</span><span class="cx"> platform/ios/ScrollbarThemeIOS.mm
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> platform/ios/SystemMemoryIOS.cpp
</span><span class="cx"> platform/ios/ThemeIOS.mm @no-unify
</span><span class="cx"> platform/ios/TileControllerMemoryHandlerIOS.cpp
</span><del>-platform/ios/UserAgentIOS.mm
</del><ins>+platform/ios/UserAgentIOS.mm @no-unify
</ins><span class="cx"> platform/ios/ValidationBubbleIOS.mm @no-unify
</span><span class="cx"> platform/ios/VideoFullscreenInterfaceAVKit.mm @no-unify
</span><span class="cx"> platform/ios/WebAVPlayerController.mm
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreSourcesGTKtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/SourcesGTK.txt (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/SourcesGTK.txt     2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/SourcesGTK.txt        2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -61,14 +61,14 @@
</span><span class="cx"> 
</span><span class="cx"> platform/geoclue/GeolocationProviderGeoclue.cpp
</span><span class="cx"> 
</span><del>-platform/graphics/GLContext.cpp
</del><ins>+platform/graphics/GLContext.cpp @no-unify
</ins><span class="cx"> platform/graphics/GraphicsContext3DPrivate.cpp
</span><span class="cx"> 
</span><del>-platform/graphics/cairo/BackingStoreBackendCairoX11.cpp
</del><ins>+platform/graphics/cairo/BackingStoreBackendCairoX11.cpp @no-unify
</ins><span class="cx"> 
</span><span class="cx"> platform/graphics/egl/GLContextEGL.cpp
</span><span class="cx"> platform/graphics/egl/GLContextEGLWayland.cpp @no-unify
</span><del>-platform/graphics/egl/GLContextEGLX11.cpp
</del><ins>+platform/graphics/egl/GLContextEGLX11.cpp @no-unify
</ins><span class="cx"> 
</span><span class="cx"> platform/graphics/glx/GLContextGLX.cpp
</span><span class="cx"> 
</span><span class="lines">@@ -82,9 +82,9 @@
</span><span class="cx"> 
</span><span class="cx"> platform/graphics/wayland/PlatformDisplayWayland.cpp
</span><span class="cx"> 
</span><del>-platform/graphics/x11/PlatformDisplayX11.cpp
-platform/graphics/x11/XErrorTrapper.cpp
-platform/graphics/x11/XUniqueResource.cpp
</del><ins>+platform/graphics/x11/PlatformDisplayX11.cpp @no-unify
+platform/graphics/x11/XErrorTrapper.cpp @no-unify
+platform/graphics/x11/XUniqueResource.cpp @no-unify
</ins><span class="cx"> 
</span><span class="cx"> platform/gtk/DragDataGtk.cpp
</span><span class="cx"> platform/gtk/LocalizedStringsGtk.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCorecryptoalgorithmsCryptoAlgorithmECDSAcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDSA.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDSA.cpp 2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDSA.cpp    2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+namespace CryptoAlgorithmECDSAInternal {
</ins><span class="cx"> static const char* const ALG256 = "ES256";
</span><span class="cx"> static const char* const ALG384 = "ES384";
</span><span class="cx"> static const char* const ALG512 = "ES512";
</span><span class="lines">@@ -42,6 +43,7 @@
</span><span class="cx"> static const char* const P256 = "P-256";
</span><span class="cx"> static const char* const P384 = "P-384";
</span><span class="cx"> static const char* const P521 = "P-521";
</span><ins>+}
</ins><span class="cx"> 
</span><span class="cx"> Ref<CryptoAlgorithm> CryptoAlgorithmECDSA::create()
</span><span class="cx"> {
</span><span class="lines">@@ -102,6 +104,7 @@
</span><span class="cx"> 
</span><span class="cx"> void CryptoAlgorithmECDSA::importKey(CryptoKeyFormat format, KeyData&& data, const CryptoAlgorithmParameters& parameters, bool extractable, CryptoKeyUsageBitmap usages, KeyCallback&& callback, ExceptionCallback&& exceptionCallback)
</span><span class="cx"> {
</span><ins>+    using namespace CryptoAlgorithmECDSAInternal;
</ins><span class="cx">     const auto& ecParameters = downcast<CryptoAlgorithmEcKeyParams>(parameters);
</span><span class="cx"> 
</span><span class="cx">     RefPtr<CryptoKeyEC> result;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCorecryptogcryptGCryptUtilitiesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/crypto/gcrypt/GCryptUtilities.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/crypto/gcrypt/GCryptUtilities.h    2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/crypto/gcrypt/GCryptUtilities.h       2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include <pal/crypto/CryptoDigest.h>
</span><span class="cx"> #include <pal/crypto/gcrypt/Handle.h>
</span><span class="cx"> #include <pal/crypto/gcrypt/Utilities.h>
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/dom/Document.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/dom/Document.h     2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/dom/Document.h        2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -641,7 +641,7 @@
</span><span class="cx">     
</span><span class="cx">     WEBCORE_EXPORT DocumentLoader* loader() const;
</span><span class="cx"> 
</span><del>-    WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> openForBindings(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& url, const AtomicString& name, const String& features);
</del><ins>+    WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> openForBindings(DOMWindow& activeWindow, DOMWindow& firstDOMWindow, const String& url, const AtomicString& name, const String& features);
</ins><span class="cx">     WEBCORE_EXPORT ExceptionOr<Document&> openForBindings(Document* responsibleDocument, const String& type, const String& replace);
</span><span class="cx"> 
</span><span class="cx">     // FIXME: We should rename this at some point and give back the name 'open' to the HTML specified ones.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCorehtmlparserHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/html/parser/HTMLTreeBuilder.cpp    2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/html/parser/HTMLTreeBuilder.cpp       2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "HTMLDocumentParser.h"
</span><span class="cx"> #include "HTMLFormControlElement.h"
</span><span class="cx"> #include "HTMLFormElement.h"
</span><ins>+#include "HTMLInputElement.h"
</ins><span class="cx"> #include "HTMLOptGroupElement.h"
</span><span class="cx"> #include "HTMLOptionElement.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreloaderappcacheApplicationCacheResourceLoaderh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h   2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h      2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><ins>+#include "ApplicationCacheResource.h"
</ins><span class="cx"> #include "CachedRawResource.h"
</span><span class="cx"> #include "CachedRawResourceClient.h"
</span><span class="cx"> #include "CachedResourceHandle.h"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCorepageAlternativeTextClienth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/page/AlternativeTextClient.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/page/AlternativeTextClient.h       2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/page/AlternativeTextClient.h  2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -29,11 +29,6 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
-// Some platforms provide UI for suggesting alternative dictation text.
-#define USE_DICTATION_ALTERNATIVES 1
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> enum ReasonForDismissingAlternativeText {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/Pasteboard.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/Pasteboard.h      2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/Pasteboard.h 2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -336,6 +336,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> extern const char* const WebArchivePboardType;
</span><span class="cx"> extern const char* const WebURLNamePboardType;
</span><ins>+extern const char* const WebURLsWithTitlesPboardType;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(GTK)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformaudiomacAudioSessionMaccpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp     2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp        2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include <CoreAudio/AudioHardware.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp        2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp   2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "DisplayRefreshMonitorClient.h"
</span><span class="cx"> #include "DisplayRefreshMonitorManager.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "DisplayRefreshMonitorIOS.h"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFontFamilySpecificationNullcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp  2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp     2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "FontFamilySpecificationNull.h"
</span><span class="cx"> 
</span><span class="cx"> #include "FontSelector.h"
</span><ins>+#include <wtf/text/AtomicStringHash.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFontGenericFamiliesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontGenericFamilies.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontGenericFamilies.h    2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontGenericFamilies.h       2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include <unicode/uscript.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><ins>+#include <wtf/text/AtomicStringHash.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFontTaggedSettingscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontTaggedSettings.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontTaggedSettings.cpp   2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontTaggedSettings.cpp      2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -27,10 +27,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "FontTaggedSettings.h"
</span><span class="cx"> 
</span><ins>+#include <wtf/text/AtomicStringHash.h>
</ins><span class="cx"> #include <wtf/text/TextStream.h>
</span><span class="cx"> 
</span><del>-#include <wtf/text/AtomicStringHash.h>
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> template <>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicscairoFontCairocpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cairo/FontCairo.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cairo/FontCairo.cpp      2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cairo/FontCairo.cpp 2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> 
</span><span class="cx"> #include "AffineTransform.h"
</span><ins>+#include "CairoOperations.h"
</ins><span class="cx"> #include "CairoUtilities.h"
</span><span class="cx"> #include "Font.h"
</span><span class="cx"> #include "GlyphBuffer.h"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicscocoaWebGLLayermm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm      2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm 2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -42,13 +42,11 @@
</span><span class="cx"> #import <OpenGL/gl.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-using namespace WebCore;
-
</del><span class="cx"> @implementation WebGLLayer
</span><span class="cx"> 
</span><span class="cx"> @synthesize context=_context;
</span><span class="cx"> 
</span><del>--(id)initWithGraphicsContext3D:(GraphicsContext3D*)context
</del><ins>+-(id)initWithGraphicsContext3D:(WebCore::GraphicsContext3D*)context
</ins><span class="cx"> {
</span><span class="cx">     _context = context;
</span><span class="cx">     self = [super init];
</span><span class="lines">@@ -86,7 +84,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>--(CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace
</del><ins>+- (CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace
</ins><span class="cx"> {
</span><span class="cx">     if (!_context)
</span><span class="cx">         return nullptr;
</span><span class="lines">@@ -96,7 +94,7 @@
</span><span class="cx"> 
</span><span class="cx">     RetainPtr<CGColorSpaceRef> imageColorSpace = colorSpace;
</span><span class="cx">     if (!imageColorSpace)
</span><del>-        imageColorSpace = sRGBColorSpaceRef();
</del><ins>+        imageColorSpace = WebCore::sRGBColorSpaceRef();
</ins><span class="cx"> 
</span><span class="cx">     CGRect layerBounds = CGRectIntegral([self bounds]);
</span><span class="cx"> 
</span><span class="lines">@@ -141,19 +139,19 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     _context->markLayerComposited();
</span><del>-    PlatformCALayer* layer = PlatformCALayer::platformCALayer((__bridge void*)self);
</del><ins>+    WebCore::PlatformCALayer* layer = WebCore::PlatformCALayer::platformCALayer((__bridge void*)self);
</ins><span class="cx">     if (layer && layer->owner())
</span><span class="cx">         layer->owner()->platformCALayerLayerDidDisplay(layer);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if USE(OPENGL)
</span><del>-- (void)allocateIOSurfaceBackingStoreWithSize:(IntSize)size usingAlpha:(BOOL)usingAlpha
</del><ins>+- (void)allocateIOSurfaceBackingStoreWithSize:(WebCore::IntSize)size usingAlpha:(BOOL)usingAlpha
</ins><span class="cx"> {
</span><span class="cx">     _bufferSize = size;
</span><span class="cx">     _usingAlpha = usingAlpha;
</span><del>-    _contentsBuffer = WebCore::IOSurface::create(size, sRGBColorSpaceRef());
-    _drawingBuffer = WebCore::IOSurface::create(size, sRGBColorSpaceRef());
-    _spareBuffer = WebCore::IOSurface::create(size, sRGBColorSpaceRef());
</del><ins>+    _contentsBuffer = WebCore::IOSurface::create(size, WebCore::sRGBColorSpaceRef());
+    _drawingBuffer = WebCore::IOSurface::create(size, WebCore::sRGBColorSpaceRef());
+    _spareBuffer = WebCore::IOSurface::create(size, WebCore::sRGBColorSpaceRef());
</ins><span class="cx"> 
</span><span class="cx">     ASSERT(_contentsBuffer);
</span><span class="cx">     ASSERT(_drawingBuffer);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicscocoaWebGPULayermm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm     2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm        2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -34,13 +34,11 @@
</span><span class="cx"> #import <wtf/FastMalloc.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><del>-using namespace WebCore;
-
</del><span class="cx"> @implementation WebGPULayer
</span><span class="cx"> 
</span><span class="cx"> @synthesize context=_context;
</span><span class="cx"> 
</span><del>-- (id)initWithGPUDevice:(GPUDevice*)context
</del><ins>+- (id)initWithGPUDevice:(WebCore::GPUDevice*)context
</ins><span class="cx"> {
</span><span class="cx">     self = [super init];
</span><span class="cx">     _context = context;
</span><span class="lines">@@ -50,7 +48,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">     self.contentsScale = _devicePixelRatio;
</span><del>-    self.colorspace = sRGBColorSpaceRef();
</del><ins>+    self.colorspace = WebCore::sRGBColorSpaceRef();
</ins><span class="cx"> #endif
</span><span class="cx">     return self;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsmetalGPUCommandQueueMetalmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm    2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm       2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import "GPUDevice.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import <Metal/Metal.h>
</span><ins>+#import <wtf/text/WTFString.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformmacPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mac/PasteboardMac.mm (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mac/PasteboardMac.mm      2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mac/PasteboardMac.mm 2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx"> 
</span><span class="cx"> const char* const WebArchivePboardType = "Apple Web Archive pasteboard type";
</span><span class="cx"> const char* const WebURLNamePboardType = "public.url-name";
</span><ins>+const char* const WebURLsWithTitlesPboardType = "WebURLsWithTitlesPboardType";
</ins><span class="cx"> 
</span><span class="cx"> const char WebSmartPastePboardType[] = "NeXT smart paste pasteboard type";
</span><span class="cx"> const char WebURLPboardType[] = "public.url";
</span><del>-const char WebURLsWithTitlesPboardType[] = "WebURLsWithTitlesPboardType";
</del><span class="cx"> 
</span><span class="cx"> static const Vector<String> writableTypesForURL()
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformmediastreammacDisplayCaptureManagerCocoacpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp    2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp       2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> 
</span><ins>+#include "CoreVideoSoftLink.h"
</ins><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include <wtf/Algorithms.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/network/ResourceRequestBase.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/network/ResourceRequestBase.cpp   2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/network/ResourceRequestBase.cpp      2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "HTTPHeaderNames.h"
</span><span class="cx"> #include "PublicSuffix.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><ins>+#include "ResourceResponse.h"
</ins><span class="cx"> #include "SecurityPolicy.h"
</span><span class="cx"> #include <wtf/PointerComparison.h>
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformnetworksoupSoupNetworkSessionh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/network/soup/SoupNetworkSession.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/network/soup/SoupNetworkSession.h    2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef SoupNetworkSession_h
</span><span class="cx"> #define SoupNetworkSession_h
</span><span class="cx"> 
</span><ins>+#include <gio/gio.h>
</ins><span class="cx"> #include <glib-object.h>
</span><span class="cx"> #include <pal/SessionID.h>
</span><span class="cx"> #include <wtf/Function.h>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformtextTextCodecUTF8cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/text/TextCodecUTF8.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/text/TextCodecUTF8.cpp    2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/text/TextCodecUTF8.cpp       2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "TextCodecASCIIFastPath.h"
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuffer.h>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformtextTextCodecUTF8h"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/text/TextCodecUTF8.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/text/TextCodecUTF8.h      2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/text/TextCodecUTF8.h 2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include "TextCodec.h"
</span><ins>+#include <unicode/utf8.h>
</ins><span class="cx"> #include <wtf/text/LChar.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCorerenderingupdatingRenderTreeBuilderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderBlockFlow.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderBlockFlow.cpp  2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderBlockFlow.cpp     2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #include "RenderTreeBuilderBlockFlow.h"
</span><span class="cx"> 
</span><span class="cx"> #include "RenderMultiColumnFlow.h"
</span><ins>+#include "RenderTreeBuilderBlock.h"
+#include "RenderTreeBuilderMultiColumn.h"
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCorerenderingupdatingRenderTreeBuilderFormControlscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp       2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp  2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "RenderButton.h"
</span><span class="cx"> #include "RenderMenuList.h"
</span><ins>+#include "RenderTreeBuilderBlock.h"
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCorerenderingupdatingRenderTreeBuilderInlinecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp     2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp        2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> #include "RenderFullScreen.h"
</span><span class="cx"> #include "RenderInline.h"
</span><span class="cx"> #include "RenderTable.h"
</span><ins>+#include "RenderTreeBuilderMultiColumn.h"
+#include "RenderTreeBuilderTable.h"
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCorerenderingupdatingRenderTreeBuilderRubycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp       2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp  2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "RenderTreeBuilderRuby.h"
</span><span class="cx"> 
</span><ins>+#include "RenderAncestorIterator.h"
</ins><span class="cx"> #include "RenderRuby.h"
</span><span class="cx"> #include "RenderRubyBase.h"
</span><span class="cx"> #include "RenderRubyRun.h"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCorerenderingupdatingRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp   2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp      2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx"> #include "RenderDescendantIterator.h"
</span><span class="cx"> #include "RenderFullScreen.h"
</span><span class="cx"> #include "RenderInline.h"
</span><ins>+#include "RenderMultiColumnFlow.h"
+#include "RenderMultiColumnSet.h"
</ins><span class="cx"> #include "RenderTreeUpdaterGeneratedContent.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "StyleResolver.h"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog   2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog      2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2018-08-30  Tim Horton  <timothy_horton@apple.com>
+
+        Bundle unified sources more tightly in projects with deep directory structures
+        https://bugs.webkit.org/show_bug.cgi?id=189009
+
+        Reviewed by Simon Fraser.
+
+        Fix a variety of unification errors due to reshuffling the bundles.
+
+        * Shared/APIWebArchive.mm:
+        * Shared/APIWebArchiveResource.mm:
+        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+        * Shared/Plugins/Netscape/mac/PluginInformationMac.mm:
+        * SourcesCocoa.txt:
+        * SourcesGTK.txt:
+        * UIProcess/API/APIAutomationSessionClient.h:
+        (API::AutomationSessionClient::sessionIdentifier const):
+        (API::AutomationSessionClient::messageOfCurrentJavaScriptDialogOnPage):
+        (API::AutomationSessionClient::setUserInputForCurrentJavaScriptPromptOnPage):
+        * UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm:
+        (-[WKCustomProtocolLoader initWithLegacyCustomProtocolManagerProxy:customProtocolID:request:]):
+        (-[WKCustomProtocolLoader connection:didFailWithError:]):
+        (-[WKCustomProtocolLoader connection:didReceiveResponse:]):
+        * UIProcess/Plugins/PluginProcessProxy.cpp:
+        (WebKit::generatePluginProcessCallbackID):
+        (WebKit::PluginProcessProxy::fetchWebsiteData):
+        (WebKit::PluginProcessProxy::deleteWebsiteData):
+        (WebKit::PluginProcessProxy::deleteWebsiteDataForHostNames):
+        (WebKit::generateCallbackID): Deleted.
+        * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
+        (-[WKScrollingNodeScrollViewDelegate scrollViewWillEndDragging:withVelocity:targetContentOffset:]):
+        * UIProcess/Storage/StorageProcessProxy.cpp:
+        (WebKit::generateStorageProcessCallbackID):
+        (WebKit::StorageProcessProxy::fetchWebsiteData):
+        (WebKit::StorageProcessProxy::deleteWebsiteData):
+        (WebKit::StorageProcessProxy::deleteWebsiteDataForOrigins):
+        (WebKit::generateCallbackID): Deleted.
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        (-[WKPDFPluginAccessibilityObject accessibilityPerformAction:]):
+        (-[WKPDFPluginAccessibilityObject accessibilityFocusedUIElement]):
+        (-[WKPDFPluginAccessibilityObject accessibilityAssociatedControlForAnnotation:]):
+        (-[WKPDFPluginAccessibilityObject accessibilityHitTest:]):
+        (-[WKPDFLayerControllerDelegate updateScrollPosition:]):
+        (WebKit::PDFPlugin::updateCursor):
+        (WebKit::coreCursor):
+        (appendValuesInPDFNameSubtreeToVector): Deleted.
+        (getAllValuesInPDFNameTree): Deleted.
+        (getAllScriptsInPDFDocument): Deleted.
+
</ins><span class="cx"> 2018-08-27  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Pass webPageID and webFrameID to NetworkLoad for speculative loads
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitSharedAPIWebArchivemm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/APIWebArchive.mm (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/APIWebArchive.mm     2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/APIWebArchive.mm        2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -34,10 +34,9 @@
</span><span class="cx"> #include <WebCore/LegacyWebArchive.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><ins>+namespace API {
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-namespace API {
-
</del><span class="cx"> Ref<WebArchive> WebArchive::create(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives)
</span><span class="cx"> {
</span><span class="cx">     return adoptRef(*new WebArchive(mainResource, WTFMove(subresources), WTFMove(subframeArchives)));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitSharedAPIWebArchiveResourcemm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/APIWebArchiveResource.mm (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/APIWebArchiveResource.mm     2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/APIWebArchiveResource.mm        2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -33,10 +33,9 @@
</span><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><ins>+namespace API {
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-namespace API {
-
</del><span class="cx"> Ref<WebArchiveResource> WebArchiveResource::create(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding)
</span><span class="cx"> {
</span><span class="cx">     return adoptRef(*new WebArchiveResource(data, URL, MIMEType, textEncoding));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitSharedPluginsNetscapemacNetscapePluginModuleMacmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm      2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -34,10 +34,9 @@
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/spi/cf/CFBundleSPI.h>
</span><span class="cx"> 
</span><ins>+namespace WebKit {
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-namespace WebKit {
-
</del><span class="cx"> static bool getPluginArchitecture(CFBundleRef bundle, PluginModuleInfo& plugin)
</span><span class="cx"> {
</span><span class="cx">     RetainPtr<CFArrayRef> pluginArchitecturesArray = adoptCF(CFBundleCopyExecutableArchitectures(bundle));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitSharedPluginsNetscapemacPluginInformationMacmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/Plugins/Netscape/mac/PluginInformationMac.mm (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/Plugins/Netscape/mac/PluginInformationMac.mm 2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/Plugins/Netscape/mac/PluginInformationMac.mm    2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -34,10 +34,9 @@
</span><span class="cx"> #import "StringUtilities.h"
</span><span class="cx"> #import <WebCore/PluginBlacklist.h>
</span><span class="cx"> 
</span><ins>+namespace WebKit {
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-namespace WebKit {
-
</del><span class="cx"> void getPlatformPluginModuleInformation(const PluginModuleInfo& plugin, API::Dictionary::MapType& map)
</span><span class="cx"> {
</span><span class="cx">     map.set(pluginInformationBundleIdentifierKey(), API::String::create(plugin.bundleIdentifier));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitSourcesCocoatxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesCocoa.txt (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesCocoa.txt    2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesCocoa.txt       2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -299,9 +299,9 @@
</span><span class="cx"> 
</span><span class="cx"> UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
</span><span class="cx"> 
</span><del>-UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm
</del><ins>+UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm @no-unify
</ins><span class="cx"> 
</span><del>-UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm
</del><ins>+UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm @no-unify
</ins><span class="cx"> 
</span><span class="cx"> UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm
</span><span class="cx"> UIProcess/Authentication/cocoa/SecKeyProxyStore.mm
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitSourcesGTKtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesGTK.txt (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesGTK.txt      2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesGTK.txt 2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -207,9 +207,9 @@
</span><span class="cx"> 
</span><span class="cx"> UIProcess/linux/MemoryPressureMonitor.cpp
</span><span class="cx"> 
</span><del>-UIProcess/Plugins/gtk/PluginInfoCache.cpp
</del><ins>+UIProcess/Plugins/gtk/PluginInfoCache.cpp @no-unify
</ins><span class="cx"> 
</span><del>-UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
</del><ins>+UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp @no-unify
</ins><span class="cx"> UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp @no-unify
</span><span class="cx"> 
</span><span class="cx"> UIProcess/WebStorage/StorageManager.cpp
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> 
</span><span class="cx"> UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
</span><span class="cx"> 
</span><del>-UIProcess/cairo/BackingStoreCairo.cpp
</del><ins>+UIProcess/cairo/BackingStoreCairo.cpp @no-unify
</ins><span class="cx"> 
</span><span class="cx"> UIProcess/glib/RemoteInspectorClient.cpp
</span><span class="cx"> 
</span><span class="lines">@@ -229,16 +229,16 @@
</span><span class="cx"> UIProcess/gtk/DragAndDropHandler.cpp
</span><span class="cx"> UIProcess/gtk/GestureController.cpp
</span><span class="cx"> UIProcess/gtk/HardwareAccelerationManager.cpp
</span><del>-UIProcess/gtk/InputMethodFilter.cpp
</del><ins>+UIProcess/gtk/InputMethodFilter.cpp @no-unify
</ins><span class="cx"> UIProcess/gtk/KeyBindingTranslator.cpp
</span><span class="cx"> UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp @no-unify
</span><span class="cx"> UIProcess/gtk/TextCheckerGtk.cpp @no-unify
</span><span class="cx"> UIProcess/gtk/WaylandCompositor.cpp @no-unify
</span><del>-UIProcess/gtk/WebColorPickerGtk.cpp
</del><ins>+UIProcess/gtk/WebColorPickerGtk.cpp @no-unify
</ins><span class="cx"> UIProcess/gtk/WebContextMenuProxyGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebInspectorProxyGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebKitInspectorWindow.cpp
</span><del>-UIProcess/gtk/WebPageProxyGtk.cpp
</del><ins>+UIProcess/gtk/WebPageProxyGtk.cpp @no-unify
</ins><span class="cx"> UIProcess/gtk/WebPasteboardProxyGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebPopupMenuProxyGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebPreferencesGtk.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitUIProcessAPIAPIAutomationSessionClienth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/APIAutomationSessionClient.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/APIAutomationSessionClient.h  2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/APIAutomationSessionClient.h     2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual ~AutomationSessionClient() { }
</span><span class="cx"> 
</span><del>-    virtual String sessionIdentifier() const { return String(); }
</del><ins>+    virtual WTF::String sessionIdentifier() const { return WTF::String(); }
</ins><span class="cx">     virtual void didDisconnectFromRemote(WebKit::WebAutomationSession&) { }
</span><span class="cx">     virtual void requestNewPageWithOptions(WebKit::WebAutomationSession&, AutomationSessionBrowsingContextOptions, CompletionHandler<void(WebKit::WebPageProxy*)>&& completionHandler) { completionHandler(nullptr); }
</span><span class="cx">     virtual void requestMaximizeWindowOfPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&, CompletionHandler<void()>&& completionHandler) { completionHandler(); }
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx">     virtual bool isShowingJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return false; }
</span><span class="cx">     virtual void dismissCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { }
</span><span class="cx">     virtual void acceptCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { }
</span><del>-    virtual String messageOfCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return String(); }
-    virtual void setUserInputForCurrentJavaScriptPromptOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&, const String&) { }
</del><ins>+    virtual WTF::String messageOfCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return WTF::String(); }
+    virtual void setUserInputForCurrentJavaScriptPromptOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&, const WTF::String&) { }
</ins><span class="cx">     virtual std::optional<JavaScriptDialogType> typeOfCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return std::nullopt; }
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitUIProcessCocoaLegacyCustomProtocolManagerClientmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm        2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm   2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -32,23 +32,20 @@
</span><span class="cx"> #import <WebCore/ResourceRequest.h>
</span><span class="cx"> #import <WebCore/ResourceResponse.h>
</span><span class="cx"> 
</span><del>-using namespace WebCore;
-using namespace WebKit;
-
</del><span class="cx"> @interface WKCustomProtocolLoader : NSObject <NSURLConnectionDelegate> {
</span><span class="cx"> @private
</span><del>-    LegacyCustomProtocolManagerProxy* _customProtocolManagerProxy;
</del><ins>+    WebKit::LegacyCustomProtocolManagerProxy* _customProtocolManagerProxy;
</ins><span class="cx">     uint64_t _customProtocolID;
</span><span class="cx">     NSURLCacheStoragePolicy _storagePolicy;
</span><span class="cx">     NSURLConnection *_urlConnection;
</span><span class="cx"> }
</span><del>-- (id)initWithLegacyCustomProtocolManagerProxy:(LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request;
</del><ins>+- (id)initWithLegacyCustomProtocolManagerProxy:(WebKit::LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request;
</ins><span class="cx"> - (void)customProtocolManagerProxyDestroyed;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation WKCustomProtocolLoader
</span><span class="cx"> 
</span><del>-- (id)initWithLegacyCustomProtocolManagerProxy:(LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request
</del><ins>+- (id)initWithLegacyCustomProtocolManagerProxy:(WebKit::LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request
</ins><span class="cx"> {
</span><span class="cx">     self = [super init];
</span><span class="cx">     if (!self)
</span><span class="lines">@@ -85,7 +82,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
</span><span class="cx"> {
</span><del>-    ResourceError coreError(error);
</del><ins>+    WebCore::ResourceError coreError(error);
</ins><span class="cx">     _customProtocolManagerProxy->didFailWithError(_customProtocolID, coreError);
</span><span class="cx">     _customProtocolManagerProxy->stopLoading(_customProtocolID);
</span><span class="cx"> }
</span><span class="lines">@@ -99,7 +96,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
</span><span class="cx"> {
</span><del>-    ResourceResponse coreResponse(response);
</del><ins>+    WebCore::ResourceResponse coreResponse(response);
</ins><span class="cx">     _customProtocolManagerProxy->didReceiveResponse(_customProtocolID, coreResponse, _storagePolicy);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -127,6 +124,7 @@
</span><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><ins>+using namespace WebCore;
</ins><span class="cx"> 
</span><span class="cx"> void LegacyCustomProtocolManagerClient::startLoading(LegacyCustomProtocolManagerProxy& manager, uint64_t customProtocolID, const ResourceRequest& coreRequest)
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitUIProcessPluginsPluginProcessProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp    2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp       2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> static const Seconds shutdownTimeout { 1_min };
</span><span class="cx"> static const Seconds snapshottingShutdownTimeout { 15_s };
</span><span class="cx"> 
</span><del>-static uint64_t generateCallbackID()
</del><ins>+static uint64_t generatePluginProcessCallbackID()
</ins><span class="cx"> {
</span><span class="cx">     static uint64_t callbackID;
</span><span class="cx"> 
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> 
</span><span class="cx"> void PluginProcessProxy::fetchWebsiteData(CompletionHandler<void (Vector<String>)>&& completionHandler)
</span><span class="cx"> {
</span><del>-    uint64_t callbackID = generateCallbackID();
</del><ins>+    uint64_t callbackID = generatePluginProcessCallbackID();
</ins><span class="cx">     m_pendingFetchWebsiteDataCallbacks.set(callbackID, WTFMove(completionHandler));
</span><span class="cx"> 
</span><span class="cx">     if (state() == State::Launching) {
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> 
</span><span class="cx"> void PluginProcessProxy::deleteWebsiteData(WallTime modifiedSince, CompletionHandler<void ()>&& completionHandler)
</span><span class="cx"> {
</span><del>-    uint64_t callbackID = generateCallbackID();
</del><ins>+    uint64_t callbackID = generatePluginProcessCallbackID();
</ins><span class="cx">     m_pendingDeleteWebsiteDataCallbacks.set(callbackID, WTFMove(completionHandler));
</span><span class="cx"> 
</span><span class="cx">     if (state() == State::Launching) {
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> 
</span><span class="cx"> void PluginProcessProxy::deleteWebsiteDataForHostNames(const Vector<String>& hostNames, CompletionHandler<void ()>&& completionHandler)
</span><span class="cx"> {
</span><del>-    uint64_t callbackID = generateCallbackID();
</del><ins>+    uint64_t callbackID = generatePluginProcessCallbackID();
</ins><span class="cx">     m_pendingDeleteWebsiteDataForHostNamesCallbacks.set(callbackID, WTFMove(completionHandler));
</span><span class="cx"> 
</span><span class="cx">     if (state() == State::Launching) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitUIProcessRemoteLayerTreeiosScrollingTreeScrollingNodeDelegateIOSmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm      2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm 2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx"> #import <WebCore/ScrollSnapOffsetsInfo.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-using namespace WebCore;
-
</del><span class="cx"> @implementation WKScrollingNodeScrollViewDelegate
</span><span class="cx"> 
</span><span class="cx"> - (instancetype)initWithScrollingTreeNodeDelegate:(WebKit::ScrollingTreeScrollingNodeDelegateIOS*)delegate
</span><span class="lines">@@ -80,7 +78,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (!_scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsets().isEmpty()) {
</span><span class="cx">         unsigned index;
</span><del>-        float potentialSnapPosition = closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsetRanges(), horizontalTarget, velocity.x, index);
</del><ins>+        float potentialSnapPosition = WebCore::closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsetRanges(), horizontalTarget, velocity.x, index);
</ins><span class="cx">         _scrollingTreeNodeDelegate->scrollingNode().setCurrentHorizontalSnapPointIndex(index);
</span><span class="cx">         if (horizontalTarget >= 0 && horizontalTarget <= scrollView.contentSize.width)
</span><span class="cx">             targetContentOffset->x = potentialSnapPosition;
</span><span class="lines">@@ -88,7 +86,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (!_scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsets().isEmpty()) {
</span><span class="cx">         unsigned index;
</span><del>-        float potentialSnapPosition = closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsetRanges(), verticalTarget, velocity.y, index);
</del><ins>+        float potentialSnapPosition = WebCore::closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsetRanges(), verticalTarget, velocity.y, index);
</ins><span class="cx">         _scrollingTreeNodeDelegate->scrollingNode().setCurrentVerticalSnapPointIndex(index);
</span><span class="cx">         if (verticalTarget >= 0 && verticalTarget <= scrollView.contentSize.height)
</span><span class="cx">             targetContentOffset->y = potentialSnapPosition;
</span><span class="lines">@@ -122,6 +120,7 @@
</span><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><ins>+using namespace WebCore;
</ins><span class="cx"> 
</span><span class="cx"> ScrollingTreeScrollingNodeDelegateIOS::ScrollingTreeScrollingNodeDelegateIOS(ScrollingTreeScrollingNode& scrollingNode)
</span><span class="cx">     : ScrollingTreeScrollingNodeDelegate(scrollingNode)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitUIProcessStorageStorageProcessProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp   2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp      2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-static uint64_t generateCallbackID()
</del><ins>+static uint64_t generateStorageProcessCallbackID()
</ins><span class="cx"> {
</span><span class="cx">     static uint64_t callbackID;
</span><span class="cx"> 
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(canSendMessage());
</span><span class="cx"> 
</span><del>-    uint64_t callbackID = generateCallbackID();
</del><ins>+    uint64_t callbackID = generateStorageProcessCallbackID();
</ins><span class="cx">     m_pendingFetchWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
</span><span class="cx"> 
</span><span class="cx">     send(Messages::StorageProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> 
</span><span class="cx"> void StorageProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WallTime modifiedSince, CompletionHandler<void ()>&& completionHandler)
</span><span class="cx"> {
</span><del>-    auto callbackID = generateCallbackID();
</del><ins>+    auto callbackID = generateStorageProcessCallbackID();
</ins><span class="cx"> 
</span><span class="cx">     m_pendingDeleteWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
</span><span class="cx">     send(Messages::StorageProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(canSendMessage());
</span><span class="cx"> 
</span><del>-    uint64_t callbackID = generateCallbackID();
</del><ins>+    uint64_t callbackID = generateStorageProcessCallbackID();
</ins><span class="cx">     m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, WTFMove(completionHandler));
</span><span class="cx"> 
</span><span class="cx">     send(Messages::StorageProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins, callbackID), 0);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebKitUIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/WebPageProxy.h (236117 => 236118)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/WebPageProxy.h    2018-09-18 13:31:01 UTC (rev 236117)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/WebPageProxy.h       2018-09-18 13:31:38 UTC (rev 236118)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> #include "WebPageInjectedBundleClient.h"
</span><span class="cx"> #include "WebPaymentCoordinatorProxy.h"
</span><span class="cx"> #include "WebPreferences.h"
</span><del>-#include <WebCore/AlternativeTextClient.h> // FIXME: Needed by WebPageProxyMessages.h for DICTATION_ALTERNATIVES.
</del><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="cx"> #include "WebPopupMenuProxy.h"
</span><span class="cx"> #include "WebProcessLifetimeTracker.h"
</span></span></pre>
</div>
</div>

</body>
</html>