Title: [267166] trunk
Revision
267166
Author
stephan.sz...@sony.com
Date
2020-09-16 15:30:00 -0700 (Wed, 16 Sep 2020)

Log Message

Remove ENABLE_METER_ELEMENT
https://bugs.webkit.org/show_bug.cgi?id=216582

Reviewed by Fujii Hironori.

With PlayStation finally planning to turn this on,
no ports had this disabled, so remove the enable flag.

.:

* Source/cmake/OptionsFTW.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/OptionsPlayStation.cmake:
* Source/cmake/OptionsWin.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmake/tools/vsprops/FeatureDefines.props:
* Source/cmake/tools/vsprops/FeatureDefinesCairo.props:

Source/WebCore:

* DerivedSources.make:
* accessibility/AXObjectCache.cpp:
* accessibility/AccessibilityObject.cpp:
* accessibility/AccessibilityProgressIndicator.cpp:
* accessibility/AccessibilityProgressIndicator.h:
* accessibility/AccessibilityRenderObject.cpp:
* css/html.css:
* html/HTMLMeterElement.cpp:
* html/HTMLMeterElement.h:
* html/HTMLMeterElement.idl:
* html/HTMLTagNames.in:
* platform/LocalizedStrings.h:
* platform/cocoa/LocalizedStringsCocoa.mm:
* rendering/RenderMeter.cpp:
* rendering/RenderMeter.h:
* rendering/RenderObject.h:
* rendering/RenderTheme.cpp:
* rendering/RenderTheme.h:
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
* rendering/RenderThemeWin.cpp:
* rendering/RenderThemeWin.h:

Source/WTF:

* wtf/PlatformEnable.h:

Tools:

* Scripts/webkitperl/FeatureList.pm:

Modified Paths

Diff

Modified: trunk/ChangeLog (267165 => 267166)


--- trunk/ChangeLog	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/ChangeLog	2020-09-16 22:30:00 UTC (rev 267166)
@@ -1,3 +1,21 @@
+2020-09-16  Stephan Szabo  <stephan.sz...@sony.com>
+
+        Remove ENABLE_METER_ELEMENT
+        https://bugs.webkit.org/show_bug.cgi?id=216582
+
+        Reviewed by Fujii Hironori.
+
+        With PlayStation finally planning to turn this on,
+        no ports had this disabled, so remove the enable flag.
+
+        * Source/cmake/OptionsFTW.cmake:
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/OptionsPlayStation.cmake:
+        * Source/cmake/OptionsWin.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+        * Source/cmake/tools/vsprops/FeatureDefines.props:
+        * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
+
 2020-09-15  David Kilzer  <ddkil...@apple.com>
 
         WebKit should support building with clang ThreadSanitizer enabled

Modified: trunk/Source/WTF/ChangeLog (267165 => 267166)


--- trunk/Source/WTF/ChangeLog	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WTF/ChangeLog	2020-09-16 22:30:00 UTC (rev 267166)
@@ -1,3 +1,15 @@
+2020-09-16  Stephan Szabo  <stephan.sz...@sony.com>
+
+        Remove ENABLE_METER_ELEMENT
+        https://bugs.webkit.org/show_bug.cgi?id=216582
+
+        Reviewed by Fujii Hironori.
+
+        With PlayStation finally planning to turn this on,
+        no ports had this disabled, so remove the enable flag.
+
+        * wtf/PlatformEnable.h:
+
 2020-09-16  Alex Christensen  <achristen...@webkit.org>
 
         Remove unneeded HAVE_FOUNDATION_WITH_SAVE_COOKIES_WITH_COMPLETION_HANDLER

Modified: trunk/Source/WTF/wtf/PlatformEnable.h (267165 => 267166)


--- trunk/Source/WTF/wtf/PlatformEnable.h	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WTF/wtf/PlatformEnable.h	2020-09-16 22:30:00 UTC (rev 267166)
@@ -365,10 +365,6 @@
 #define ENABLE_MEDIA_STREAM 0
 #endif
 
-#if !defined(ENABLE_METER_ELEMENT)
-#define ENABLE_METER_ELEMENT 1
-#endif
-
 #if !defined(ENABLE_MHTML)
 #define ENABLE_MHTML 0
 #endif

Modified: trunk/Source/WebCore/ChangeLog (267165 => 267166)


