Skip to content
Permalink
Browse files
WebKit should build successfully even with -DENABLE_UNIFIED_BUILDS=OFF
https://bugs.webkit.org/show_bug.cgi?id=196845

Reviewed by Ryosuke Niwa.

Source/WebCore:

* 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):
Remove inline specifier to address linking errors (regardless of CMake platform).
Doing this in a .cpp file interferes with symbol creation.

* 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:
* platform/ColorData.gperf:
* platform/mediastream/RealtimeMediaSourceSettings.cpp:
* platform/network/DNSResolveQueue.cpp:
* workers/service/ServiceWorkerClientQueryOptions.h:
* workers/service/ServiceWorkerContainer.cpp:
Add missing includes to address compiler errors on GTK.

Source/WebKit:

* NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:
* NetworkProcess/NetworkCORSPreflightChecker.cpp:
* NetworkProcess/NetworkDataTask.cpp:
* NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
* NetworkProcess/NetworkHTTPSUpgradeChecker.h: Include wtf/Forward.h for String and CompletionHandler fwd decls.
* 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:
Add missing includes / forward declarations to address compiler errors on GTK / WinCairo.


Canonical link: https://commits.webkit.org/211134@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244225 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
rkirsling committed Apr 12, 2019
1 parent 7ca1bc1 commit 73dd20e62c44adbf2e50d2b24397cac86922da18
Showing 43 changed files with 145 additions and 31 deletions.
@@ -1,3 +1,40 @@
2019-04-12 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 Ryosuke Niwa.

* 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):
Remove inline specifier to address linking errors (regardless of CMake platform).
Doing this in a .cpp file interferes with symbol creation.

* 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:
* platform/ColorData.gperf:
* platform/mediastream/RealtimeMediaSourceSettings.cpp:
* platform/network/DNSResolveQueue.cpp:
* workers/service/ServiceWorkerClientQueryOptions.h:
* workers/service/ServiceWorkerContainer.cpp:
Add missing includes to address compiler errors on GTK.

2019-04-12 Zalan Bujtas <zalan@apple.com>

REGRESSION (r244098): [ Mac WK1 ] Layout Test fast/dynamic/paused-event-dispatch.html is Timing out
@@ -42,6 +42,7 @@
#include "Page.h"
#include "RealtimeMediaSourceCenter.h"
#include "ScriptExecutionContext.h"
#include <wtf/CompletionHandler.h>
#include <wtf/IsoMallocInlines.h>
#include <wtf/NeverDestroyed.h>

@@ -26,6 +26,7 @@
#include "VREyeParameters.h"

#include "VRFieldOfView.h"
#include <JavaScriptCore/TypedArrayInlines.h>

