Attachment 357592 Details for Bug 192819 – Patch

[patch] Patch

bug-192819.diff (text/plain), 3.89 KB, created by Don Olmstead on 2018-12-18 11:46:05 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2018-12-18 11:46:05 PST

Size: 3.89 KB

patch

obsolete

>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index df7da0f8454..847039c09a0 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -50,6 +50,8 @@ set(WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/Modules/streams"
>     "${WEBCORE_DIR}/Modules/webaudio"
>     "${WEBCORE_DIR}/Modules/webauthn"
>+    "${WEBCORE_DIR}/Modules/webauthn/cbor"
>+    "${WEBCORE_DIR}/Modules/webauthn/fido"
>     "${WEBCORE_DIR}/Modules/webdatabase"
>     "${WEBCORE_DIR}/Modules/webdriver"
>     "${WEBCORE_DIR}/Modules/webgpu"
>@@ -72,7 +74,6 @@ set(WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/css/typedom"
>     "${WEBCORE_DIR}/cssjit"
>     "${WEBCORE_DIR}/dom"
>-    "${WEBCORE_DIR}/dom/default"
>     "${WEBCORE_DIR}/dom/messageports"
>     "${WEBCORE_DIR}/domjit"
>     "${WEBCORE_DIR}/editing"
>@@ -88,6 +89,13 @@ set(WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/inspector/agents"
>     "${WEBCORE_DIR}/inspector/agents/page"
>     "${WEBCORE_DIR}/inspector/agents/worker"
>+    "${WEBCORE_DIR}/layout"
>+    "${WEBCORE_DIR}/layout/blockformatting"
>+    "${WEBCORE_DIR}/layout/displaytree"
>+    "${WEBCORE_DIR}/layout/floats"
>+    "${WEBCORE_DIR}/layout/inlineformatting"
>+    "${WEBCORE_DIR}/layout/inlineformatting/text"
>+    "${WEBCORE_DIR}/layout/layouttree"
>     "${WEBCORE_DIR}/loader"
>     "${WEBCORE_DIR}/loader/appcache"
>     "${WEBCORE_DIR}/loader/archive"
>@@ -102,7 +110,6 @@ set(WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform"
>     "${WEBCORE_DIR}/platform/animation"
>     "${WEBCORE_DIR}/platform/audio"
>-    "${WEBCORE_DIR}/platform/crypto"
>     "${WEBCORE_DIR}/platform/encryptedmedia"
>     "${WEBCORE_DIR}/platform/gamepad"
>     "${WEBCORE_DIR}/platform/graphics"
>@@ -110,12 +117,12 @@ set(WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/graphics/cpu/arm/filters"
>     "${WEBCORE_DIR}/platform/graphics/displaylists"
>     "${WEBCORE_DIR}/platform/graphics/filters"
>-    "${WEBCORE_DIR}/platform/graphics/harfbuzz"
>-    "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
>     "${WEBCORE_DIR}/platform/graphics/iso"
>     "${WEBCORE_DIR}/platform/graphics/opentype"
>     "${WEBCORE_DIR}/platform/graphics/transforms"
>+    "${WEBCORE_DIR}/platform/mediacapabilities"
>     "${WEBCORE_DIR}/platform/mediarecorder"
>+    "${WEBCORE_DIR}/platform/mediasession"
>     "${WEBCORE_DIR}/platform/mediastream"
>     "${WEBCORE_DIR}/platform/mediastream/libwebrtc"
>     "${WEBCORE_DIR}/platform/mock"
>@@ -123,7 +130,6 @@ set(WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/network"
>     "${WEBCORE_DIR}/platform/sql"
>     "${WEBCORE_DIR}/platform/text"
>-    "${WEBCORE_DIR}/platform/text/icu"
>     "${WEBCORE_DIR}/platform/vr"
>     "${WEBCORE_DIR}/plugins"
>     "${WEBCORE_DIR}/rendering"
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8c68b600bc7..3c430a5234c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-12-18  Don Olmstead  <don.olmstead@sony.com>
>+
>+        Sync some include directories in WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=192819
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added missing include directories around features that have only been enabled on
>+        Apple ports. Removes obsolete directories from list and moves harfbuzz directories
>+        into the freetype cmake file.
>+
>+        * CMakeLists.txt:
>+        * platform/FreeType.cmake:
>+
> 2018-12-17  Daniel Bates  <dabates@apple.com>
> 
>         Make DocumentMarker::allMarkers() constexpr
>diff --git a/Source/WebCore/platform/FreeType.cmake b/Source/WebCore/platform/FreeType.cmake
>index c16977f497c..1be43cc8a76 100644
>--- a/Source/WebCore/platform/FreeType.cmake
>+++ b/Source/WebCore/platform/FreeType.cmake
>@@ -1,6 +1,7 @@
> list(APPEND WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/graphics/freetype"
>     "${WEBCORE_DIR}/platform/graphics/harfbuzz"
>+    "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
> )
> 
> list(APPEND WebCore_SOURCES

Actions: View | Formatted Diff | Diff

Attachments on bug 192819: 357591 | 357592