--- trunk/Source/WebCore/ChangeLog	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/ChangeLog	2020-09-16 22:30:00 UTC (rev 267166)
@@ -1,3 +1,36 @@
+2020-09-16  Stephan Szabo  <stephan.sz...@sony.com>
+
+        Remove ENABLE_METER_ELEMENT
+        https://bugs.webkit.org/show_bug.cgi?id=216582
+
+        Reviewed by Fujii Hironori.
+
+        With PlayStation finally planning to turn this on,
+        no ports had this disabled, so remove the enable flag.
+
+        * DerivedSources.make:
+        * accessibility/AXObjectCache.cpp:
+        * accessibility/AccessibilityObject.cpp:
+        * accessibility/AccessibilityProgressIndicator.cpp:
+        * accessibility/AccessibilityProgressIndicator.h:
+        * accessibility/AccessibilityRenderObject.cpp:
+        * css/html.css:
+        * html/HTMLMeterElement.cpp:
+        * html/HTMLMeterElement.h:
+        * html/HTMLMeterElement.idl:
+        * html/HTMLTagNames.in:
+        * platform/LocalizedStrings.h:
+        * platform/cocoa/LocalizedStringsCocoa.mm:
+        * rendering/RenderMeter.cpp:
+        * rendering/RenderMeter.h:
+        * rendering/RenderObject.h:
+        * rendering/RenderTheme.cpp:
+        * rendering/RenderTheme.h:
+        * rendering/RenderThemeMac.h:
+        * rendering/RenderThemeMac.mm:
+        * rendering/RenderThemeWin.cpp:
+        * rendering/RenderThemeWin.h:
+
 2020-09-16  Sam Weinig  <wei...@apple.com>
 
         Remove runtime setting for enabling/disabling the isSecureContext API?

Modified: trunk/Source/WebCore/DerivedSources.make (267165 => 267166)


--- trunk/Source/WebCore/DerivedSources.make	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/DerivedSources.make	2020-09-16 22:30:00 UTC (rev 267166)
@@ -1515,9 +1515,7 @@
 
 USER_AGENT_STYLE_SHEETS += $(WebCore)/Modules/plugins/QuickTimePluginReplacement.css
 
-ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_METER_ELEMENT)
-	USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/meterElementShadow.css
-endif
+USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/meterElementShadow.css
 
 UserAgentStyleSheets.h : css/make-css-file-arrays.pl 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/accessibility/AXObjectCache.cpp (267165 => 267166)


--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp	2020-09-16 22:30:00 UTC (rev 267166)
@@ -567,10 +567,9 @@
         if (is<RenderAttachment>(cssBox))
             return AccessibilityAttachment::create(&downcast<RenderAttachment>(cssBox));
 #endif
-#if ENABLE(METER_ELEMENT)
+
         if (is<RenderMeter>(cssBox))
             return AccessibilityProgressIndicator::create(&downcast<RenderMeter>(cssBox));
-#endif
 
         // input type=range
         if (is<RenderSlider>(cssBox))
@@ -666,10 +665,7 @@
     bool inCanvasSubtree = lineageOfType<HTMLCanvasElement>(*node->parentElement()).first();
     bool isHidden = isNodeAriaVisible(node);
 
-    bool insideMeterElement = false;
-#if ENABLE(METER_ELEMENT)
-    insideMeterElement = is<HTMLMeterElement>(*node->parentElement());
-#endif
+    bool insideMeterElement = is<HTMLMeterElement>(*node->parentElement());
     
     if (!inCanvasSubtree && !isHidden && !insideMeterElement)
         return nullptr;

Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (267165 => 267166)


--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp	2020-09-16 22:30:00 UTC (rev 267166)
@@ -810,12 +810,8 @@
     if (ariaRoleAttribute() == AccessibilityRole::Meter)
         return true;
 
-#if ENABLE(METER_ELEMENT)
     RenderObject* renderer = this->renderer();
     return renderer && renderer->isMeter();
-#else
-    return false;
-#endif
 }
 
 IntPoint AccessibilityObject::clickPoint()

Modified: trunk/Source/WebCore/accessibility/AccessibilityProgressIndicator.cpp (267165 => 267166)


--- trunk/Source/WebCore/accessibility/AccessibilityProgressIndicator.cpp	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/accessibility/AccessibilityProgressIndicator.cpp	2020-09-16 22:30:00 UTC (rev 267166)
@@ -45,7 +45,6 @@
     return adoptRef(*new AccessibilityProgressIndicator(renderer));
 }
     
