- Revision
- 268849
- Author
- [email protected]
- Date
- 2020-10-21 17:46:20 -0700 (Wed, 21 Oct 2020)
Log Message
Remove use of in-makefile grepping of FEATURE_AND_PLATFORM_DEFINES
https://bugs.webkit.org/show_bug.cgi?id=218001
Reviewed by Darin Adler.
Remove use of the $(findstring NEEDLE,$(FEATURE_AND_PLATFORM_DEFINES)) idiom in
DerivedSources.make to pave the way to passing FEATURE_AND_PLATFORM_DEFINES as a
file to scripts, rather than always on the command line, which is quite noisy.
* DerivedSources.make:
Remove conditionalized additions to ADDITIONAL_BINDING_IDLS and just always add
the concrete set, relying on the existing extended attributes in the IDLs instead.
It's also not necessary to ever add the touch related IDL files in WebCore here
as no users of DerivedSources.make use those.
Also removes conditional additions to USER_AGENT_STYLE_SHEETS and instead adds
the appropriate #ifdefs to the css files themselves which are already getting
preprocessed appropriately.
* css/fullscreen.css:
* css/mathml.css:
* css/mediaControls.css:
* html/shadow/mac/imageControlsMac.css:
Put required #ifdefs into the css files themselves, rather than embedding the
logic in the makefile.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (268848 => 268849)
--- trunk/Source/WebCore/ChangeLog 2020-10-22 00:41:50 UTC (rev 268848)
+++ trunk/Source/WebCore/ChangeLog 2020-10-22 00:46:20 UTC (rev 268849)
@@ -1,3 +1,31 @@
+2020-10-21 Sam Weinig <[email protected]>
+
+ Remove use of in-makefile grepping of FEATURE_AND_PLATFORM_DEFINES
+ https://bugs.webkit.org/show_bug.cgi?id=218001
+
+ Reviewed by Darin Adler.
+
+ Remove use of the $(findstring NEEDLE,$(FEATURE_AND_PLATFORM_DEFINES)) idiom in
+ DerivedSources.make to pave the way to passing FEATURE_AND_PLATFORM_DEFINES as a
+ file to scripts, rather than always on the command line, which is quite noisy.
+
+ * DerivedSources.make:
+ Remove conditionalized additions to ADDITIONAL_BINDING_IDLS and just always add
+ the concrete set, relying on the existing extended attributes in the IDLs instead.
+ It's also not necessary to ever add the touch related IDL files in WebCore here
+ as no users of DerivedSources.make use those.
+
+ Also removes conditional additions to USER_AGENT_STYLE_SHEETS and instead adds
+ the appropriate #ifdefs to the css files themselves which are already getting
+ preprocessed appropriately.
+
+ * css/fullscreen.css:
+ * css/mathml.css:
+ * css/mediaControls.css:
+ * html/shadow/mac/imageControlsMac.css:
+ Put required #ifdefs into the css files themselves, rather than embedding the
+ logic in the makefile.
+
2020-10-21 Megan Gardner <[email protected]>
Stop gap patch fix for regression in r267329.
Modified: trunk/Source/WebCore/DerivedSources.make (268848 => 268849)
--- trunk/Source/WebCore/DerivedSources.make 2020-10-22 00:41:50 UTC (rev 268848)
+++ trunk/Source/WebCore/DerivedSources.make 2020-10-22 00:46:20 UTC (rev 268849)
@@ -1281,24 +1281,14 @@
# --------
-ADDITIONAL_BINDING_IDLS =
-
-ifeq ($(findstring ENABLE_IOS_GESTURE_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_GESTURE_EVENTS)
-ADDITIONAL_BINDING_IDLS += GestureEvent.idl
-endif
-
-ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
-ADDITIONAL_BINDING_IDLS += \
+ADDITIONAL_BINDING_IDLS = \
DocumentTouch.idl \
+ GestureEvent.idl \
Touch.idl \
TouchEvent.idl \
- TouchList.idl
-endif
+ TouchList.idl \
+#
-ifeq ($(findstring ENABLE_MAC_GESTURE_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_MAC_GESTURE_EVENTS)
-ADDITIONAL_BINDING_IDLS += GestureEvent.idl
-endif
-
vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
ADDITIONAL_EVENT_NAMES =
@@ -1335,14 +1325,6 @@
$(ADDITIONAL_BINDING_IDLS_PATHS), \
$(path)/usr/local/include/WebKitAdditions/$(idl)))))
-ifneq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
-JS_BINDING_IDLS += \
- $(WebCore)/dom/Document+Touch.idl \
- $(WebCore)/dom/Touch.idl \
- $(WebCore)/dom/TouchEvent.idl \
- $(WebCore)/dom/TouchList.idl
-endif
-
.PHONY : all
JS_DOM_CLASSES=$(basename $(notdir $(JS_BINDING_IDLS)))
@@ -1510,28 +1492,20 @@
# user agent style sheets
-USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html.css $(WebCore)/css/dialog.css $(WebCore)/css/quirks.css $(WebCore)/css/plugIns.css $(WebCore)/css/svg.css
+USER_AGENT_STYLE_SHEETS = \
+ $(WebCore)/css/dialog.css \
+ $(WebCore)/css/fullscreen.css \
+ $(WebCore)/css/html.css \
+ $(WebCore)/css/mathml.css \
+ $(WebCore)/css/mediaControls.css \
+ $(WebCore)/css/plugIns.css \
+ $(WebCore)/css/quirks.css \
+ $(WebCore)/css/svg.css \
+ $(WebCore)/html/shadow/mac/imageControlsMac.css \
+ $(WebCore)/html/shadow/meterElementShadow.css \
+ $(WebCore)/Modules/plugins/QuickTimePluginReplacement.css \
+#
-ifeq ($(findstring ENABLE_MATHML,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_MATHML)
- USER_AGENT_STYLE_SHEETS += $(WebCore)/css/mathml.css
-endif
-
-ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_VIDEO)
- USER_AGENT_STYLE_SHEETS += $(WebCore)/css/mediaControls.css
-endif
-
-ifeq ($(findstring ENABLE_FULLSCREEN_API,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_FULLSCREEN_API)
- USER_AGENT_STYLE_SHEETS += $(WebCore)/css/fullscreen.css
-endif
-
-ifeq ($(findstring ENABLE_SERVICE_CONTROLS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_SERVICE_CONTROLS)
- USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/mac/imageControlsMac.css
-endif
-
-USER_AGENT_STYLE_SHEETS += $(WebCore)/Modules/plugins/QuickTimePluginReplacement.css
-
-USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/meterElementShadow.css
-
UserAgentStyleSheets.h : $(WebCore)/css/make-css-file-arrays.pl $(WebCore)/bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
$(PERL) $< --defines "$(FEATURE_AND_PLATFORM_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
Modified: trunk/Source/WebCore/css/fullscreen.css (268848 => 268849)
--- trunk/Source/WebCore/css/fullscreen.css 2020-10-22 00:41:50 UTC (rev 268848)
+++ trunk/Source/WebCore/css/fullscreen.css 2020-10-22 00:46:20 UTC (rev 268849)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 2020 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * 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.
+ */
+
+#if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
+
:-webkit-full-screen {
background-color: white;
z-index: 2147483647 !important;
@@ -58,3 +84,5 @@
max-width: none !important;
max-height: none !important;
}
+
+#endif
Modified: trunk/Source/WebCore/css/mathml.css (268848 => 268849)
--- trunk/Source/WebCore/css/mathml.css 2020-10-22 00:41:50 UTC (rev 268848)
+++ trunk/Source/WebCore/css/mathml.css 2020-10-22 00:46:20 UTC (rev 268849)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 2020 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * 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.
+ */
+
+#if defined(ENABLE_MATHML) && ENABLE_MATHML
+
@namespace "http://www.w3.org/1998/Math/MathML";
:any-link {
@@ -240,3 +266,5 @@
mtable[columnlines="dashed"] > mtr > mtd + mtd {
border-left: dashed thin;
}
+
+#endif
Modified: trunk/Source/WebCore/css/mediaControls.css (268848 => 268849)
--- trunk/Source/WebCore/css/mediaControls.css 2020-10-22 00:41:50 UTC (rev 268848)
+++ trunk/Source/WebCore/css/mediaControls.css 2020-10-22 00:46:20 UTC (rev 268849)
@@ -22,6 +22,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
+
/* media controls */
audio {
@@ -287,3 +289,5 @@
video::-webkit-media-text-track-container i {
font-style: italic;
}
+
+#endif
Modified: trunk/Source/WebCore/html/shadow/mac/imageControlsMac.css (268848 => 268849)
--- trunk/Source/WebCore/html/shadow/mac/imageControlsMac.css 2020-10-22 00:41:50 UTC (rev 268848)
+++ trunk/Source/WebCore/html/shadow/mac/imageControlsMac.css 2020-10-22 00:46:20 UTC (rev 268849)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,6 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if defined(ENABLE_SERVICE_CONTROLS) && ENABLE_SERVICE_CONTROLS
+
.x-webkit-image-controls {
position: relative;
}
@@ -39,3 +41,5 @@
.x-webkit-image-controls:hover .x-webkit-image-controls-button {
opacity: 1.0;
}
+
+#endif
