Non-unified build fixes mid January 2020 edition
https://bugs.webkit.org/show_bug.cgi?id=206363
Unreviewed build fix.
Source/JavaScriptCore:
* interpreter/StackVisitor.cpp:
Source/WebCore:
* Headers.cmake:
* css/CSSFontVariationValue.cpp:
* css/CSSValuePool.cpp:
* css/TransformFunctions.cpp:
* css/TransformFunctions.h:
* platform/graphics/ExtendedColor.cpp:
* rendering/svg/SVGRenderSupport.cpp:
* style/StyleResolver.cpp:
* svg/SVGPathByteStreamBuilder.cpp:
* svg/SVGPathByteStreamSource.cpp:
* svg/SVGPathSegListBuilder.cpp:
* svg/SVGPathSegListSource.cpp:
* svg/SVGPreserveAspectRatioValue.cpp:
* svg/SVGZoomAndPan.cpp:
* svg/SVGZoomEvent.cpp:
Source/WebKit:
* NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
* NetworkProcess/curl/NetworkDataTaskCurl.cpp:
* PlatformFTW.cmake:
* PlatformWin.cmake:
* UIProcess/API/APIContentWorld.cpp:
* UIProcess/Automation/WebAutomationSession.cpp:
* WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp:
* WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254703 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 0c3eba0..ef182d0 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2020-01-16 Don Olmstead <don.olmstead@sony.com>
+
+ Non-unified build fixes mid January 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=206363
+
+ Unreviewed build fix.
+
+ * interpreter/StackVisitor.cpp:
+
2020-01-16 Jonathan Bedard <jbedard@apple.com>
Pass JSToken by const reference
diff --git a/Source/JavaScriptCore/interpreter/StackVisitor.cpp b/Source/JavaScriptCore/interpreter/StackVisitor.cpp
index d71a597..aa7a877 100644
--- a/Source/JavaScriptCore/interpreter/StackVisitor.cpp
+++ b/Source/JavaScriptCore/interpreter/StackVisitor.cpp
@@ -31,6 +31,7 @@
#include "InlineCallFrame.h"
#include "Interpreter.h"
#include "JSCInlines.h"
+#include "RegisterAtOffsetList.h"
#include "WasmCallee.h"
#include "WasmIndexOrName.h"
#include "WebAssemblyFunction.h"
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7bb9bb8..43ef4d9 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2020-01-16 Don Olmstead <don.olmstead@sony.com>
+
+ Non-unified build fixes mid January 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=206363
+
+ Unreviewed build fix.
+
+ * Headers.cmake:
+ * css/CSSFontVariationValue.cpp:
+ * css/CSSValuePool.cpp:
+ * css/TransformFunctions.cpp:
+ * css/TransformFunctions.h:
+ * platform/graphics/ExtendedColor.cpp:
+ * rendering/svg/SVGRenderSupport.cpp:
+ * style/StyleResolver.cpp:
+ * svg/SVGPathByteStreamBuilder.cpp:
+ * svg/SVGPathByteStreamSource.cpp:
+ * svg/SVGPathSegListBuilder.cpp:
+ * svg/SVGPathSegListSource.cpp:
+ * svg/SVGPreserveAspectRatioValue.cpp:
+ * svg/SVGZoomAndPan.cpp:
+ * svg/SVGZoomEvent.cpp:
+
2020-01-16 Ryosuke Niwa <rniwa@webkit.org>
WK1: arbitrary JS execution while tearing down renderers in Element::addShadowRoot
diff --git a/Source/WebCore/Headers.cmake b/Source/WebCore/Headers.cmake
index 852cacf..1f778f1 100644
--- a/Source/WebCore/Headers.cmake
+++ b/Source/WebCore/Headers.cmake
@@ -1245,6 +1245,7 @@
platform/network/SocketStreamHandleClient.h
platform/network/StorageSessionProvider.h
platform/network/StoredCredentialsPolicy.h
+ platform/network/SynchronousLoaderClient.h
platform/sql/SQLValue.h
platform/sql/SQLiteDatabase.h
diff --git a/Source/WebCore/css/CSSFontVariationValue.cpp b/Source/WebCore/css/CSSFontVariationValue.cpp
index 6630e44..789078f 100644
--- a/Source/WebCore/css/CSSFontVariationValue.cpp
+++ b/Source/WebCore/css/CSSFontVariationValue.cpp
@@ -28,6 +28,7 @@
#if ENABLE(VARIATION_FONTS)
#include "CSSFontVariationValue.h"
+#include <wtf/text/StringConcatenateNumbers.h>
namespace WebCore {
diff --git a/Source/WebCore/css/CSSValuePool.cpp b/Source/WebCore/css/CSSValuePool.cpp
index 125109b..51720f5 100644
--- a/Source/WebCore/css/CSSValuePool.cpp
+++ b/Source/WebCore/css/CSSValuePool.cpp
@@ -30,6 +30,7 @@
#include "CSSPrimitiveValueMappings.h"
#include "CSSValueKeywords.h"
#include "CSSValueList.h"
+#include <wtf/text/StringConcatenateNumbers.h>
namespace WebCore {
diff --git a/Source/WebCore/css/TransformFunctions.cpp b/Source/WebCore/css/TransformFunctions.cpp
index 1001365..f4b092c 100644
--- a/Source/WebCore/css/TransformFunctions.cpp
+++ b/Source/WebCore/css/TransformFunctions.cpp
@@ -42,6 +42,7 @@
#include "ScaleTransformOperation.h"
#include "SkewTransformOperation.h"
#include "TranslateTransformOperation.h"
+#include <wtf/text/StringConcatenateNumbers.h>
namespace WebCore {
diff --git a/Source/WebCore/css/TransformFunctions.h b/Source/WebCore/css/TransformFunctions.h
index 84c6b9d..b59be33 100644
--- a/Source/WebCore/css/TransformFunctions.h
+++ b/Source/WebCore/css/TransformFunctions.h
@@ -29,6 +29,7 @@
#pragma once
+#include "Length.h"
#include "TransformOperations.h"
namespace WebCore {
diff --git a/Source/WebCore/platform/graphics/ExtendedColor.cpp b/Source/WebCore/platform/graphics/ExtendedColor.cpp
index a481cce..5ad8cbf 100644
--- a/Source/WebCore/platform/graphics/ExtendedColor.cpp
+++ b/Source/WebCore/platform/graphics/ExtendedColor.cpp
@@ -27,6 +27,7 @@
#include "ExtendedColor.h"
#include <wtf/MathExtras.h>
+#include <wtf/text/StringConcatenateNumbers.h>
namespace WebCore {
diff --git a/Source/WebCore/rendering/svg/SVGRenderSupport.cpp b/Source/WebCore/rendering/svg/SVGRenderSupport.cpp
index 0c6d16c..88ca3e5 100644
--- a/Source/WebCore/rendering/svg/SVGRenderSupport.cpp
+++ b/Source/WebCore/rendering/svg/SVGRenderSupport.cpp
@@ -41,6 +41,7 @@
#include "RenderSVGText.h"
#include "RenderSVGTransformableContainer.h"
#include "RenderSVGViewportContainer.h"
+#include "SVGGeometryElement.h"
#include "SVGResources.h"
#include "SVGResourcesCache.h"
#include "TransformState.h"
diff --git a/Source/WebCore/style/StyleResolver.cpp b/Source/WebCore/style/StyleResolver.cpp
index ceb4857..8bf371a 100644
--- a/Source/WebCore/style/StyleResolver.cpp
+++ b/Source/WebCore/style/StyleResolver.cpp
@@ -58,6 +58,7 @@
#include "RuleSet.h"
#include "RuntimeEnabledFeatures.h"
#include "SVGDocumentExtensions.h"
+#include "SVGElement.h"
#include "SVGFontFaceElement.h"
#include "Settings.h"
#include "ShadowRoot.h"
diff --git a/Source/WebCore/svg/SVGPathByteStreamBuilder.cpp b/Source/WebCore/svg/SVGPathByteStreamBuilder.cpp
index d195c28..ea2952b 100644
--- a/Source/WebCore/svg/SVGPathByteStreamBuilder.cpp
+++ b/Source/WebCore/svg/SVGPathByteStreamBuilder.cpp
@@ -23,6 +23,7 @@
#include "SVGPathSeg.h"
#include "SVGPathStringSource.h"
+#include <wtf/text/StringConcatenateNumbers.h>
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGPathByteStreamSource.cpp b/Source/WebCore/svg/SVGPathByteStreamSource.cpp
index fa43922..f71c454 100644
--- a/Source/WebCore/svg/SVGPathByteStreamSource.cpp
+++ b/Source/WebCore/svg/SVGPathByteStreamSource.cpp
@@ -19,6 +19,7 @@
#include "config.h"
#include "SVGPathByteStreamSource.h"
+#include <wtf/text/StringConcatenateNumbers.h>
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGPathSegListBuilder.cpp b/Source/WebCore/svg/SVGPathSegListBuilder.cpp
index deb8f3a..1d162c9 100644
--- a/Source/WebCore/svg/SVGPathSegListBuilder.cpp
+++ b/Source/WebCore/svg/SVGPathSegListBuilder.cpp
@@ -27,6 +27,7 @@
#include "SVGPathSegImpl.h"
#include "SVGPathSegList.h"
+#include <wtf/text/StringConcatenateNumbers.h>
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGPathSegListSource.cpp b/Source/WebCore/svg/SVGPathSegListSource.cpp
index d6df55f..b58854f 100644
--- a/Source/WebCore/svg/SVGPathSegListSource.cpp
+++ b/Source/WebCore/svg/SVGPathSegListSource.cpp
@@ -24,6 +24,7 @@
#include "SVGPathSeg.h"
#include "SVGPathSegList.h"
#include "SVGPathSegValue.h"
+#include <wtf/text/StringConcatenateNumbers.h>
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGPreserveAspectRatioValue.cpp b/Source/WebCore/svg/SVGPreserveAspectRatioValue.cpp
index d0bc716..8b2e475 100644
--- a/Source/WebCore/svg/SVGPreserveAspectRatioValue.cpp
+++ b/Source/WebCore/svg/SVGPreserveAspectRatioValue.cpp
@@ -25,6 +25,7 @@
#include "AffineTransform.h"
#include "FloatRect.h"
#include "SVGParserUtilities.h"
+#include <wtf/text/StringConcatenateNumbers.h>
#include <wtf/text/StringView.h>
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGZoomAndPan.cpp b/Source/WebCore/svg/SVGZoomAndPan.cpp
index 75a831c..1537130 100644
--- a/Source/WebCore/svg/SVGZoomAndPan.cpp
+++ b/Source/WebCore/svg/SVGZoomAndPan.cpp
@@ -22,6 +22,8 @@
#include "config.h"
#include "SVGZoomAndPan.h"
+#include <wtf/text/StringConcatenateNumbers.h>
+
namespace WebCore {
bool SVGZoomAndPan::parseZoomAndPan(const UChar*& start, const UChar* end)
diff --git a/Source/WebCore/svg/SVGZoomEvent.cpp b/Source/WebCore/svg/SVGZoomEvent.cpp
index 696fcf1..4db8e66 100644
--- a/Source/WebCore/svg/SVGZoomEvent.cpp
+++ b/Source/WebCore/svg/SVGZoomEvent.cpp
@@ -25,6 +25,7 @@
#include "SVGPoint.h"
#include "SVGRect.h"
#include <wtf/IsoMallocInlines.h>
+#include <wtf/text/StringConcatenateNumbers.h>
namespace WebCore {
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 4c17253..e2f415d 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2020-01-16 Don Olmstead <don.olmstead@sony.com>
+
+ Non-unified build fixes mid January 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=206363
+
+ Unreviewed build fix.
+
+ * NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
+ * NetworkProcess/curl/NetworkDataTaskCurl.cpp:
+ * PlatformFTW.cmake:
+ * PlatformWin.cmake:
+ * UIProcess/API/APIContentWorld.cpp:
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ * WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp:
+ * WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp: Removed.
+
2020-01-16 Brady Eidson <beidson@apple.com>
REGRESSION: (r254668) [Mac Debug wk2] 21 http/tests/navigation/* tests are crashing with ASSERTION FAILED: world.first != 1.
diff --git a/Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp b/Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp
index 5e7e6b7..10418df 100644
--- a/Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp
+++ b/Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp
@@ -35,6 +35,7 @@
#if !OS(WINDOWS)
#include <sys/stat.h>
+#include <unistd.h>
#endif
namespace WebKit {
diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
index 24eb8f7..86dbfb1 100644
--- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
+++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
@@ -37,6 +37,7 @@
#include <WebCore/NotImplemented.h>
#include <WebCore/ResourceError.h>
#include <WebCore/SameSiteInfo.h>
+#include <WebCore/SynchronousLoaderClient.h>
namespace WebKit {
diff --git a/Source/WebKit/PlatformFTW.cmake b/Source/WebKit/PlatformFTW.cmake
index fc910eb..767d6c9 100644
--- a/Source/WebKit/PlatformFTW.cmake
+++ b/Source/WebKit/PlatformFTW.cmake
@@ -70,7 +70,6 @@
WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp
- WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp
WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
WebProcess/WebPage/AcceleratedSurface.cpp
diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
index f311dde..0b37f47 100644
--- a/Source/WebKit/PlatformWin.cmake
+++ b/Source/WebKit/PlatformWin.cmake
@@ -69,7 +69,6 @@
WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp
- WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp
WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
WebProcess/WebPage/AcceleratedSurface.cpp
diff --git a/Source/WebKit/UIProcess/API/APIContentWorld.cpp b/Source/WebKit/UIProcess/API/APIContentWorld.cpp
index eeb7d8e..188aa18 100644
--- a/Source/WebKit/UIProcess/API/APIContentWorld.cpp
+++ b/Source/WebKit/UIProcess/API/APIContentWorld.cpp
@@ -28,6 +28,8 @@
#include "APIUserContentWorld.h"
#include "ContentWorldShared.h"
+#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace API {
diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
index c7dafc6..c12448e 100644
--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
@@ -46,6 +46,7 @@
#include <JavaScriptCore/InspectorFrontendRouter.h>
#include <WebCore/MIMETypeRegistry.h>
#include <algorithm>
+#include <wtf/FileSystem.h>
#include <wtf/HashMap.h>
#include <wtf/Optional.h>
#include <wtf/URL.h>
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp
index 84230fc..42967a9 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp
@@ -32,6 +32,7 @@
#include "NetworkConnectionToWebProcessMessages.h"
#include "NetworkProcessConnection.h"
#include "WebCoreArgumentCoders.h"
+#include "WebPage.h"
#include "WebProcess.h"
#include <WebCore/DeprecatedGlobalSettings.h>
#include <WebCore/Frame.h>
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp b/Source/WebKit/WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp
deleted file mode 100644
index 2c7eaac..0000000
--- a/Source/WebKit/WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebContextMenuClient.h"
-
-#if ENABLE(CONTEXT_MENUS)
-
-#include <WebCore/NotImplemented.h>
-
-namespace WebKit {
-using namespace WebCore;
-
-void WebContextMenuClient::lookUpInDictionary(Frame*)
-{
- notImplemented();
-}
-
-bool WebContextMenuClient::isSpeaking()
-{
- notImplemented();
- return false;
-}
-
-void WebContextMenuClient::speak(const String&)
-{
- notImplemented();
-}
-
-void WebContextMenuClient::stopSpeaking()
-{
- notImplemented();
-}
-
-} // namespace WebKit
-#endif // ENABLE(CONTEXT_MENUS)