-#if ENABLE(METER_ELEMENT)
 AccessibilityProgressIndicator::AccessibilityProgressIndicator(RenderMeter* renderer)
     : AccessibilityRenderObject(renderer)
 {
@@ -55,7 +54,6 @@
 {
     return adoptRef(*new AccessibilityProgressIndicator(renderer));
 }
-#endif
 
 bool AccessibilityProgressIndicator::computeAccessibilityIsIgnored() const
 {
@@ -69,7 +67,6 @@
     if (!description.isEmpty())
         return description;
 
-#if ENABLE(METER_ELEMENT)
     if (!m_renderer->isMeter())
         return description;
 
@@ -89,7 +86,6 @@
     String gaugeRegionValue = gaugeRegionValueDescription();
     if (!gaugeRegionValue.isEmpty())
         description = description.isEmpty() ? gaugeRegionValue : description + ", " + gaugeRegionValue;
-#endif
 
     return description;
 }
@@ -105,12 +101,10 @@
             return narrowPrecisionToFloat(progress->value());
     }
 
-#if ENABLE(METER_ELEMENT)
     if (m_renderer->isMeter()) {
         if (HTMLMeterElement* meter = meterElement())
             return narrowPrecisionToFloat(meter->value());
     }
-#endif
 
     // Indeterminate progress bar should return 0.
     return 0.0;
@@ -126,12 +120,10 @@
             return narrowPrecisionToFloat(progress->max());
     }
     
-#if ENABLE(METER_ELEMENT)
     if (m_renderer->isMeter()) {
         if (HTMLMeterElement* meter = meterElement())
             return narrowPrecisionToFloat(meter->max());
     }
-#endif
 
     return 0.0;
 }
@@ -144,12 +136,10 @@
     if (m_renderer->isProgress())
         return 0.0;
     
-#if ENABLE(METER_ELEMENT)
     if (m_renderer->isMeter()) {
         if (HTMLMeterElement* meter = meterElement())
             return narrowPrecisionToFloat(meter->min());
     }
-#endif
     
     return 0.0;
 }
@@ -156,10 +146,8 @@
     
 AccessibilityRole AccessibilityProgressIndicator::roleValue() const
 {
-#if ENABLE(METER_ELEMENT)
     if (meterElement())
         return AccessibilityRole::Meter;
-#endif
     return AccessibilityRole::ProgressIndicator;
 }
 
@@ -171,7 +159,6 @@
     return downcast<RenderProgress>(*m_renderer).progressElement();
 }
 
-#if ENABLE(METER_ELEMENT)
 HTMLMeterElement* AccessibilityProgressIndicator::meterElement() const
 {
     if (!is<RenderMeter>(*m_renderer))
@@ -205,7 +192,6 @@
 #endif
     return String();
 }
-#endif
 
 Element* AccessibilityProgressIndicator::element() const
 {
@@ -212,10 +198,8 @@
     if (m_renderer->isProgress())
         return progressElement();
 
-#if ENABLE(METER_ELEMENT)
     if (m_renderer->isMeter())
         return meterElement();
-#endif
 
     return AccessibilityObject::element();
 }

Modified: trunk/Source/WebCore/accessibility/AccessibilityProgressIndicator.h (267165 => 267166)


--- trunk/Source/WebCore/accessibility/AccessibilityProgressIndicator.h	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/accessibility/AccessibilityProgressIndicator.h	2020-09-16 22:30:00 UTC (rev 267166)
@@ -24,10 +24,8 @@
 
 namespace WebCore {
 
-#if ENABLE(METER_ELEMENT)
 class HTMLMeterElement;
 class RenderMeter;
-#endif
 
 class HTMLProgressElement;
 class RenderProgress;
@@ -35,9 +33,7 @@
 class AccessibilityProgressIndicator final : public AccessibilityRenderObject {
 public:
     static Ref<AccessibilityProgressIndicator> create(RenderProgress*);
-#if ENABLE(METER_ELEMENT)
     static Ref<AccessibilityProgressIndicator> create(RenderMeter*);
-#endif
     Element* element() const override;
 
 private:
@@ -48,9 +44,7 @@
     bool isAccessibilityProgressIndicatorInstance() const final { return true; }
 
     String valueDescription() const override;
-#if ENABLE(METER_ELEMENT)
     String gaugeRegionValueDescription() const;
-#endif
     float valueForRange() const override;
     float maxValueForRange() const override;
     float minValueForRange() const override;
@@ -58,10 +52,8 @@
     explicit AccessibilityProgressIndicator(RenderProgress*);
     HTMLProgressElement* progressElement() const;
 
-#if ENABLE(METER_ELEMENT)
     explicit AccessibilityProgressIndicator(RenderMeter*);
     HTMLMeterElement* meterElement() const;
-#endif
     
     bool computeAccessibilityIsIgnored() const override;
 };

Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (267165 => 267166)


--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2020-09-16 22:30:00 UTC (rev 267166)
@@ -1464,7 +1464,6 @@
     if (isWebArea())
         return false;
     
-#if ENABLE(METER_ELEMENT)
     // The render tree of meter includes a RenderBlock (meter) and a RenderMeter (div).
     // We expose the latter and thus should ignore the former. However, if the author
     // includes a title attribute on the element, hasAttributesRequiredForInclusion()
@@ -1471,7 +1470,6 @@
     // will return true, potentially resulting in a redundant accessible object.
     if (is<HTMLMeterElement>(node))
         return true;
-#endif
 
     // Using the presence of an accessible name to decide an element's visibility is not
     // as definitive as previous checks, so this should remain as one of the last.

Modified: trunk/Source/WebCore/css/html.css (267165 => 267166)


--- trunk/Source/WebCore/css/html.css	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/css/html.css	2020-09-16 22:30:00 UTC (rev 267166)
@@ -1072,7 +1072,6 @@
     height: 16px;
 }
 
