Diff
Modified: trunk/ChangeLog (222147 => 222148)
--- trunk/ChangeLog 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/ChangeLog 2017-09-18 15:44:12 UTC (rev 222148)
@@ -1,3 +1,15 @@
+2017-09-18 Yoshiaki Jitsukawa <[email protected]>
+
+ [Win][PAL] Move WebCoreHeaderDetection.h to PAL
+ https://bugs.webkit.org/show_bug.cgi?id=176990
+
+ Reviewed by Alex Christensen.
+
+ Create DerivedSources directory for PAL if WebCore build is enabled.
+
+ * Source/cmake/WebKitCommon.cmake:
+ * Source/cmake/WebKitFS.cmake:
+
2017-09-15 Konstantin Tokarev <[email protected]>
Consider enabling -Wno-expansion-to-defined for gcc 7
Deleted: trunk/Source/WebCore/AVFoundationSupport.py (222147 => 222148)
--- trunk/Source/WebCore/AVFoundationSupport.py 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/Source/WebCore/AVFoundationSupport.py 2017-09-18 15:44:12 UTC (rev 222148)
@@ -1,64 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (C) 2015 Apple Inc. All rights reserved.
-#
-# 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.
-# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
-
-import re
-import sys
-import os
-
-
-def lookFor(relativePath):
- return os.path.isfile(sys.argv[1] + relativePath)
-
-
-def fileContains(relativePath, regexp):
- with open(sys.argv[1] + relativePath) as file:
- for line in file:
- if regexp.search(line):
- return True
- return False
-
-
-print "/* Identifying AVFoundation Support */"
-if lookFor("/include/AVFoundationCF/AVCFBase.h"):
- print "#define HAVE_AVCF 1"
-if lookFor("/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h"):
- print "#define HAVE_AVCF_LEGIBLE_OUTPUT 1"
-if lookFor("/include/AVFoundationCF/AVCFAssetResourceLoader.h"):
- print "#define HAVE_AVFOUNDATION_LOADER_DELEGATE 1"
-if lookFor("/include/AVFoundationCF/AVCFAsset.h"):
- regexp = re.compile("AVCFURLAssetIsPlayableExtendedMIMEType")
- if fileContains("/include/AVFoundationCF/AVCFAsset.h", regexp):
- print "#define HAVE_AVCFURL_PLAYABLE_MIMETYPE 1"
-if lookFor("/include/QuartzCore/CACFLayer.h"):
- regexp = re.compile("CACFLayerSetContentsScale")
- if fileContains("/include/QuartzCore/CACFLayer.h", regexp):
- print "#define HAVE_CACFLAYER_SETCONTENTSSCALE 1"
-if lookFor("/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h"):
- regexp = re.compile("kAVCFPlayerItemLegibleOutput_CallbacksVersion_2")
- if fileContains("/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h", regexp):
- print "#define HAVE_AVCFPLAYERITEM_CALLBACK_VERSION_2 1"
Modified: trunk/Source/WebCore/ChangeLog (222147 => 222148)
--- trunk/Source/WebCore/ChangeLog 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/Source/WebCore/ChangeLog 2017-09-18 15:44:12 UTC (rev 222148)
@@ -1,3 +1,18 @@
+2017-09-18 Yoshiaki Jitsukawa <[email protected]>
+
+ [Win][PAL] Move WebCoreHeaderDetection.h to PAL
+ https://bugs.webkit.org/show_bug.cgi?id=176990
+
+ Reviewed by Alex Christensen.
+
+ * PlatformWin.cmake:
+ Stop generating WebCoreHeaderDetection.h in WebCore.
+
+ * config.h:
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
+ Include PALHeaderDetection.h instead of WebCoreHeaderDetection.h
+
2017-09-18 Basuke Suzuki <[email protected]>
[Curl] Create classes dedicated to handle SSL related tasks
Copied: trunk/Source/WebCore/PAL/AVFoundationSupport.py (from rev 222147, trunk/Source/WebCore/AVFoundationSupport.py) (0 => 222148)
--- trunk/Source/WebCore/PAL/AVFoundationSupport.py (rev 0)
+++ trunk/Source/WebCore/PAL/AVFoundationSupport.py 2017-09-18 15:44:12 UTC (rev 222148)
@@ -0,0 +1,64 @@
+#!/usr/bin/python
+
+# Copyright (C) 2015 Apple Inc. All rights reserved.
+#
+# 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.
+# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
+
+import re
+import sys
+import os
+
+
+def lookFor(relativePath):
+ return os.path.isfile(sys.argv[1] + relativePath)
+
+
+def fileContains(relativePath, regexp):
+ with open(sys.argv[1] + relativePath) as file:
+ for line in file:
+ if regexp.search(line):
+ return True
+ return False
+
+
+print "/* Identifying AVFoundation Support */"
+if lookFor("/include/AVFoundationCF/AVCFBase.h"):
+ print "#define HAVE_AVCF 1"
+if lookFor("/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h"):
+ print "#define HAVE_AVCF_LEGIBLE_OUTPUT 1"
+if lookFor("/include/AVFoundationCF/AVCFAssetResourceLoader.h"):
+ print "#define HAVE_AVFOUNDATION_LOADER_DELEGATE 1"
+if lookFor("/include/AVFoundationCF/AVCFAsset.h"):
+ regexp = re.compile("AVCFURLAssetIsPlayableExtendedMIMEType")
+ if fileContains("/include/AVFoundationCF/AVCFAsset.h", regexp):
+ print "#define HAVE_AVCFURL_PLAYABLE_MIMETYPE 1"
+if lookFor("/include/QuartzCore/CACFLayer.h"):
+ regexp = re.compile("CACFLayerSetContentsScale")
+ if fileContains("/include/QuartzCore/CACFLayer.h", regexp):
+ print "#define HAVE_CACFLAYER_SETCONTENTSSCALE 1"
+if lookFor("/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h"):
+ regexp = re.compile("kAVCFPlayerItemLegibleOutput_CallbacksVersion_2")
+ if fileContains("/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h", regexp):
+ print "#define HAVE_AVCFPLAYERITEM_CALLBACK_VERSION_2 1"
Modified: trunk/Source/WebCore/PAL/ChangeLog (222147 => 222148)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-09-18 15:44:12 UTC (rev 222148)
@@ -1,3 +1,17 @@
+2017-09-18 Yoshiaki Jitsukawa <[email protected]>
+
+ [Win][PAL] Move WebCoreHeaderDetection.h to PAL
+ https://bugs.webkit.org/show_bug.cgi?id=176990
+
+ Reviewed by Alex Christensen.
+
+ * AVFoundationSupport.py: Renamed from Source/WebCore/AVFoundationSupport.py.
+ (lookFor):
+ (fileContains):
+
+ * pal/PlatformWin.cmake:
+ Add a custom target PAL_PreBuild to generate PALHeaderDetection.h
+
2017-09-15 Tim Horton <[email protected]>
Fix the macOS CMake build
Modified: trunk/Source/WebCore/PAL/pal/PlatformWin.cmake (222147 => 222148)
--- trunk/Source/WebCore/PAL/pal/PlatformWin.cmake 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/Source/WebCore/PAL/pal/PlatformWin.cmake 2017-09-18 15:44:12 UTC (rev 222148)
@@ -29,3 +29,12 @@
file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/WebCore/pal/${_directory})
endforeach ()
endforeach ()
+
+# Generate PALHeaderDetection.h by PAL_PreBuild
+add_custom_target(PAL_PreBuild SOURCES "${DERIVED_SOURCES_PAL_DIR}/PALHeaderDetection.h")
+add_custom_command(
+ OUTPUT "${DERIVED_SOURCES_PAL_DIR}/PALHeaderDetection.h"
+ WORKING_DIRECTORY "${DERIVED_SOURCES_PAL_DIR}"
+ COMMAND ${PYTHON_EXECUTABLE} ${PAL_DIR}/AVFoundationSupport.py ${WEBKIT_LIBRARIES_DIR} > PALHeaderDetection.h
+ VERBATIM)
+add_dependencies(PAL PAL_PreBuild)
Modified: trunk/Source/WebCore/PlatformWin.cmake (222147 => 222148)
--- trunk/Source/WebCore/PlatformWin.cmake 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/Source/WebCore/PlatformWin.cmake 2017-09-18 15:44:12 UTC (rev 222148)
@@ -36,6 +36,7 @@
"${WEBCORE_DIR}/platform/win"
"${THIRDPARTY_DIR}/ANGLE/include"
"${THIRDPARTY_DIR}/ANGLE/include/egl"
+ "${DERIVED_SOURCES_PAL_DIR}"
)
list(APPEND WebCore_SOURCES
@@ -140,10 +141,6 @@
${WEBCORE_DIR}/css/themeWinQuirks.css
)
-list(APPEND WebCore_DERIVED_SOURCES
- "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
-)
-
set(WebCore_FORWARDING_HEADERS_DIRECTORIES
.
accessibility
@@ -287,12 +284,6 @@
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"
Modified: trunk/Source/WebCore/config.h (222147 => 222148)
--- trunk/Source/WebCore/config.h 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/Source/WebCore/config.h 2017-09-18 15:44:12 UTC (rev 222148)
@@ -30,7 +30,7 @@
#endif
#if PLATFORM(WIN)
-#include "WebCoreHeaderDetection.h"
+#include <PALHeaderDetection.h>
#endif
#include "PlatformExportMacros.h"
Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (222147 => 222148)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2017-09-18 15:44:12 UTC (rev 222148)
@@ -37,7 +37,6 @@
#include "PlatformCALayerWinInternal.h"
#include "TextRun.h"
#include "TileController.h"
-#include "WebCoreHeaderDetection.h"
#include "WebTiledBackingLayerWin.h"
#include <QuartzCore/CoreAnimationCF.h>
#include <WebKitSystemInterface/WebKitSystemInterface.h>
Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp (222147 => 222148)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2017-09-18 15:44:12 UTC (rev 222148)
@@ -34,7 +34,6 @@
#include "PlatformCALayer.h"
#include "TileController.h"
#include "TiledBacking.h"
-#include "WebCoreHeaderDetection.h"
#include <QuartzCore/CACFLayer.h>
#include <wtf/MainThread.h>
Modified: trunk/Source/cmake/WebKitCommon.cmake (222147 => 222148)
--- trunk/Source/cmake/WebKitCommon.cmake 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/Source/cmake/WebKitCommon.cmake 2017-09-18 15:44:12 UTC (rev 222148)
@@ -63,6 +63,7 @@
# -----------------------------------------------------------------------------
if (ENABLE_WEBCORE)
+ file(MAKE_DIRECTORY ${DERIVED_SOURCES_PAL_DIR})
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
endif ()
Modified: trunk/Source/cmake/WebKitFS.cmake (222147 => 222148)
--- trunk/Source/cmake/WebKitFS.cmake 2017-09-18 15:41:15 UTC (rev 222147)
+++ trunk/Source/cmake/WebKitFS.cmake 2017-09-18 15:44:12 UTC (rev 222148)
@@ -31,6 +31,7 @@
set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core")
+set(DERIVED_SOURCES_PAL_DIR "${CMAKE_BINARY_DIR}/DerivedSources/PAL")
set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
set(DERIVED_SOURCES_WEBDRIVER_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebDriver")
set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
