Attachment #367274 for bug #196845

View Details Raw Unified Return to Bug 196845

| Differences between



2019-04-11  Ross Kirsling  <ross.kirsling@sony.com>

        WebKit should build successfully even with -DENABLE_UNIFIED_BUILDS=OFF
        https://bugs.webkit.org/show_bug.cgi?id=196845

        Reviewed by NOBODY (OOPS!).

        * Modules/mediastream/MediaStreamTrack.cpp:
        * Modules/webvr/VREyeParameters.cpp:
        * Modules/webvr/VRFrameData.cpp:
        * Modules/webvr/VRPose.cpp:
        * accessibility/AccessibilityList.cpp:
        * accessibility/isolatedtree/AXIsolatedTree.cpp:
        * accessibility/isolatedtree/AXIsolatedTreeNode.cpp:
        * bindings/js/JSDOMConvertWebGL.cpp:
        * bindings/js/JSHistoryCustom.cpp:
        * bindings/js/JSIDBCursorWithValueCustom.cpp:
        * bindings/js/JSPerformanceObserverCustom.cpp:
        * bindings/js/WindowProxy.cpp:
        * html/canvas/CanvasRenderingContext2DBase.cpp:
        (WebCore::CanvasRenderingContext2DBase::FontProxy::initialize):
        (WebCore::CanvasRenderingContext2DBase::FontProxy::fontMetrics const):
        (WebCore::CanvasRenderingContext2DBase::FontProxy::fontDescription const):
        (WebCore::CanvasRenderingContext2DBase::FontProxy::width const):
        (WebCore::CanvasRenderingContext2DBase::FontProxy::drawBidiText const):
        (WebCore::CanvasRenderingContext2DBase::beginCompositeLayer):
        (WebCore::CanvasRenderingContext2DBase::endCompositeLayer):
        * page/scrolling/ScrollingStateTree.cpp:
        * platform/ColorData.gperf:
        * platform/mediastream/RealtimeMediaSourceSettings.cpp:
        * platform/network/DNSResolveQueue.cpp:
        * workers/service/ServiceWorkerClientQueryOptions.h:
        * workers/service/ServiceWorkerContainer.cpp:

2019-04-11  Megan Gardner  <megan_gardner@apple.com>

        Update 'Save Image' to more clear instructions



2019-04-11  Ross Kirsling  <ross.kirsling@sony.com>

        WebKit should build successfully even with -DENABLE_UNIFIED_BUILDS=OFF
        https://bugs.webkit.org/show_bug.cgi?id=196845

        Reviewed by NOBODY (OOPS!).

        * NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:
        * NetworkProcess/NetworkCORSPreflightChecker.cpp:
        * NetworkProcess/NetworkDataTask.cpp:
        * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
        * NetworkProcess/NetworkHTTPSUpgradeChecker.h:
        * NetworkProcess/NetworkProcess.cpp:
        * NetworkProcess/NetworkResourceLoadMap.cpp:
        * NetworkProcess/NetworkResourceLoadMap.h:
        * NetworkProcess/NetworkResourceLoader.cpp:
        * NetworkProcess/PingLoad.h:
        * Shared/WebCompiledContentRuleListData.cpp:
        * Shared/gtk/WebEventFactory.cpp:
        * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
        (WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore):
        (WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours):
        (WKWebsiteDataStoreStatisticsResetToConsistentState):
        * UIProcess/Downloads/DownloadProxyMap.cpp:
        * UIProcess/InspectorTargetProxy.cpp:
        * UIProcess/PageClient.h:
        * UIProcess/ProcessAssertion.cpp:
        * UIProcess/ProvisionalPageProxy.h:
        * UIProcess/WebPageInspectorTargetAgent.h:
        * UIProcess/geoclue/GeoclueGeolocationProvider.cpp:
        * WebProcess/Cache/WebCacheStorageConnection.cpp:
        (WebKit::WebCacheStorageConnection::updateQuotaBasedOnSpaceUsage):
        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
        (WKBundleSetDatabaseQuota):
        * WebProcess/Storage/WebServiceWorkerFetchTaskClient.h:

2019-04-11  Megan Gardner  <megan_gardner@apple.com>

        Update 'Save Image' to more clear instructions

Lines 42-47 a/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp_sec1
- a/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp +1 lines
42	#include "Page.h"	42	#include "Page.h"
43	#include "RealtimeMediaSourceCenter.h"	43	#include "RealtimeMediaSourceCenter.h"
44	#include "ScriptExecutionContext.h"	44	#include "ScriptExecutionContext.h"
		45	#include <wtf/CompletionHandler.h>
45	#include <wtf/IsoMallocInlines.h>	46	#include <wtf/IsoMallocInlines.h>
46	#include <wtf/NeverDestroyed.h>	47	#include <wtf/NeverDestroyed.h>
47		48

Lines 26-31 a/Source/WebCore/Modules/webvr/VREyeParameters.cpp_sec1
- a/Source/WebCore/Modules/webvr/VREyeParameters.cpp +1 lines
26	#include "VREyeParameters.h"	26	#include "VREyeParameters.h"
27		27
28	#include "VRFieldOfView.h"	28	#include "VRFieldOfView.h"
		29	#include <JavaScriptCore/TypedArrayInlines.h>