-#if defined(ENABLE_METER_ELEMENT) && ENABLE_METER_ELEMENT
 /* meter */
 
 meter {
@@ -1084,8 +1083,6 @@
     vertical-align: -0.2em;
 }
 
-#endif
-
 /* progress */
 
 progress {

Modified: trunk/Source/WebCore/html/HTMLMeterElement.cpp (267165 => 267166)


--- trunk/Source/WebCore/html/HTMLMeterElement.cpp	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/html/HTMLMeterElement.cpp	2020-09-16 22:30:00 UTC (rev 267166)
@@ -21,8 +21,6 @@
 #include "config.h"
 #include "HTMLMeterElement.h"
 
-#if ENABLE(METER_ELEMENT)
-
 #include "Attribute.h"
 #include "ElementIterator.h"
 #include "HTMLDivElement.h"
@@ -252,4 +250,3 @@
 }
 
 } // namespace
-#endif

Modified: trunk/Source/WebCore/html/HTMLMeterElement.h (267165 => 267166)


--- trunk/Source/WebCore/html/HTMLMeterElement.h	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/html/HTMLMeterElement.h	2020-09-16 22:30:00 UTC (rev 267166)
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#if ENABLE(METER_ELEMENT)
-
 #include "LabelableElement.h"
 
 namespace WebCore {
@@ -82,5 +80,3 @@
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(METER_ELEMENT)

Modified: trunk/Source/WebCore/html/HTMLMeterElement.idl (267165 => 267166)


--- trunk/Source/WebCore/html/HTMLMeterElement.idl	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/html/HTMLMeterElement.idl	2020-09-16 22:30:00 UTC (rev 267166)
@@ -17,9 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-[
-    Conditional=METER_ELEMENT
-] interface HTMLMeterElement : HTMLElement {
+interface HTMLMeterElement : HTMLElement {
     [CEReactions=NotNeeded] attribute double value;
     [CEReactions=NotNeeded] attribute double min;
     [CEReactions=NotNeeded] attribute double max;

Modified: trunk/Source/WebCore/html/HTMLTagNames.in (267165 => 267166)


--- trunk/Source/WebCore/html/HTMLTagNames.in	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/html/HTMLTagNames.in	2020-09-16 22:30:00 UTC (rev 267166)
@@ -86,7 +86,7 @@
 menu
 menuitem interfaceName=HTMLMenuItemElement, runtimeEnabled=menuItemElement
 meta
-meter interfaceName=HTMLMeterElement, conditional=METER_ELEMENT
+meter interfaceName=HTMLMeterElement
 nav interfaceName=HTMLElement
 nobr interfaceName=HTMLElement
 noembed interfaceName=HTMLElement

Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (267165 => 267166)


--- trunk/Source/WebCore/platform/LocalizedStrings.h	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h	2020-09-16 22:30:00 UTC (rev 267166)
@@ -202,12 +202,10 @@
     String AXListItemActionVerb();
 
 #if PLATFORM(COCOA)
-#if ENABLE(METER_ELEMENT)
     String AXMeterGaugeRegionOptimumText();
     String AXMeterGaugeRegionSuboptimalText();
     String AXMeterGaugeRegionLessGoodText();
 #endif
-#endif
 #if ENABLE(APPLE_PAY)
     String AXApplePayPlainLabel();
     String AXApplePayBuyLabel();

Modified: trunk/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm (267165 => 267166)


--- trunk/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm	2020-09-16 22:30:00 UTC (rev 267166)
@@ -181,7 +181,6 @@
 #endif
 #endif // ENABLE(CONTEXT_MENUS)
 
-#if ENABLE(METER_ELEMENT)
 String AXMeterGaugeRegionOptimumText()
 {
     return WEB_UI_STRING("optimal value", "The optimum value description for a meter element.");
@@ -196,7 +195,6 @@
 {
     return WEB_UI_STRING("critical value", "The less good value description for a meter element.");
 }
-#endif // ENABLE(METER_ELEMENT)
 
 String builtInPDFPluginName()
 {

Modified: trunk/Source/WebCore/rendering/RenderMeter.cpp (267165 => 267166)


--- trunk/Source/WebCore/rendering/RenderMeter.cpp	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/rendering/RenderMeter.cpp	2020-09-16 22:30:00 UTC (rev 267166)
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#if ENABLE(METER_ELEMENT)
 #include "RenderMeter.h"
 
 #include "HTMLMeterElement.h"
@@ -78,5 +77,3 @@
 }
 
 } // namespace WebCore
-
-#endif

Modified: trunk/Source/WebCore/rendering/RenderMeter.h (267165 => 267166)


--- trunk/Source/WebCore/rendering/RenderMeter.h	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/rendering/RenderMeter.h	2020-09-16 22:30:00 UTC (rev 267166)
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#if ENABLE(METER_ELEMENT)
-
 #include "RenderBlockFlow.h"
 
 namespace WebCore {
@@ -48,5 +46,3 @@
 } // namespace WebCore
 
 SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMeter, isMeter())
-
-#endif // ENABLE(METER_ELEMENT)

Modified: trunk/Source/WebCore/rendering/RenderObject.h (267165 => 267166)


--- trunk/Source/WebCore/rendering/RenderObject.h	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/rendering/RenderObject.h	2020-09-16 22:30:00 UTC (rev 267166)
@@ -216,9 +216,7 @@
     virtual bool isListMarker() const { return false; }
     virtual bool isMedia() const { return false; }
     virtual bool isMenuList() const { return false; }
-#if ENABLE(METER_ELEMENT)
     virtual bool isMeter() const { return false; }
-#endif
     virtual bool isSnapshottedPlugIn() const { return false; }
     virtual bool isProgress() const { return false; }
     virtual bool isRenderButton() const { return false; }

Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (267165 => 267166)


--- trunk/Source/WebCore/rendering/RenderTheme.cpp	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp	2020-09-16 22:30:00 UTC (rev 267166)
@@ -34,10 +34,12 @@
 #include "FrameSelection.h"
 #include "GraphicsContext.h"
 #include "HTMLInputElement.h"
+#include "HTMLMeterElement.h"
 #include "HTMLNames.h"
 #include "LocalizedStrings.h"
 #include "Page.h"
 #include "PaintInfo.h"
+#include "RenderMeter.h"
 #include "RenderStyle.h"
 #include "RenderView.h"
 #include "RuntimeEnabledFeatures.h"
@@ -48,10 +50,6 @@
 #include <wtf/NeverDestroyed.h>
 #include <wtf/text/StringConcatenateNumbers.h>
 
-#if ENABLE(METER_ELEMENT)
-#include "HTMLMeterElement.h"
-#include "RenderMeter.h"
-#endif
 
 #if ENABLE(DATALIST_ELEMENT)
 #include "HTMLDataListElement.h"
@@ -250,7 +248,6 @@
         return adjustSearchFieldResultsButtonStyle(style, element);
     case ProgressBarPart:
         return adjustProgressBarStyle(style, element);
-#if ENABLE(METER_ELEMENT)
     case MeterPart:
     case RelevancyLevelIndicatorPart:
     case ContinuousCapacityLevelIndicatorPart:
@@ -257,7 +254,6 @@
     case DiscreteCapacityLevelIndicatorPart:
     case RatingLevelIndicatorPart:
         return adjustMeterStyle(style, element);
-#endif
 #if ENABLE(SERVICE_CONTROLS)
     case ImageControlsButtonPart:
         break;
@@ -347,7 +343,6 @@
 #endif
     case MenulistPart:
         return paintMenuList(box, paintInfo, devicePixelSnappedRect);
-#if ENABLE(METER_ELEMENT)
     case MeterPart:
     case RelevancyLevelIndicatorPart:
     case ContinuousCapacityLevelIndicatorPart:
@@ -354,7 +349,6 @@
     case DiscreteCapacityLevelIndicatorPart:
     case RatingLevelIndicatorPart:
         return paintMeter(box, paintInfo, integralSnappedRect);
-#endif
     case ProgressBarPart:
         return paintProgressBar(box, paintInfo, integralSnappedRect);
     case SliderHorizontalPart:
@@ -473,13 +467,11 @@
     case DefaultButtonPart:
     case ButtonPart:
     case MenulistPart:
-#if ENABLE(METER_ELEMENT)
     case MeterPart:
     case RelevancyLevelIndicatorPart:
     case ContinuousCapacityLevelIndicatorPart:
     case DiscreteCapacityLevelIndicatorPart:
     case RatingLevelIndicatorPart:
-#endif
     case ProgressBarPart:
     case SliderHorizontalPart:
     case SliderVerticalPart:
@@ -536,13 +528,11 @@
         return paintSliderThumbDecorations(box, paintInfo, integralSnappedRect);
     case SearchFieldPart:
         return paintSearchFieldDecorations(box, paintInfo, integralSnappedRect);
-#if ENABLE(METER_ELEMENT)
     case MeterPart:
     case RelevancyLevelIndicatorPart:
     case ContinuousCapacityLevelIndicatorPart:
     case DiscreteCapacityLevelIndicatorPart:
     case RatingLevelIndicatorPart:
-#endif
     case ProgressBarPart:
     case SliderHorizontalPart:
     case SliderVerticalPart:
@@ -984,8 +974,6 @@
 {
 }
 
-#if ENABLE(METER_ELEMENT)
-
 void RenderTheme::adjustMeterStyle(RenderStyle& style, const Element*) const
 {
     style.setBoxShadow(nullptr);
@@ -1006,8 +994,6 @@
     return true;
 }
 
-#endif // METER_ELEMENT
-
 void RenderTheme::adjustCapsLockIndicatorStyle(RenderStyle&, const Element*) const
 {
 }

Modified: trunk/Source/WebCore/rendering/RenderTheme.h (267165 => 267166)


--- trunk/Source/WebCore/rendering/RenderTheme.h	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/rendering/RenderTheme.h	2020-09-16 22:30:00 UTC (rev 267166)
@@ -224,10 +224,8 @@
     virtual LayoutPoint volumeSliderOffsetFromMuteButton(const RenderBox&, const LayoutSize&) const;
 #endif
 
-#if ENABLE(METER_ELEMENT)
     virtual IntSize meterSizeForBounds(const RenderMeter&, const IntRect&) const;
     virtual bool supportsMeter(ControlPart) const;
-#endif
 
 #if ENABLE(DATALIST_ELEMENT)
     // Returns the threshold distance for snapping to a slider tick mark.
@@ -336,10 +334,8 @@
     virtual bool paintPushButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
     virtual bool paintSquareButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
 
-#if ENABLE(METER_ELEMENT)
     virtual void adjustMeterStyle(RenderStyle&, const Element*) const;
     virtual bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&);
-#endif
 
     virtual void adjustCapsLockIndicatorStyle(RenderStyle&, const Element*) const;
     virtual bool paintCapsLockIndicator(const RenderObject&, const PaintInfo&, const IntRect&);

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (267165 => 267166)


--- trunk/Source/WebCore/rendering/RenderThemeMac.h	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h	2020-09-16 22:30:00 UTC (rev 267166)
@@ -83,11 +83,9 @@
 
     bool popsMenuByArrowKeys() const final { return true; }
 
-#if ENABLE(METER_ELEMENT)
     IntSize meterSizeForBounds(const RenderMeter&, const IntRect&) const final;
     bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&) final;
     bool supportsMeter(ControlPart) const final;
