[Win] WebCore failed to build, InbandTextTrackPrivateAVF: base class undefined.
authorpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Sep 2017 20:09:28 +0000 (20:09 +0000)
committerpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Sep 2017 20:09:28 +0000 (20:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=176431

Reviewed by Alex Christensen.

Source/WebCore:

AVFoundation header detection should be done in WebCore because of build dependencies.

No new tests, covered by existing tests.

* AVFoundationSupport.py: Copied from Source/WTF/AVFoundationSupport.py.
* PlatformWin.cmake:
* config.h:
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
* platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:

Source/WTF:

AVFoundation header detection should be done in WebCore because of build dependencies.

* AVFoundationSupport.py: Removed.
* wtf/Platform.h:
* wtf/PlatformWin.cmake:

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

Source/WTF/ChangeLog
Source/WTF/wtf/Platform.h
Source/WTF/wtf/PlatformWin.cmake
Source/WebCore/AVFoundationSupport.py [moved from Source/WTF/AVFoundationSupport.py with 100% similarity]
Source/WebCore/ChangeLog
Source/WebCore/PlatformWin.cmake
Source/WebCore/config.h
Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp

index af278ee..a53c42b 100644 (file)
@@ -1,3 +1,16 @@
+2017-09-06  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] WebCore failed to build, InbandTextTrackPrivateAVF: base class undefined.
+        https://bugs.webkit.org/show_bug.cgi?id=176431
+
+        Reviewed by Alex Christensen.
+
+        AVFoundation header detection should be done in WebCore because of build dependencies. 
+
+        * AVFoundationSupport.py: Removed.
+        * wtf/Platform.h:
+        * wtf/PlatformWin.cmake:
+
 2017-09-05  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
 
         [Win] Fix the wincairo build after r221558 and r221583
index b06deb3..3562342 100644 (file)
 #define USE_AVFOUNDATION 1
 #endif
 
-#if PLATFORM(WIN) && !USE(WINGDI)
-#include <wtf/AVFoundationHeaderDetection.h>
-#endif
-
-#if PLATFORM(WIN) && USE(CG) && HAVE(AVCF)
-#define USE_AVFOUNDATION 1
-
-#if HAVE(AVCF_LEGIBLE_OUTPUT)
-#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
-#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
-#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
-#endif
-
-#endif
-
 #if !defined(ENABLE_TREE_DEBUGGING)
 #if !defined(NDEBUG)
 #define ENABLE_TREE_DEBUGGING 1
index 780ef82..36bcec4 100644 (file)
@@ -15,10 +15,6 @@ list(APPEND WTF_SOURCES
     win/WorkQueueWin.cpp
 )
 
-list(APPEND WTF_HEADERS
-    "${DERIVED_SOURCES_WTF_DIR}/AVFoundationHeaderDetection.h"
-)
-
 if (USE_CF)
     list(APPEND WTF_SOURCES
         text/cf/AtomicStringImplCF.cpp
@@ -30,12 +26,6 @@ if (USE_CF)
     list(APPEND WTF_LIBRARIES ${COREFOUNDATION_LIBRARY})
 endif ()
 
-add_custom_command(
-    OUTPUT "${DERIVED_SOURCES_WTF_DIR}/AVFoundationHeaderDetection.h"
-    WORKING_DIRECTORY "${DERIVED_SOURCES_WTF_DIR}"
-    COMMAND ${PYTHON_EXECUTABLE} ${WTF_DIR}/AVFoundationSupport.py ${WEBKIT_LIBRARIES_DIR} > AVFoundationHeaderDetection.h
-    VERBATIM)
-
 set(WTF_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WTF/preBuild.cmd")
 file(WRITE "${WTF_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WTF_DIR}/wtf/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_DIR}/WTF/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n")
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF)
index d692691..5da5699 100644 (file)
@@ -1,3 +1,20 @@
+2017-09-06  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] WebCore failed to build, InbandTextTrackPrivateAVF: base class undefined.
+        https://bugs.webkit.org/show_bug.cgi?id=176431
+
+        Reviewed by Alex Christensen.
+
+        AVFoundation header detection should be done in WebCore because of build dependencies.
+
+        No new tests, covered by existing tests.
+
+        * AVFoundationSupport.py: Copied from Source/WTF/AVFoundationSupport.py.
+        * PlatformWin.cmake:
+        * config.h:
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+        * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
+
 2017-09-06  Sam Weinig  <sam@webkit.org>
 
         REGRESSION (r221598): Legacy "round" and "bevel" options can no longer be used with the legacy CanvasRenderingContext2D setLineJoin operation
index 9a4b4da..f5beb73 100644 (file)
@@ -140,6 +140,10 @@ list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
     ${WEBCORE_DIR}/css/themeWinQuirks.css
 )
 
+list(APPEND WebCore_DERIVED_SOURCES
+    "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
+)
+
 set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     .
     accessibility
@@ -281,6 +285,12 @@ else ()
     include(PlatformAppleWin.cmake)
 endif ()
 
+add_custom_command(
+    OUTPUT "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
+    WORKING_DIRECTORY "${DERIVED_SOURCES_WEBCORE_DIR}"
+    COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/AVFoundationSupport.py ${WEBKIT_LIBRARIES_DIR} > WebCoreHeaderDetection.h
+    VERBATIM)
+
 make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj)
 file(COPY
     "${WEBCORE_DIR}/English.lproj/Localizable.strings"
index 403c9f7..e0b51d4 100644 (file)
 #define USE_FILE_LOCK 1
 #endif
 
+#if PLATFORM(WIN)
+#include "WebCoreHeaderDetection.h"
+#endif
+
 #include "PlatformExportMacros.h"
 #include <pal/ExportMacros.h>
 #include <runtime/JSExportMacros.h>
@@ -104,3 +108,15 @@ typedef float CGFloat;
 #define CGFLOAT_DEFINED 1
 #endif
 #endif /* USE(CG) */
+
+#if PLATFORM(WIN) && USE(CG) && HAVE(AVCF)
+#define USE_AVFOUNDATION 1
+
+#if HAVE(AVCF_LEGIBLE_OUTPUT)
+#define USE_AVFOUNDATION 1
+#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
+#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
+#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
+#endif
+
+#endif
index d107b14..f0f9623 100644 (file)
 #include "PlatformCALayerWinInternal.h"
 #include "TextRun.h"
 #include "TileController.h"
+#include "WebCoreHeaderDetection.h"
 #include "WebTiledBackingLayerWin.h"
 #include <QuartzCore/CoreAnimationCF.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
-#include <wtf/AVFoundationHeaderDetection.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
index 36795c1..584ff91 100644 (file)
@@ -34,8 +34,8 @@
 #include "PlatformCALayer.h"
 #include "TileController.h"
 #include "TiledBacking.h"
+#include "WebCoreHeaderDetection.h"
 #include <QuartzCore/CACFLayer.h>
-#include <wtf/AVFoundationHeaderDetection.h>
 #include <wtf/MainThread.h>
 
 using namespace std;