29		30
30	namespace WebCore {	31	namespace WebCore {
31		32

Lines 28-33 a/Source/WebCore/Modules/webvr/VRFrameData.cpp_sec1
- a/Source/WebCore/Modules/webvr/VRFrameData.cpp +1 lines
28	#include "VREyeParameters.h"	28	#include "VREyeParameters.h"
29	#include "VRPlatformDisplay.h"	29	#include "VRPlatformDisplay.h"
30	#include "VRPose.h"	30	#include "VRPose.h"
		31	#include <JavaScriptCore/TypedArrayInlines.h>
31		32
32	namespace WebCore {	33	namespace WebCore {
33		34

Lines 25-30 a/Source/WebCore/Modules/webvr/VRPose.cpp_sec1
- a/Source/WebCore/Modules/webvr/VRPose.cpp +2 lines
25	#include "config.h"	25	#include "config.h"
26	#include "VRPose.h"	26	#include "VRPose.h"
27		27
		28	#include <JavaScriptCore/TypedArrayInlines.h>
		29
28	namespace WebCore {	30	namespace WebCore {
29		31
30	static RefPtr<Float32Array> optionalFloat3ToJSCArray(const Optional<VRPlatformTrackingInfo::Float3>& data)	32	static RefPtr<Float32Array> optionalFloat3ToJSCArray(const Optional<VRPlatformTrackingInfo::Float3>& data)

Lines 32-37 a/Source/WebCore/accessibility/AccessibilityList.cpp_sec1
- a/Source/WebCore/accessibility/AccessibilityList.cpp +1 lines
32	#include "AXObjectCache.h"	32	#include "AXObjectCache.h"
33	#include "HTMLElement.h"	33	#include "HTMLElement.h"
34	#include "HTMLNames.h"	34	#include "HTMLNames.h"
		35	#include "HTMLParserIdioms.h"
35	#include "PseudoElement.h"	36	#include "PseudoElement.h"
36	#include "RenderListItem.h"	37	#include "RenderListItem.h"
37	#include "RenderObject.h"	38	#include "RenderObject.h"



 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)

#include "config.h"

#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
#include "AXIsolatedTree.h"

#include "AXIsolatedTreeNode.h"



 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)

#include "config.h"

#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
#include "AXIsolatedTreeNode.h"

#include "AccessibilityObject.h"

Lines 58-64 a/Source/WebCore/bindings/js/JSDOMConvertWebGL.cpp_sec1
- a/Source/WebCore/bindings/js/JSDOMConvertWebGL.cpp -1 / +1 lines
58	#include "JSWebGLTexture.h"	58	#include "JSWebGLTexture.h"
59	#include "JSWebGLVertexArrayObject.h"	59	#include "JSWebGLVertexArrayObject.h"
60	#include "JSWebGLVertexArrayObjectOES.h"	60	#include "JSWebGLVertexArrayObjectOES.h"
61		61	#include <JavaScriptCore/JSCInlines.h>
62		62
63	namespace WebCore {	63	namespace WebCore {
64	using namespace JSC;	64	using namespace JSC;

Lines 30-35 a/Source/WebCore/bindings/js/JSHistoryCustom.cpp_sec1
- a/Source/WebCore/bindings/js/JSHistoryCustom.cpp +1 lines
30	#include "JSHistory.h"	30	#include "JSHistory.h"
31		31
32	#include "SerializedScriptValue.h"	32	#include "SerializedScriptValue.h"
		33	#include <JavaScriptCore/JSCInlines.h>
33		34
34	namespace WebCore {	35	namespace WebCore {
35		36

Lines 30-36 a/Source/WebCore/bindings/js/JSIDBCursorWithValueCustom.cpp_sec1
- a/Source/WebCore/bindings/js/JSIDBCursorWithValueCustom.cpp -1 / +1 lines
30		30
31	#include "IDBBindingUtilities.h"	31	#include "IDBBindingUtilities.h"
32	#include "IDBCursorWithValue.h"	32	#include "IDBCursorWithValue.h"
33	#include <JavaScriptCore/HeapInlines.h>	33	#include <JavaScriptCore/JSCInlines.h>
34		34
35	namespace WebCore {	35	namespace WebCore {
36	using namespace JSC;	36	using namespace JSC;

Lines 27-32 a/Source/WebCore/bindings/js/JSPerformanceObserverCustom.cpp_sec1
- a/Source/WebCore/bindings/js/JSPerformanceObserverCustom.cpp +1 lines
27	#include "JSPerformanceObserver.h"	27	#include "JSPerformanceObserver.h"
28		28
29	#include "PerformanceObserverCallback.h"	29	#include "PerformanceObserverCallback.h"
		30	#include <JavaScriptCore/JSCInlines.h>
30		31
31	namespace WebCore {	32	namespace WebCore {
32		33

Lines 32-37 a/Source/WebCore/bindings/js/WindowProxy.cpp_sec1
- a/Source/WebCore/bindings/js/WindowProxy.cpp +1 lines
32	#include "ScriptController.h"	32	#include "ScriptController.h"
33	#include "runtime_root.h"	33	#include "runtime_root.h"
34	#include <JavaScriptCore/JSLock.h>	34	#include <JavaScriptCore/JSLock.h>
		35	#include <JavaScriptCore/WeakGCMapInlines.h>
35	#include <wtf/MemoryPressureHandler.h>	36	#include <wtf/MemoryPressureHandler.h>
36		37
37	namespace WebCore {	38	namespace WebCore {



    update(selector);
}

void CanvasRenderingContext2DBase::FontProxy::initialize(FontSelector& fontSelector, const RenderStyle& newStyle)
{
    // Beware! m_font.fontSelector() might not point to document.fontSelector()!
    ASSERT(newStyle.fontCascade().fontSelector() == &fontSelector);

    m_font.fontSelector()->registerForInvalidationCallbacks(*this);
}

const FontMetrics& CanvasRenderingContext2DBase::FontProxy::fontMetrics() const
{
    return m_font.fontMetrics();
}

const FontCascadeDescription& CanvasRenderingContext2DBase::FontProxy::fontDescription() const
{
    return m_font.fontDescription();
}

float CanvasRenderingContext2DBase::FontProxy::width(const TextRun& textRun, GlyphOverflow* overflow) const
{
    return m_font.width(textRun, 0, overflow);
}

void CanvasRenderingContext2DBase::FontProxy::drawBidiText(GraphicsContext& context, const TextRun& run, const FloatPoint& point, FontCascade::CustomFontNotReadyAction action) const
{
    context.drawBidiText(m_font, run, point, action);
}

    c->canvasClip(path, toWindRule(windingRule));
}

void CanvasRenderingContext2DBase::beginCompositeLayer()
{
#if !USE(CAIRO)
    drawingContext()->beginTransparencyLayer(1);
#endif
}

void CanvasRenderingContext2DBase::endCompositeLayer()
{
#if !USE(CAIRO)
    drawingContext()->endTransparencyLayer();    

Lines 1-6 a/Source/WebCore/platform/ColorData.gperf_sec1
- a/Source/WebCore/platform/ColorData.gperf +1 lines
1	%{	1	%{
2	#include "HashTools.h"	2	#include "HashTools.h"
3	#include <string.h>	3	#include <string.h>
		4	#include <wtf/Compiler.h>
4		5
5	IGNORE_WARNINGS_BEGIN("implicit-fallthrough")	6	IGNORE_WARNINGS_BEGIN("implicit-fallthrough")
6		7

Lines 34-39 a/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp_sec1
- a/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp +1 lines
34	#include "RealtimeMediaSourceSettings.h"	34	#include "RealtimeMediaSourceSettings.h"
35		35
36	#include <wtf/NeverDestroyed.h>	36	#include <wtf/NeverDestroyed.h>
		37	#include <wtf/text/StringBuilder.h>
37		38
38	namespace WebCore {	39	namespace WebCore {
39		40

Lines 35-40 a/Source/WebCore/platform/network/DNSResolveQueue.cpp_sec1
- a/Source/WebCore/platform/network/DNSResolveQueue.cpp +1 lines
35	#include "DNSResolveQueueCFNet.h"	35	#include "DNSResolveQueueCFNet.h"
36	#endif	36	#endif
37		37
		38	#include <wtf/CompletionHandler.h>
38	#include <wtf/NeverDestroyed.h>	39	#include <wtf/NeverDestroyed.h>
39		40
40	namespace WebCore {	41	namespace WebCore {

Lines 28-33 a/Source/WebCore/workers/service/ServiceWorkerClientQueryOptions.h_sec1
- a/Source/WebCore/workers/service/ServiceWorkerClientQueryOptions.h +1 lines
28	#if ENABLE(SERVICE_WORKER)	28	#if ENABLE(SERVICE_WORKER)
29		29
30	#include "ServiceWorkerClientType.h"	30	#include "ServiceWorkerClientType.h"
		31	#include <wtf/Optional.h>
31		32
32	namespace WebCore {	33	namespace WebCore {
33		34

Lines 36-41 a/Source/WebCore/workers/service/ServiceWorkerContainer.cpp_sec1
- a/Source/WebCore/workers/service/ServiceWorkerContainer.cpp +1 lines
36	#include "JSDOMPromiseDeferred.h"	36	#include "JSDOMPromiseDeferred.h"
37	#include "JSServiceWorkerRegistration.h"	37	#include "JSServiceWorkerRegistration.h"
38	#include "Logging.h"	38	#include "Logging.h"
		39	#include "MessageEvent.h"
39	#include "NavigatorBase.h"	40	#include "NavigatorBase.h"
40	#include "ResourceError.h"	41	#include "ResourceError.h"
41	#include "SchemeRegistry.h"	42	#include "SchemeRegistry.h"



#include <WebCore/SQLiteDatabase.h>
#include <WebCore/SQLiteStatement.h>
#include <wtf/CompletionHandler.h>
#include <wtf/StdSet.h>
#include <wtf/Vector.h>
#include <wtf/WeakPtr.h>
#include <wtf/WorkQueue.h>

namespace WebCore {

Lines 32-37 a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp_sec1
- a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp +1 lines
32	#include "NetworkLoadParameters.h"	32	#include "NetworkLoadParameters.h"
33	#include "NetworkProcess.h"	33	#include "NetworkProcess.h"
34	#include <WebCore/CrossOriginAccessControl.h>	34	#include <WebCore/CrossOriginAccessControl.h>
		35	#include <WebCore/SecurityOrigin.h>
35		36
36	#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(m_parameters.sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkCORSPreflightChecker::" fmt, this, ##__VA_ARGS__)	37	#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(m_parameters.sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkCORSPreflightChecker::" fmt, this, ##__VA_ARGS__)
37		38

Lines 29-34 a/Source/WebKit/NetworkProcess/NetworkDataTask.cpp_sec1
- a/Source/WebKit/NetworkProcess/NetworkDataTask.cpp +1 lines
29	#include "NetworkDataTaskBlob.h"	29	#include "NetworkDataTaskBlob.h"
30	#include "NetworkLoadParameters.h"	30	#include "NetworkLoadParameters.h"
31	#include "NetworkSession.h"	31	#include "NetworkSession.h"
		32	#include <WebCore/ResourceError.h>
32	#include <WebCore/ResourceResponse.h>	33	#include <WebCore/ResourceResponse.h>
33	#include <wtf/RunLoop.h>	34	#include <wtf/RunLoop.h>
34		35

Lines 33-39 a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp_sec1
- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp -1 lines
33	#include <wtf/CompletionHandler.h>	33	#include <wtf/CompletionHandler.h>
34	#include <wtf/NeverDestroyed.h>	34	#include <wtf/NeverDestroyed.h>
35	#include <wtf/RunLoop.h>	35	#include <wtf/RunLoop.h>
36	#include <wtf/WorkQueue.h>
37		36
38	#define RELEASE_LOG_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__)	37	#define RELEASE_LOG_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__)
39	#define RELEASE_LOG_ERROR_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_ERROR_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__)	38	#define RELEASE_LOG_ERROR_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_ERROR_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__)




#pragma once

#include <atomic>
#include <wtf/Forward.h>
#include <wtf/UniqueRef.h>
#include <wtf/WorkQueue.h>
namespace WTF {
class WorkQueue;
}

namespace WebCore {
class SQLiteDatabase;

    void query(String&&, PAL::SessionID, CompletionHandler<void(bool)>&&);

private:
    Ref<WorkQueue> m_workQueue;
    UniqueRef<WebCore::SQLiteDatabase> m_database;
    UniqueRef<WebCore::SQLiteStatement> m_statement;
    std::atomic<bool> m_didSetupCompleteSuccessfully { false };
};




#include "AuthenticationManager.h"
#include "AuxiliaryProcessMessages.h"
#include "DataReference.h"
#include "Download.h"
#include "DownloadProxyMessages.h"
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
#include "LegacyCustomProtocolManager.h"

#include "Logging.h"
#include "NetworkConnectionToWebProcess.h"
#include "NetworkContentRuleListManagerMessages.h"
#include "NetworkLoad.h"
#include "NetworkProcessCreationParameters.h"
#include "NetworkProcessPlatformStrategies.h"
#include "NetworkProcessProxyMessages.h"
#include "NetworkResourceLoadMap.h"
#include "NetworkResourceLoader.h"
#include "NetworkSession.h"
#include "NetworkSessionCreationParameters.h"

Lines 26-31 a/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.cpp_sec1
- a/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.cpp +2 lines
26	#include "config.h"	26	#include "config.h"
27	#include "NetworkResourceLoadMap.h"	27	#include "NetworkResourceLoadMap.h"
28		28
		29	#include "NetworkConnectionToWebProcess.h"
		30
29	namespace WebKit {	31	namespace WebKit {
30		32
31	NetworkResourceLoadMap::MapType::AddResult NetworkResourceLoadMap::add(ResourceLoadIdentifier identifier, Ref<NetworkResourceLoader>&& loader)	33	NetworkResourceLoadMap::MapType::AddResult NetworkResourceLoadMap::add(ResourceLoadIdentifier identifier, Ref<NetworkResourceLoader>&& loader)

Lines 25-31 a/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.h_sec1
- a/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.h -1 / +2 lines
25		25
26	#pragma once	26	#pragma once
27		27
28	#include "NetworkConnectionToWebProcess.h"
29	#include "NetworkResourceLoader.h"	28	#include "NetworkResourceLoader.h"
30	#include <wtf/HashMap.h>	29	#include <wtf/HashMap.h>
31	#include <wtf/HashSet.h>	30	#include <wtf/HashSet.h>
Lines 36-41 a/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.h_sec2
36		35
37	namespace WebKit {	36	namespace WebKit {
38		37
		38	class NetworkConnectionToWebProcess;
		39
39	typedef uint64_t ResourceLoadIdentifier;	40	typedef uint64_t ResourceLoadIdentifier;
40		41
41	class NetworkResourceLoadMap {	42	class NetworkResourceLoadMap {

Lines 35-40 a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp_sec1
- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp +1 lines
35	#include "NetworkLoadChecker.h"	35	#include "NetworkLoadChecker.h"
36	#include "NetworkProcess.h"	36	#include "NetworkProcess.h"
37	#include "NetworkProcessConnectionMessages.h"	37	#include "NetworkProcessConnectionMessages.h"
		38	#include "NetworkSession.h"
38	#include "SharedBufferDataReference.h"	39	#include "SharedBufferDataReference.h"
39	#include "WebCoreArgumentCoders.h"	40	#include "WebCoreArgumentCoders.h"
40	#include "WebErrors.h"	41	#include "WebErrors.h"

Lines 35-40 a/Source/WebKit/NetworkProcess/PingLoad.h_sec1
- a/Source/WebKit/NetworkProcess/PingLoad.h +1 lines
35		35
36	namespace WebKit {	36	namespace WebKit {
37		37
		38	class NetworkConnectionToWebProcess;
38	class NetworkLoadChecker;	39	class NetworkLoadChecker;
39	class NetworkProcess;	40	class NetworkProcess;
40		41

Lines 29-34 a/Source/WebKit/Shared/WebCompiledContentRuleListData.cpp_sec1
- a/Source/WebKit/Shared/WebCompiledContentRuleListData.cpp +1 lines
29	#if ENABLE(CONTENT_EXTENSIONS)	29	#if ENABLE(CONTENT_EXTENSIONS)
30		30
31	#include "ArgumentCoders.h"	31	#include "ArgumentCoders.h"
		32	#include "DataReference.h"
32	#include "SharedBufferDataReference.h"	33	#include "SharedBufferDataReference.h"
33		34
34	namespace WebKit {	35	namespace WebKit {

Lines 40-45 a/Source/WebKit/Shared/gtk/WebEventFactory.cpp_sec1
- a/Source/WebKit/Shared/gtk/WebEventFactory.cpp +2 lines
40		40
41	namespace WebKit {	41	namespace WebKit {
42		42
		43	using namespace WebCore;
		44
43	static inline bool isGdkKeyCodeFromKeyPad(unsigned keyval)	45	static inline bool isGdkKeyCodeFromKeyPad(unsigned keyval)
44	{	46	{
45	return keyval >= GDK_KP_Space && keyval <= GDK_KP_9;	47	return keyval >= GDK_KP_Space && keyval <= GDK_KP_9;



void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreFunction callback)
{
#if ENABLE(RESOURCE_LOAD_STATISTICS)
    WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(WebKit::ShouldGrandfatherStatistics::Yes, [context, callback]() {
        callback(context);
    });
#else

void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(WKWebsiteDataStoreRef dataStoreRef, unsigned hours, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHoursFunction callback)
{
#if ENABLE(RESOURCE_LOAD_STATISTICS)
    WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(WallTime::now() - Seconds::fromHours(hours), WebKit::ShouldGrandfatherStatistics::Yes, [context, callback]() {
        callback(context);
    });
#else

    store.resetCacheMaxAgeCapForPrevalentResources([callbackAggregator = callbackAggregator.copyRef()] { });
    store.resetCrossSiteLoadsWithLinkDecorationForTesting([callbackAggregator = callbackAggregator.copyRef()] { });
    store.resetParametersToDefaultValues([callbackAggregator = callbackAggregator.copyRef()] { });
    store.scheduleClearInMemoryAndPersistent(WebKit::ShouldGrandfatherStatistics::No, [callbackAggregator = callbackAggregator.copyRef()] { });
#else
    UNUSED_PARAM(dataStoreRef);
    completionHandler(context);

Lines 30-36 a/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp_sec1
- a/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp +3 lines
30	#include "DownloadProxy.h"	30	#include "DownloadProxy.h"
31	#include "DownloadProxyMessages.h"	31	#include "DownloadProxyMessages.h"
32	#include "MessageReceiverMap.h"	32	#include "MessageReceiverMap.h"
		33	#include "NetworkProcessMessages.h"
		34	#include "NetworkProcessProxy.h"
33	#include "ProcessAssertion.h"	35	#include "ProcessAssertion.h"
		36	#include "WebProcessPool.h"
34	#include <wtf/StdLibExtras.h>	37	#include <wtf/StdLibExtras.h>
35		38
36	#if PLATFORM(COCOA)	39	#if PLATFORM(COCOA)

Lines 29-34 a/Source/WebKit/UIProcess/InspectorTargetProxy.cpp_sec1
- a/Source/WebKit/UIProcess/InspectorTargetProxy.cpp +1 lines
29	#include "WebFrameProxy.h"	29	#include "WebFrameProxy.h"
30	#include "WebPageMessages.h"	30	#include "WebPageMessages.h"
31	#include "WebPageProxy.h"	31	#include "WebPageProxy.h"
		32	#include "WebProcessProxy.h"
32		33
33	namespace WebKit {	34	namespace WebKit {
34		35

Lines 32-37 a/Source/WebKit/UIProcess/PageClient.h_sec1
- a/Source/WebKit/UIProcess/PageClient.h +5 lines
32	#include "WebDataListSuggestionsDropdown.h"	32	#include "WebDataListSuggestionsDropdown.h"
33	#include "WebPopupMenuProxy.h"	33	#include "WebPopupMenuProxy.h"
34	#include <WebCore/AlternativeTextClient.h>	34	#include <WebCore/AlternativeTextClient.h>
		35	#include <WebCore/DragActions.h>
35	#include <WebCore/EditorClient.h>	36	#include <WebCore/EditorClient.h>
36	#include <WebCore/FocusDirection.h>	37	#include <WebCore/FocusDirection.h>
37	#include <WebCore/InputMode.h>	38	#include <WebCore/InputMode.h>
Lines 82-87 class Region; a/Source/WebKit/UIProcess/PageClient.h_sec2
82	class TextIndicator;	83	class TextIndicator;
83	class WebMediaSessionManager;	84	class WebMediaSessionManager;
84		85
		86	#if PLATFORM(GTK)
		87	class SelectionData;
		88	#endif
		89
85	enum class RouteSharingPolicy : uint8_t;	90	enum class RouteSharingPolicy : uint8_t;
86	enum class ScrollbarStyle : uint8_t;	91	enum class ScrollbarStyle : uint8_t;
87	enum class TextIndicatorWindowLifetime : uint8_t;	92	enum class TextIndicatorWindowLifetime : uint8_t;

Lines 28-33 a/Source/WebKit/UIProcess/ProcessAssertion.cpp_sec1
- a/Source/WebKit/UIProcess/ProcessAssertion.cpp +2 lines
28		28
29	#if !PLATFORM(IOS_FAMILY)	29	#if !PLATFORM(IOS_FAMILY)
30		30
		31	#include "WKBase.h"
		32
31	namespace WebKit {	33	namespace WebKit {
32		34
33	ProcessAssertion::ProcessAssertion(ProcessID, const String&, AssertionState assertionState)	35	ProcessAssertion::ProcessAssertion(ProcessID, const String&, AssertionState assertionState)

Lines 32-37 a/Source/WebKit/UIProcess/ProvisionalPageProxy.h_sec1
- a/Source/WebKit/UIProcess/ProvisionalPageProxy.h +4 lines
32	#include "WebsitePoliciesData.h"	32	#include "WebsitePoliciesData.h"
33	#include <wtf/WeakPtr.h>	33	#include <wtf/WeakPtr.h>
34		34
		35	namespace API {
		36	class Navigation;
		37	}
		38
35	namespace IPC {	39	namespace IPC {
36	class FormDataReference;	40	class FormDataReference;
37	}	41	}

Lines 25-30 a/Source/WebKit/UIProcess/WebPageInspectorTargetAgent.h_sec1
- a/Source/WebKit/UIProcess/WebPageInspectorTargetAgent.h +1 lines
25		25
26	#pragma once	26	#pragma once
27		27
		28	#include <JavaScriptCore/InspectorFrontendChannel.h>
28	#include <JavaScriptCore/InspectorTargetAgent.h>	29	#include <JavaScriptCore/InspectorTargetAgent.h>
29		30
30	namespace WebKit {	31	namespace WebKit {

Lines 29-34 a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp_sec1
- a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp +1 lines
29	#include <WebCore/GeolocationPosition.h>	29	#include <WebCore/GeolocationPosition.h>
30	#include <gio/gio.h>	30	#include <gio/gio.h>
31	#include <glib/gi18n-lib.h>	31	#include <glib/gi18n-lib.h>
		32	#include <wtf/glib/GUniquePtr.h>
32		33
33	#if USE(GLIB_EVENT_LOOP)	34	#if USE(GLIB_EVENT_LOOP)
34	#include <wtf/glib/RunLoopSourcePriority.h>	35	#include <wtf/glib/RunLoopSourcePriority.h>

Lines 152-158 void WebCacheStorageConnection::engineRepresentationCompleted(uint64_t requestId a/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp_sec1
- a/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp -1 / +1 lines
152	callback(result);	152	callback(result);
153	}	153	}
154		154
155	void WebCacheStorageConnection::updateQuotaBasedOnSpaceUsage(const ClientOrigin& origin)	155	void WebCacheStorageConnection::updateQuotaBasedOnSpaceUsage(const WebCore::ClientOrigin& origin)
156	{	156	{
157	connection().send(Messages::NetworkProcess::UpdateQuotaBasedOnSpaceUsageForTesting(m_sessionID, origin), 0);	157	connection().send(Messages::NetworkProcess::UpdateQuotaBasedOnSpaceUsageForTesting(m_sessionID, origin), 0);
158	}	158	}

Lines 248-254 void WKBundleClearAllDatabases(WKBundleRef) a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp_sec1
- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp -1 / +1 lines
248	void WKBundleSetDatabaseQuota(WKBundleRef bundleRef, uint64_t quota)	248	void WKBundleSetDatabaseQuota(WKBundleRef bundleRef, uint64_t quota)
249	{	249	{
250	// Historically, we've used the following (somewhat nonsensical) string for the databaseIdentifier of local files.	250	// Historically, we've used the following (somewhat nonsensical) string for the databaseIdentifier of local files.
251	WebCore::DatabaseTracker::singleton().setQuota(*WebKit::SecurityOriginData::fromDatabaseIdentifier("file__0"), quota);	251	WebCore::DatabaseTracker::singleton().setQuota(*WebCore::SecurityOriginData::fromDatabaseIdentifier("file__0"), quota);
252	}	252	}
253		253
254	void WKBundleReleaseMemory(WKBundleRef)	254	void WKBundleReleaseMemory(WKBundleRef)



#include <WebCore/FetchIdentifier.h>
#include <WebCore/FetchLoader.h>
#include <WebCore/FetchLoaderClient.h>
#include <WebCore/ResourceError.h>
#include <WebCore/ServiceWorkerFetch.h>
#include <WebCore/ServiceWorkerTypes.h>
#include <wtf/UniqueRef.h>

    Optional<BlobLoader> m_blobLoader;
    bool m_needsContinueDidReceiveResponseMessage { false };
    bool m_waitingForContinueDidReceiveResponseMessage { false };
    Variant<std::nullptr_t, Ref<WebCore::SharedBuffer>, Ref<WebCore::FormData>, UniqueRef<WebCore::ResourceError>> m_responseData;
    bool m_didFinish { false };
};


Return to Bug 196845

Lines 411-417 void WKWebsiteDataStoreSetStatisticsPruneEntriesDownTo(WKWebsiteDataStoreRef dat a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp_sec1
- a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp -3 / +3 lines
411	void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreFunction callback)	411	void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreFunction callback)
412	{	412	{
413	#if ENABLE(RESOURCE_LOAD_STATISTICS)	413	#if ENABLE(RESOURCE_LOAD_STATISTICS)
414	WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(ShouldGrandfatherStatistics::Yes, [context, callback]() {	414	WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(WebKit::ShouldGrandfatherStatistics::Yes, [context, callback]() {
415	callback(context);	415	callback(context);
416	});	416	});
417	#else	417	#else
Lines 422-428 void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataSt a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp_sec2
422	void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(WKWebsiteDataStoreRef dataStoreRef, unsigned hours, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHoursFunction callback)	422	void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(WKWebsiteDataStoreRef dataStoreRef, unsigned hours, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHoursFunction callback)
423	{	423	{
424	#if ENABLE(RESOURCE_LOAD_STATISTICS)	424	#if ENABLE(RESOURCE_LOAD_STATISTICS)
425	WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(WallTime::now() - Seconds::fromHours(hours), ShouldGrandfatherStatistics::Yes, [context, callback]() {	425	WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(WallTime::now() - Seconds::fromHours(hours), WebKit::ShouldGrandfatherStatistics::Yes, [context, callback]() {
426	callback(context);	426	callback(context);
427	});	427	});
428	#else	428	#else
Lines 483-489 void WKWebsiteDataStoreStatisticsResetToConsistentState(WKWebsiteDataStoreRef da a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp_sec3
483	store.resetCacheMaxAgeCapForPrevalentResources([callbackAggregator = callbackAggregator.copyRef()] { });	483	store.resetCacheMaxAgeCapForPrevalentResources([callbackAggregator = callbackAggregator.copyRef()] { });
484	store.resetCrossSiteLoadsWithLinkDecorationForTesting([callbackAggregator = callbackAggregator.copyRef()] { });	484	store.resetCrossSiteLoadsWithLinkDecorationForTesting([callbackAggregator = callbackAggregator.copyRef()] { });
485	store.resetParametersToDefaultValues([callbackAggregator = callbackAggregator.copyRef()] { });	485	store.resetParametersToDefaultValues([callbackAggregator = callbackAggregator.copyRef()] { });
486	store.scheduleClearInMemoryAndPersistent(ShouldGrandfatherStatistics::No, [callbackAggregator = callbackAggregator.copyRef()] { });	486	store.scheduleClearInMemoryAndPersistent(WebKit::ShouldGrandfatherStatistics::No, [callbackAggregator = callbackAggregator.copyRef()] { });
487	#else	487	#else
488	UNUSED_PARAM(dataStoreRef);	488	UNUSED_PARAM(dataStoreRef);
489	completionHandler(context);	489	completionHandler(context);

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +34 lines
		1	2019-04-11 Ross Kirsling <ross.kirsling@sony.com>
		2
		3	WebKit should build successfully even with -DENABLE_UNIFIED_BUILDS=OFF
		4	https://bugs.webkit.org/show_bug.cgi?id=196845
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Modules/mediastream/MediaStreamTrack.cpp:
		9	* Modules/webvr/VREyeParameters.cpp:
		10	* Modules/webvr/VRFrameData.cpp:
		11	* Modules/webvr/VRPose.cpp:
		12	* accessibility/AccessibilityList.cpp:
		13	* accessibility/isolatedtree/AXIsolatedTree.cpp:
		14	* accessibility/isolatedtree/AXIsolatedTreeNode.cpp:
		15	* bindings/js/JSDOMConvertWebGL.cpp:
		16	* bindings/js/JSHistoryCustom.cpp:
		17	* bindings/js/JSIDBCursorWithValueCustom.cpp:
		18	* bindings/js/JSPerformanceObserverCustom.cpp:
		19	* bindings/js/WindowProxy.cpp:
		20	* html/canvas/CanvasRenderingContext2DBase.cpp:
		21	(WebCore::CanvasRenderingContext2DBase::FontProxy::initialize):
		22	(WebCore::CanvasRenderingContext2DBase::FontProxy::fontMetrics const):
		23	(WebCore::CanvasRenderingContext2DBase::FontProxy::fontDescription const):
		24	(WebCore::CanvasRenderingContext2DBase::FontProxy::width const):
		25	(WebCore::CanvasRenderingContext2DBase::FontProxy::drawBidiText const):
		26	(WebCore::CanvasRenderingContext2DBase::beginCompositeLayer):
		27	(WebCore::CanvasRenderingContext2DBase::endCompositeLayer):
		28	* page/scrolling/ScrollingStateTree.cpp:
		29	* platform/ColorData.gperf:
		30	* platform/mediastream/RealtimeMediaSourceSettings.cpp:
		31	* platform/network/DNSResolveQueue.cpp:
		32	* workers/service/ServiceWorkerClientQueryOptions.h:
		33	* workers/service/ServiceWorkerContainer.cpp:
		34
1	2019-04-11 Megan Gardner <megan_gardner@apple.com>	35	2019-04-11 Megan Gardner <megan_gardner@apple.com>
2		36
3	Update 'Save Image' to more clear instructions	37	Update 'Save Image' to more clear instructions

Lines 1-3 a/Source/WebKit/ChangeLog_sec1
- a/Source/WebKit/ChangeLog +36 lines
		1	2019-04-11 Ross Kirsling <ross.kirsling@sony.com>
		2
		3	WebKit should build successfully even with -DENABLE_UNIFIED_BUILDS=OFF
		4	https://bugs.webkit.org/show_bug.cgi?id=196845
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:
		9	* NetworkProcess/NetworkCORSPreflightChecker.cpp:
		10	* NetworkProcess/NetworkDataTask.cpp:
		11	* NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
		12	* NetworkProcess/NetworkHTTPSUpgradeChecker.h:
		13	* NetworkProcess/NetworkProcess.cpp:
		14	* NetworkProcess/NetworkResourceLoadMap.cpp:
		15	* NetworkProcess/NetworkResourceLoadMap.h:
		16	* NetworkProcess/NetworkResourceLoader.cpp:
		17	* NetworkProcess/PingLoad.h:
		18	* Shared/WebCompiledContentRuleListData.cpp:
		19	* Shared/gtk/WebEventFactory.cpp:
		20	* UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
		21	(WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore):
		22	(WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours):
		23	(WKWebsiteDataStoreStatisticsResetToConsistentState):
		24	* UIProcess/Downloads/DownloadProxyMap.cpp:
		25	* UIProcess/InspectorTargetProxy.cpp:
		26	* UIProcess/PageClient.h:
		27	* UIProcess/ProcessAssertion.cpp:
		28	* UIProcess/ProvisionalPageProxy.h:
		29	* UIProcess/WebPageInspectorTargetAgent.h:
		30	* UIProcess/geoclue/GeoclueGeolocationProvider.cpp:
		31	* WebProcess/Cache/WebCacheStorageConnection.cpp:
		32	(WebKit::WebCacheStorageConnection::updateQuotaBasedOnSpaceUsage):
		33	* WebProcess/InjectedBundle/API/c/WKBundle.cpp:
		34	(WKBundleSetDatabaseQuota):
		35	* WebProcess/Storage/WebServiceWorkerFetchTaskClient.h:
		36
1	2019-04-11 Megan Gardner <megan_gardner@apple.com>	37	2019-04-11 Megan Gardner <megan_gardner@apple.com>
2		38
3	Update 'Save Image' to more clear instructions	39	Update 'Save Image' to more clear instructions

Lines 23-31 a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp_sec1
- a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp -2 / +2 lines
23	* THE POSSIBILITY OF SUCH DAMAGE.	23	* THE POSSIBILITY OF SUCH DAMAGE.
24	*/	24	*/
25		25
26	#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
27
28	#include "config.h"	26	#include "config.h"
		27
		28	#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
29	#include "AXIsolatedTree.h"	29	#include "AXIsolatedTree.h"
30		30
31	#include "AXIsolatedTreeNode.h"	31	#include "AXIsolatedTreeNode.h"

Lines 322-328 void CanvasRenderingContext2DBase::FontProxy::fontsNeedUpdate(FontSelector& sele a/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp_sec1
- a/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp -7 / +7 lines
322	update(selector);	322	update(selector);
323	}	323	}
324		324
325	inline void CanvasRenderingContext2DBase::FontProxy::initialize(FontSelector& fontSelector, const RenderStyle& newStyle)	325	void CanvasRenderingContext2DBase::FontProxy::initialize(FontSelector& fontSelector, const RenderStyle& newStyle)
326	{	326	{
327	// Beware! m_font.fontSelector() might not point to document.fontSelector()!	327	// Beware! m_font.fontSelector() might not point to document.fontSelector()!
328	ASSERT(newStyle.fontCascade().fontSelector() == &fontSelector);	328	ASSERT(newStyle.fontCascade().fontSelector() == &fontSelector);
Lines 334-355 inline void CanvasRenderingContext2DBase::FontProxy::initialize(FontSelector& fo a/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp_sec2
334	m_font.fontSelector()->registerForInvalidationCallbacks(*this);	334	m_font.fontSelector()->registerForInvalidationCallbacks(*this);
335	}	335	}
336		336
337	inline const FontMetrics& CanvasRenderingContext2DBase::FontProxy::fontMetrics() const	337	const FontMetrics& CanvasRenderingContext2DBase::FontProxy::fontMetrics() const
338	{	338	{
339	return m_font.fontMetrics();	339	return m_font.fontMetrics();
340	}	340	}
341		341
342	inline const FontCascadeDescription& CanvasRenderingContext2DBase::FontProxy::fontDescription() const	342	const FontCascadeDescription& CanvasRenderingContext2DBase::FontProxy::fontDescription() const
343	{	343	{
344	return m_font.fontDescription();	344	return m_font.fontDescription();
345	}	345	}
346		346
347	inline float CanvasRenderingContext2DBase::FontProxy::width(const TextRun& textRun, GlyphOverflow* overflow) const	347	float CanvasRenderingContext2DBase::FontProxy::width(const TextRun& textRun, GlyphOverflow* overflow) const
348	{	348	{
349	return m_font.width(textRun, 0, overflow);	349	return m_font.width(textRun, 0, overflow);
350	}	350	}
351		351
352	inline void CanvasRenderingContext2DBase::FontProxy::drawBidiText(GraphicsContext& context, const TextRun& run, const FloatPoint& point, FontCascade::CustomFontNotReadyAction action) const	352	void CanvasRenderingContext2DBase::FontProxy::drawBidiText(GraphicsContext& context, const TextRun& run, const FloatPoint& point, FontCascade::CustomFontNotReadyAction action) const
353	{	353	{
354	context.drawBidiText(m_font, run, point, action);	354	context.drawBidiText(m_font, run, point, action);
355	}	355	}
Lines 1166-1179 void CanvasRenderingContext2DBase::clipInternal(const Path& path, CanvasFillRule a/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp_sec3
1166	c->canvasClip(path, toWindRule(windingRule));	1166	c->canvasClip(path, toWindRule(windingRule));
1167	}	1167	}
1168		1168
1169	inline void CanvasRenderingContext2DBase::beginCompositeLayer()	1169	void CanvasRenderingContext2DBase::beginCompositeLayer()
1170	{	1170	{
1171	#if !USE(CAIRO)	1171	#if !USE(CAIRO)
1172	drawingContext()->beginTransparencyLayer(1);	1172	drawingContext()->beginTransparencyLayer(1);
1173	#endif	1173	#endif
1174	}	1174	}
1175		1175
1176	inline void CanvasRenderingContext2DBase::endCompositeLayer()	1176	void CanvasRenderingContext2DBase::endCompositeLayer()
1177	{	1177	{
1178	#if !USE(CAIRO)	1178	#if !USE(CAIRO)
1179	drawingContext()->endTransparencyLayer();	1179	drawingContext()->endTransparencyLayer();

Lines 32-40 a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h_sec1
- a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h -2 / +1 lines
32	#include <WebCore/SQLiteDatabase.h>	32	#include <WebCore/SQLiteDatabase.h>
33	#include <WebCore/SQLiteStatement.h>	33	#include <WebCore/SQLiteStatement.h>
34	#include <wtf/CompletionHandler.h>	34	#include <wtf/CompletionHandler.h>
35	#include <wtf/UniqueRef.h>	35	#include <wtf/StdSet.h>
36	#include <wtf/Vector.h>	36	#include <wtf/Vector.h>
37	#include <wtf/WeakPtr.h>
38	#include <wtf/WorkQueue.h>	37	#include <wtf/WorkQueue.h>
39		38
40	namespace WebCore {	39	namespace WebCore {

Lines 32-37 a/Source/WebKit/NetworkProcess/NetworkProcess.cpp_sec1
- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +3 lines
32	#include "AuthenticationManager.h"	32	#include "AuthenticationManager.h"
33	#include "AuxiliaryProcessMessages.h"	33	#include "AuxiliaryProcessMessages.h"
34	#include "DataReference.h"	34	#include "DataReference.h"
		35	#include "Download.h"
35	#include "DownloadProxyMessages.h"	36	#include "DownloadProxyMessages.h"
36	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)	37	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
37	#include "LegacyCustomProtocolManager.h"	38	#include "LegacyCustomProtocolManager.h"
Lines 39-47 a/Source/WebKit/NetworkProcess/NetworkProcess.cpp_sec2
39	#include "Logging.h"	40	#include "Logging.h"
40	#include "NetworkConnectionToWebProcess.h"	41	#include "NetworkConnectionToWebProcess.h"
41	#include "NetworkContentRuleListManagerMessages.h"	42	#include "NetworkContentRuleListManagerMessages.h"
		43	#include "NetworkLoad.h"
42	#include "NetworkProcessCreationParameters.h"	44	#include "NetworkProcessCreationParameters.h"
43	#include "NetworkProcessPlatformStrategies.h"	45	#include "NetworkProcessPlatformStrategies.h"
44	#include "NetworkProcessProxyMessages.h"	46	#include "NetworkProcessProxyMessages.h"
		47	#include "NetworkResourceLoadMap.h"
45	#include "NetworkResourceLoader.h"	48	#include "NetworkResourceLoader.h"
46	#include "NetworkSession.h"	49	#include "NetworkSession.h"
47	#include "NetworkSessionCreationParameters.h"	50	#include "NetworkSessionCreationParameters.h"

Lines 31-37 a/Source/WebKit/WebProcess/Storage/WebServiceWorkerFetchTaskClient.h_sec1
- a/Source/WebKit/WebProcess/Storage/WebServiceWorkerFetchTaskClient.h -2 / +1 lines
31	#include <WebCore/FetchIdentifier.h>	31	#include <WebCore/FetchIdentifier.h>
32	#include <WebCore/FetchLoader.h>	32	#include <WebCore/FetchLoader.h>
33	#include <WebCore/FetchLoaderClient.h>	33	#include <WebCore/FetchLoaderClient.h>
34	#include <WebCore/ResourceError.h>
35	#include <WebCore/ServiceWorkerFetch.h>	34	#include <WebCore/ServiceWorkerFetch.h>
36	#include <WebCore/ServiceWorkerTypes.h>	35	#include <WebCore/ServiceWorkerTypes.h>
37	#include <wtf/UniqueRef.h>	36	#include <wtf/UniqueRef.h>
Lines 83-89 private: a/Source/WebKit/WebProcess/Storage/WebServiceWorkerFetchTaskClient.h_sec2
83	Optional<BlobLoader> m_blobLoader;	82	Optional<BlobLoader> m_blobLoader;
84	bool m_needsContinueDidReceiveResponseMessage { false };	83	bool m_needsContinueDidReceiveResponseMessage { false };
85	bool m_waitingForContinueDidReceiveResponseMessage { false };	84	bool m_waitingForContinueDidReceiveResponseMessage { false };
86	Variant<std::nullptr_t, Ref<WebCore::SharedBuffer>, Ref<FormData>, UniqueRef<ResourceError>> m_responseData;	85	Variant<std::nullptr_t, Ref<WebCore::SharedBuffer>, Ref<WebCore::FormData>, UniqueRef<WebCore::ResourceError>> m_responseData;
87	bool m_didFinish { false };	86	bool m_didFinish { false };
88	};	87	};
89		88