-#endif
 
     // Returns the repeat interval of the animation for the progress bar.
     Seconds animationRepeatIntervalForProgressBar(RenderProgress&) const final;
@@ -230,10 +228,8 @@
     NSCell *listButton() const;
 #endif
 
-#if ENABLE(METER_ELEMENT)
     NSLevelIndicatorStyle levelIndicatorStyleFor(ControlPart) const;
     NSLevelIndicatorCell *levelIndicatorFor(const RenderMeter&) const;
-#endif
 
     int minimumProgressBarHeight(const RenderStyle&) const;
     const IntSize* progressBarSizes() const;

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (267165 => 267166)


--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2020-09-16 22:30:00 UTC (rev 267166)
@@ -40,6 +40,7 @@
 #import "HTMLAttachmentElement.h"
 #import "HTMLInputElement.h"
 #import "HTMLMediaElement.h"
+#import "HTMLMeterElement.h"
 #import "HTMLNames.h"
 #import "HTMLPlugInImageElement.h"
 #import "Icon.h"
@@ -54,6 +55,7 @@
 #import "RenderAttachment.h"
 #import "RenderLayer.h"
 #import "RenderMedia.h"
+#import "RenderMeter.h"
 #import "RenderProgress.h"
 #import "RenderSlider.h"
 #import "RenderSnapshottedPlugIn.h"
