⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 268849 in webkit


Ignore:
Timestamp:
Oct 21, 2020, 5:46:20 PM (6 years ago)
Author:
weinig@apple.com
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.

Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r268847 r268849  
     12020-10-21  Sam Weinig  <weinig@apple.com>
     2
     3        Remove use of in-makefile grepping of FEATURE_AND_PLATFORM_DEFINES
     4        https://bugs.webkit.org/show_bug.cgi?id=218001
     5
     6        Reviewed by Darin Adler.
     7
     8        Remove use of the $(findstring NEEDLE,$(FEATURE_AND_PLATFORM_DEFINES)) idiom in
     9        DerivedSources.make to pave the way to passing FEATURE_AND_PLATFORM_DEFINES as a
     10        file to scripts, rather than always on the command line, which is quite noisy.
     11
     12        * DerivedSources.make:
     13        Remove conditionalized additions to ADDITIONAL_BINDING_IDLS and just always add
     14        the concrete set, relying on the existing extended attributes in the IDLs instead.
     15        It's also not necessary to ever add the touch related IDL files in WebCore here
     16        as no users of DerivedSources.make use those.
     17       
     18        Also removes conditional additions to USER_AGENT_STYLE_SHEETS and instead adds
     19        the appropriate #ifdefs to the css files themselves which are already getting
     20        preprocessed appropriately.
     21       
     22        * css/fullscreen.css:
     23        * css/mathml.css:
     24        * css/mediaControls.css:
     25        * html/shadow/mac/imageControlsMac.css:
     26        Put required #ifdefs into the css files themselves, rather than embedding the
     27        logic in the makefile.
     28
    1292020-10-21  Megan Gardner  <megan_gardner@apple.com>
    230

  • trunk/Source/WebCore/DerivedSources.make

    r268774 r268849  
    12821282# --------
    12831283
    1284 ADDITIONAL_BINDING_IDLS =
    1285 
    1286 ifeq ($(findstring ENABLE_IOS_GESTURE_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_GESTURE_EVENTS)
    1287 ADDITIONAL_BINDING_IDLS += GestureEvent.idl
    1288 endif
    1289 
    1290 ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
    1291 ADDITIONAL_BINDING_IDLS += \
     1284ADDITIONAL_BINDING_IDLS = \
    12921285    DocumentTouch.idl \
     1286    GestureEvent.idl \
    12931287    Touch.idl \
    12941288    TouchEvent.idl \
    1295     TouchList.idl
    1296 endif
    1297 
    1298 ifeq ($(findstring ENABLE_MAC_GESTURE_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_MAC_GESTURE_EVENTS)
    1299 ADDITIONAL_BINDING_IDLS += GestureEvent.idl
    1300 endif
     1289    TouchList.idl \
     1290#
    13011291
    13021292vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
    … …  
    13351325            $(ADDITIONAL_BINDING_IDLS_PATHS), \
    13361326            $(path)/usr/local/include/WebKitAdditions/$(idl)))))
    1337 
    1338 ifneq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
    1339 JS_BINDING_IDLS += \
    1340     $(WebCore)/dom/Document+Touch.idl \
    1341     $(WebCore)/dom/Touch.idl \
    1342     $(WebCore)/dom/TouchEvent.idl \
    1343     $(WebCore)/dom/TouchList.idl
    1344 endif
    13451327
    13461328.PHONY : all
    … …  
    15111493# user agent style sheets
    15121494
    1513 USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html.css $(WebCore)/css/dialog.css $(WebCore)/css/quirks.css $(WebCore)/css/plugIns.css $(WebCore)/css/svg.css
    1514 
    1515 ifeq ($(findstring ENABLE_MATHML,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_MATHML)
    1516     USER_AGENT_STYLE_SHEETS += $(WebCore)/css/mathml.css
    1517 endif
    1518 
    1519 ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_VIDEO)
    1520     USER_AGENT_STYLE_SHEETS += $(WebCore)/css/mediaControls.css
    1521 endif
    1522 
    1523 ifeq ($(findstring ENABLE_FULLSCREEN_API,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_FULLSCREEN_API)
    1524     USER_AGENT_STYLE_SHEETS += $(WebCore)/css/fullscreen.css
    1525 endif
    1526 
    1527 ifeq ($(findstring ENABLE_SERVICE_CONTROLS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_SERVICE_CONTROLS)
    1528     USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/mac/imageControlsMac.css
    1529 endif
    1530 
    1531 USER_AGENT_STYLE_SHEETS += $(WebCore)/Modules/plugins/QuickTimePluginReplacement.css
    1532 
    1533 USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/meterElementShadow.css
     1495USER_AGENT_STYLE_SHEETS = \
     1496    $(WebCore)/css/dialog.css \
     1497    $(WebCore)/css/fullscreen.css \
     1498    $(WebCore)/css/html.css \
     1499    $(WebCore)/css/mathml.css \
     1500    $(WebCore)/css/mediaControls.css \
     1501    $(WebCore)/css/plugIns.css \
     1502    $(WebCore)/css/quirks.css \
     1503    $(WebCore)/css/svg.css \
     1504    $(WebCore)/html/shadow/mac/imageControlsMac.css \
     1505    $(WebCore)/html/shadow/meterElementShadow.css \
     1506    $(WebCore)/Modules/plugins/QuickTimePluginReplacement.css \
     1507#
    15341508
    15351509UserAgentStyleSheets.h : $(WebCore)/css/make-css-file-arrays.pl $(WebCore)/bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)

  • trunk/Source/WebCore/css/fullscreen.css

    r254574 r268849  
     1/*
     2 * Copyright (C) 2020 Apple Inc.  All rights reserved.
     3 *
     4 * Redistribution and use in source and binary forms, with or without
     5 * modification, are permitted provided that the following conditions
     6 * are met:
     7 * 1. Redistributions of source code must retain the above copyright
     8 *    notice, this list of conditions and the following disclaimer.
     9 * 2. Redistributions in binary form must reproduce the above copyright
     10 *    notice, this list of conditions and the following disclaimer in the
     11 *    documentation and/or other materials provided with the distribution.
     12 *
     13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
     14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     16 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
     17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
     18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
     19 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
     20 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     22 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     23 */
     24
     25#if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
     26
    127:-webkit-full-screen {
    228    background-color: white;
    … …  
    5985    max-height: none !important;
    6086}
     87
     88#endif

  • trunk/Source/WebCore/css/mathml.css

    r267578 r268849  
     1/*
     2 * Copyright (C) 2020 Apple Inc.  All rights reserved.
     3 *
     4 * Redistribution and use in source and binary forms, with or without
     5 * modification, are permitted provided that the following conditions
     6 * are met:
     7 * 1. Redistributions of source code must retain the above copyright
     8 *    notice, this list of conditions and the following disclaimer.
     9 * 2. Redistributions in binary form must reproduce the above copyright
     10 *    notice, this list of conditions and the following disclaimer in the
     11 *    documentation and/or other materials provided with the distribution.
     12 *
     13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
     14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     16 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
     17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
     18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
     19 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
     20 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     22 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     23 */
     24
     25#if defined(ENABLE_MATHML) && ENABLE_MATHML
     26
    127@namespace "http://www.w3.org/1998/Math/MathML";
    228
    … …  
    241267    border-left: dashed thin;
    242268}
     269
     270#endif

  • trunk/Source/WebCore/css/mediaControls.css

    r260261 r268849  
    2323 */
    2424
     25#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
     26
    2527/* media controls */
    2628
    … …  
    288290    font-style: italic;
    289291}
     292
     293#endif

  • trunk/Source/WebCore/html/shadow/mac/imageControlsMac.css

    r168728 r268849  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#if defined(ENABLE_SERVICE_CONTROLS) && ENABLE_SERVICE_CONTROLS
     27
    2628.x-webkit-image-controls {
    2729    position: relative;
    … …  
    4042    opacity: 1.0;
    4143}
     44
     45#endif
Note: See TracChangeset for help on using the changeset viewer.