namespace WebCore {

@@ -28,6 +28,7 @@
#include "VREyeParameters.h"
#include "VRPlatformDisplay.h"
#include "VRPose.h"
#include <JavaScriptCore/TypedArrayInlines.h>

namespace WebCore {

@@ -25,6 +25,8 @@
#include "config.h"
#include "VRPose.h"

#include <JavaScriptCore/TypedArrayInlines.h>

namespace WebCore {

static RefPtr<Float32Array> optionalFloat3ToJSCArray(const Optional<VRPlatformTrackingInfo::Float3>& data)
@@ -32,6 +32,7 @@
#include "AXObjectCache.h"
#include "HTMLElement.h"
#include "HTMLNames.h"
#include "HTMLParserIdioms.h"
#include "PseudoElement.h"
#include "RenderListItem.h"
#include "RenderObject.h"
@@ -23,9 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/

#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)

#include "config.h"

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

#include "AXIsolatedTreeNode.h"
@@ -23,9 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/

#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)

#include "config.h"

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

#include "AccessibilityObject.h"
@@ -58,7 +58,7 @@
#include "JSWebGLTexture.h"
#include "JSWebGLVertexArrayObject.h"
#include "JSWebGLVertexArrayObjectOES.h"

#include <JavaScriptCore/JSCInlines.h>

namespace WebCore {
using namespace JSC;
@@ -30,6 +30,7 @@
#include "JSHistory.h"

#include "SerializedScriptValue.h"
#include <JavaScriptCore/JSCInlines.h>

namespace WebCore {

@@ -30,7 +30,7 @@

#include "IDBBindingUtilities.h"
#include "IDBCursorWithValue.h"
#include <JavaScriptCore/HeapInlines.h>
#include <JavaScriptCore/JSCInlines.h>

namespace WebCore {
using namespace JSC;
@@ -27,6 +27,7 @@
#include "JSPerformanceObserver.h"

#include "PerformanceObserverCallback.h"
#include <JavaScriptCore/JSCInlines.h>

namespace WebCore {

@@ -32,6 +32,7 @@
#include "ScriptController.h"
#include "runtime_root.h"
#include <JavaScriptCore/JSLock.h>
#include <JavaScriptCore/WeakGCMapInlines.h>
#include <wtf/MemoryPressureHandler.h>

namespace WebCore {
@@ -322,7 +322,7 @@ void CanvasRenderingContext2DBase::FontProxy::fontsNeedUpdate(FontSelector& sele
update(selector);
}

inline void CanvasRenderingContext2DBase::FontProxy::initialize(FontSelector& fontSelector, const RenderStyle& newStyle)
void CanvasRenderingContext2DBase::FontProxy::initialize(FontSelector& fontSelector, const RenderStyle& newStyle)
{
// Beware! m_font.fontSelector() might not point to document.fontSelector()!
ASSERT(newStyle.fontCascade().fontSelector() == &fontSelector);
@@ -334,22 +334,22 @@ inline void CanvasRenderingContext2DBase::FontProxy::initialize(FontSelector& fo
m_font.fontSelector()->registerForInvalidationCallbacks(*this);
}

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

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

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

inline void CanvasRenderingContext2DBase::FontProxy::drawBidiText(GraphicsContext& context, const TextRun& run, const FloatPoint& point, FontCascade::CustomFontNotReadyAction action) const
void CanvasRenderingContext2DBase::FontProxy::drawBidiText(GraphicsContext& context, const TextRun& run, const FloatPoint& point, FontCascade::CustomFontNotReadyAction action) const
{
context.drawBidiText(m_font, run, point, action);
}
@@ -1166,14 +1166,14 @@ void CanvasRenderingContext2DBase::clipInternal(const Path& path, CanvasFillRule
c->canvasClip(path, toWindRule(windingRule));
}

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

inline void CanvasRenderingContext2DBase::endCompositeLayer()
void CanvasRenderingContext2DBase::endCompositeLayer()
{
#if !USE(CAIRO)
drawingContext()->endTransparencyLayer();
@@ -1,6 +1,7 @@
%{
#include "HashTools.h"
#include <string.h>
#include <wtf/Compiler.h>

IGNORE_WARNINGS_BEGIN("implicit-fallthrough")

@@ -34,6 +34,7 @@
#include "RealtimeMediaSourceSettings.h"

#include <wtf/NeverDestroyed.h>
#include <wtf/text/StringBuilder.h>

namespace WebCore {

@@ -35,6 +35,7 @@
#include "DNSResolveQueueCFNet.h"
#endif

#include <wtf/CompletionHandler.h>
#include <wtf/NeverDestroyed.h>

namespace WebCore {
@@ -28,6 +28,7 @@
#if ENABLE(SERVICE_WORKER)

#include "ServiceWorkerClientType.h"
#include <wtf/Optional.h>

namespace WebCore {

@@ -36,6 +36,7 @@
#include "JSDOMPromiseDeferred.h"
#include "JSServiceWorkerRegistration.h"
#include "Logging.h"
#include "MessageEvent.h"
#include "NavigatorBase.h"
#include "ResourceError.h"
#include "SchemeRegistry.h"
@@ -1,3 +1,40 @@
2019-04-12 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 Ryosuke Niwa.

* NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:
* NetworkProcess/NetworkCORSPreflightChecker.cpp:
* NetworkProcess/NetworkDataTask.cpp:
* NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
* NetworkProcess/NetworkHTTPSUpgradeChecker.h: Include wtf/Forward.h for String and CompletionHandler fwd decls.
* 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:
Add missing includes / forward declarations to address compiler errors on GTK / WinCairo.

2019-04-12 Eric Carlson <eric.carlson@apple.com>

Update AudioSession route sharing policy
@@ -32,9 +32,8 @@
#include <WebCore/SQLiteDatabase.h>
#include <WebCore/SQLiteStatement.h>
#include <wtf/CompletionHandler.h>
#include <wtf/UniqueRef.h>
#include <wtf/StdSet.h>
#include <wtf/Vector.h>
#include <wtf/WeakPtr.h>
#include <wtf/WorkQueue.h>

namespace WebCore {
@@ -32,6 +32,7 @@
#include "NetworkLoadParameters.h"
#include "NetworkProcess.h"
#include <WebCore/CrossOriginAccessControl.h>
#include <WebCore/SecurityOrigin.h>

#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(m_parameters.sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkCORSPreflightChecker::" fmt, this, ##__VA_ARGS__)

@@ -29,6 +29,7 @@
#include "NetworkDataTaskBlob.h"
#include "NetworkLoadParameters.h"
#include "NetworkSession.h"
#include <WebCore/ResourceError.h>
#include <WebCore/ResourceResponse.h>
#include <wtf/RunLoop.h>

@@ -33,7 +33,6 @@
#include <wtf/CompletionHandler.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/RunLoop.h>
#include <wtf/WorkQueue.h>

#define RELEASE_LOG_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__)
#define RELEASE_LOG_ERROR_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_ERROR_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__)
@@ -25,11 +25,10 @@

#pragma once

#include <atomic>
#include <wtf/Forward.h>
#include <wtf/UniqueRef.h>

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

namespace WebCore {
class SQLiteDatabase;
@@ -54,9 +53,9 @@ class NetworkHTTPSUpgradeChecker {
void query(String&&, PAL::SessionID, CompletionHandler<void(bool)>&&);

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

@@ -32,16 +32,19 @@
#include "AuthenticationManager.h"
#include "AuxiliaryProcessMessages.h"
#include "DataReference.h"
#include "Download.h"
#include "DownloadProxyMessages.h"
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
#include "LegacyCustomProtocolManager.h"
#endif
#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"
@@ -26,6 +26,8 @@
#include "config.h"
#include "NetworkResourceLoadMap.h"

#include "NetworkConnectionToWebProcess.h"

namespace WebKit {

NetworkResourceLoadMap::MapType::AddResult NetworkResourceLoadMap::add(ResourceLoadIdentifier identifier, Ref<NetworkResourceLoader>&& loader)
@@ -25,7 +25,6 @@

#pragma once

#include "NetworkConnectionToWebProcess.h"
#include "NetworkResourceLoader.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
@@ -36,6 +35,8 @@

namespace WebKit {

class NetworkConnectionToWebProcess;

typedef uint64_t ResourceLoadIdentifier;

class NetworkResourceLoadMap {
@@ -35,6 +35,7 @@
#include "NetworkLoadChecker.h"
#include "NetworkProcess.h"
#include "NetworkProcessConnectionMessages.h"
#include "NetworkSession.h"
#include "SharedBufferDataReference.h"
#include "WebCoreArgumentCoders.h"
#include "WebErrors.h"

0 comments on commit 73dd20e

Please sign in to comment.