@@ -83,11 +85,6 @@
 #import <wtf/StdLibExtras.h>
 #import <wtf/text/StringBuilder.h>
 
-#if ENABLE(METER_ELEMENT)
-#import "RenderMeter.h"
-#import "HTMLMeterElement.h"
-#endif
-
 #if ENABLE(SERVICE_CONTROLS)
 
 // FIXME: This should go into an SPI.h file in the spi directory.
@@ -1249,8 +1246,6 @@
     return false;
 }
 
-#if ENABLE(METER_ELEMENT)
-
 IntSize RenderThemeMac::meterSizeForBounds(const RenderMeter& renderMeter, const IntRect& bounds) const
 {
     if (NoControlPart == renderMeter.style().appearance())
@@ -1350,8 +1345,6 @@
     return cell;
 }
 
-#endif
-
 const IntSize* RenderThemeMac::progressBarSizes() const
 {
     static const IntSize sizes[4] = { IntSize(0, 20), IntSize(0, 12), IntSize(0, 12), IntSize(0, 20) };

Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (267165 => 267166)


--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp	2020-09-16 22:30:00 UTC (rev 267166)
@@ -1095,7 +1095,6 @@
 }
 #endif
 
-#if ENABLE(METER_ELEMENT)
 void RenderThemeWin::adjustMeterStyle(RenderStyle& style, const Element*) const
 {
     style.setBoxShadow(nullptr);
@@ -1140,7 +1139,5 @@
     return true;
 }
 
