Sync some include directories in WebCore
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Dec 2018 18:23:36 +0000 (18:23 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Dec 2018 18:23:36 +0000 (18:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=192819

Reviewed by Michael Catanzaro.

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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239379 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/platform/FreeType.cmake

index 07cde23..5d9c4d9 100644 (file)
@@ -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"
index e6746dd..c7187ed 100644 (file)
@@ -1,3 +1,17 @@
+2018-12-19  Don Olmstead  <don.olmstead@sony.com>
+
+        Sync some include directories in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=192819
+
+        Reviewed by Michael Catanzaro.
+
+        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-19  Alicia Boya GarcĂ­a  <aboya@igalia.com>
 
         [MSE] Remove unused method: stopAskingForMoreSamples()
index c16977f..1be43cc 100644 (file)
@@ -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