-#endif
 
-
 }

Modified: trunk/Source/WebCore/rendering/RenderThemeWin.h (267165 => 267166)


--- trunk/Source/WebCore/rendering/RenderThemeWin.h	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.h	2020-09-16 22:30:00 UTC (rev 267166)
@@ -124,12 +124,10 @@
     String mediaControlsScript() override;
 #endif
 
-#if ENABLE(METER_ELEMENT)
     IntSize meterSizeForBounds(const RenderMeter&, const IntRect&) const override;
     bool supportsMeter(ControlPart) const override;
     void adjustMeterStyle(RenderStyle&, const Element*) const override;
     bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&) override;
-#endif
 
 private:
     enum ControlSubPart {

Modified: trunk/Source/cmake/OptionsFTW.cmake (267165 => 267166)


--- trunk/Source/cmake/OptionsFTW.cmake	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/cmake/OptionsFTW.cmake	2020-09-16 22:30:00 UTC (rev 267166)
@@ -87,7 +87,6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MAC_GESTURE_EVENTS PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MATHML PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_METER_ELEMENT PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON)

Modified: trunk/Source/cmake/OptionsMac.cmake (267165 => 267166)


--- trunk/Source/cmake/OptionsMac.cmake	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/cmake/OptionsMac.cmake	2020-09-16 22:30:00 UTC (rev 267166)
@@ -63,7 +63,6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_METER_ELEMENT PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE PRIVATE ON)

Modified: trunk/Source/cmake/OptionsPlayStation.cmake (267165 => 267166)


--- trunk/Source/cmake/OptionsPlayStation.cmake	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/cmake/OptionsPlayStation.cmake	2020-09-16 22:30:00 UTC (rev 267166)
@@ -69,7 +69,6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MATHML PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_METER_ELEMENT PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL PRIVATE OFF)

Modified: trunk/Source/cmake/OptionsWin.cmake (267165 => 267166)


--- trunk/Source/cmake/OptionsWin.cmake	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/cmake/OptionsWin.cmake	2020-09-16 22:30:00 UTC (rev 267166)
@@ -50,7 +50,6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STATISTICS PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_METER_ELEMENT PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA PUBLIC OFF)

Modified: trunk/Source/cmake/WebKitFeatures.cmake (267165 => 267166)


--- trunk/Source/cmake/WebKitFeatures.cmake	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/cmake/WebKitFeatures.cmake	2020-09-16 22:30:00 UTC (rev 267166)
@@ -171,7 +171,6 @@
     WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STATISTICS "Toggle Media Statistics support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STREAM "Toggle Media Stream support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_MEMORY_SAMPLER "Toggle Memory Sampler support" PRIVATE OFF)
-    WEBKIT_OPTION_DEFINE(ENABLE_METER_ELEMENT "Toggle Meter Element support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_MHTML "Toggle MHTML support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_MINIBROWSER "Toggle MiniBrowser compilation." PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_MOUSE_CURSOR_SCALE "Toggle Scaled mouse cursor support" PRIVATE OFF)

Modified: trunk/Source/cmake/tools/vsprops/FeatureDefines.props (267165 => 267166)


--- trunk/Source/cmake/tools/vsprops/FeatureDefines.props	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefines.props	2020-09-16 22:30:00 UTC (rev 267166)
@@ -44,7 +44,6 @@
     <ENABLE_MEDIA_CONTROLS_SCRIPT>ENABLE_MEDIA_CONTROLS_SCRIPT</ENABLE_MEDIA_CONTROLS_SCRIPT>
     <ENABLE_MEDIA_SOURCE />
     <ENABLE_MEDIA_STATISTICS>ENABLE_MEDIA_STATISTICS</ENABLE_MEDIA_STATISTICS>
-    <ENABLE_METER_ELEMENT>ENABLE_METER_ELEMENT</ENABLE_METER_ELEMENT>
     <ENABLE_MICRODATA />
     <ENABLE_MOUSE_CURSOR_SCALE>ENABLE_MOUSE_CURSOR_SCALE</ENABLE_MOUSE_CURSOR_SCALE>
     <ENABLE_NOTIFICATIONS />
@@ -71,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPU
 T_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBGPU);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT
 _TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBGPU);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -247,10 +246,6 @@
       <Value>$(ENABLE_MEDIA_STATISTICS)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
-    <BuildMacro Include="ENABLE_METER_ELEMENT">
-      <Value>$(ENABLE_METER_ELEMENT)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
     <BuildMacro Include="ENABLE_MICRODATA">
       <Value>$(ENABLE_MICRODATA)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>

Modified: trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props (267165 => 267166)


--- trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props	2020-09-16 22:30:00 UTC (rev 267166)
@@ -44,7 +44,6 @@
     <ENABLE_MEDIA_CONTROLS_SCRIPT>ENABLE_MEDIA_CONTROLS_SCRIPT</ENABLE_MEDIA_CONTROLS_SCRIPT>
     <ENABLE_MEDIA_SOURCE />
     <ENABLE_MEDIA_STATISTICS>ENABLE_MEDIA_STATISTICS</ENABLE_MEDIA_STATISTICS>
-    <ENABLE_METER_ELEMENT>ENABLE_METER_ELEMENT</ENABLE_METER_ELEMENT>
     <ENABLE_MICRODATA />
     <ENABLE_MOUSE_CURSOR_SCALE>ENABLE_MOUSE_CURSOR_SCALE</ENABLE_MOUSE_CURSOR_SCALE>
     <ENABLE_NOTIFICATIONS />
@@ -71,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPU
 T_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT
 _TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -247,10 +246,6 @@
       <Value>$(ENABLE_MEDIA_STATISTICS)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
-    <BuildMacro Include="ENABLE_METER_ELEMENT">
-      <Value>$(ENABLE_METER_ELEMENT)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
     <BuildMacro Include="ENABLE_MICRODATA">
       <Value>$(ENABLE_MICRODATA)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>

Modified: trunk/Tools/ChangeLog (267165 => 267166)


--- trunk/Tools/ChangeLog	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Tools/ChangeLog	2020-09-16 22:30:00 UTC (rev 267166)
@@ -1,3 +1,15 @@
+2020-09-16  Stephan Szabo  <stephan.sz...@sony.com>
+
+        Remove ENABLE_METER_ELEMENT
+        https://bugs.webkit.org/show_bug.cgi?id=216582
+
+        Reviewed by Fujii Hironori.
+
+        With PlayStation finally planning to turn this on,
+        no ports had this disabled, so remove the enable flag.
+
+        * Scripts/webkitperl/FeatureList.pm:
+
 2020-09-16  Aakash Jain  <aakash_j...@apple.com>
 
         EWS emails to bot watchers about build failures should be grouped properly

Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (267165 => 267166)


--- trunk/Tools/Scripts/webkitperl/FeatureList.pm	2020-09-16 22:05:10 UTC (rev 267165)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm	2020-09-16 22:30:00 UTC (rev 267166)
@@ -414,9 +414,6 @@
     { option => "memory-sampler", desc => "Toggle Memory Sampler support",
       define => "ENABLE_MEMORY_SAMPLER", value => \$memorySamplerSupport },
 
-    { option => "meter-element", desc => "Toggle Meter Element support",
-      define => "ENABLE_METER_ELEMENT", value => \$meterElementSupport },
-
     { option => "mhtml", desc => "Toggle MHTML support",
       define => "ENABLE_MHTML", value => \$mhtmlSupport },
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to