Changeset 188660 in webkit


Ignore:
Timestamp:
Aug 19, 2015 4:14:49 PM (9 years ago)
Author:
eric.carlson@apple.com
Message:

Remove ENABLE_WEBVTT_REGIONS
​https://bugs.webkit.org/show_bug.cgi?id=148184

Reviewed by Jer Noble.

  • Configurations/FeatureDefines.xcconfig: Remove ENABLE_WEBVTT_REGIONS.

Source/WebCore:

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::textTrackRemoveCue):

  • html/shadow/MediaControlElements.cpp:

(WebCore::MediaControlTextTrackContainerElement::updateDisplay):

  • html/track/InbandGenericTextTrack.cpp:

(WebCore::InbandGenericTextTrack::newCuesParsed):
(WebCore::InbandGenericTextTrack::newRegionsParsed):
(WebCore::InbandGenericTextTrack::fileFailedToParse):

  • html/track/InbandGenericTextTrack.h:
  • html/track/InbandWebVTTTextTrack.cpp:

(WebCore::InbandWebVTTTextTrack::newCuesParsed):
(WebCore::InbandWebVTTTextTrack::newRegionsParsed):
(WebCore::InbandWebVTTTextTrack::fileFailedToParse):

  • html/track/InbandWebVTTTextTrack.h:
  • html/track/LoadableTextTrack.cpp:

(WebCore::LoadableTextTrack::cueLoadingCompleted):
(WebCore::LoadableTextTrack::newRegionsAvailable):
(WebCore::LoadableTextTrack::id):

  • html/track/LoadableTextTrack.h:
  • html/track/TextTrack.cpp:

(WebCore::TextTrack::TextTrack):
(WebCore::TextTrack::~TextTrack):
(WebCore::TextTrack::removeCue):
(WebCore::TextTrack::ensureVTTRegionList):
(WebCore::TextTrack::removeRegion):
(WebCore::TextTrack::cueWillChange):

  • html/track/TextTrack.h:
  • html/track/TextTrack.idl:
  • html/track/TextTrackCue.cpp:
  • html/track/VTTCue.cpp:

(WebCore::VTTCueBox::applyCSSProperties):
(WebCore::VTTCue::createCueRenderingTree):
(WebCore::VTTCue::setRegionId):
(WebCore::VTTCue::notifyRegionWhenRemovingDisplayTree):
(WebCore::VTTCue::setIsActive):
(WebCore::VTTCue::removeDisplayTree):
(WebCore::VTTCue::settingName):
(WebCore::VTTCue::setCueSettings):
(WebCore::VTTCue::getCSSAlignment):

  • html/track/VTTCue.h:

(WebCore::VTTCue::regionId):

  • html/track/VTTCue.idl:
  • html/track/VTTRegion.cpp:
  • html/track/VTTRegion.h:
  • html/track/VTTRegion.idl:
  • html/track/VTTRegionList.cpp:
  • html/track/VTTRegionList.h:
  • html/track/VTTRegionList.idl:
  • html/track/WebVTTParser.cpp:

(WebCore::WebVTTParser::parseFloatPercentageValue):
(WebCore::WebVTTParser::parseFloatPercentageValuePair):
(WebCore::WebVTTParser::WebVTTParser):
(WebCore::WebVTTParser::getNewCues):
(WebCore::WebVTTParser::getNewRegions):
(WebCore::WebVTTParser::parseFileHeader):
(WebCore::WebVTTParser::parse):
(WebCore::WebVTTParser::collectMetadataHeader):
(WebCore::WebVTTParser::collectCueId):
(WebCore::WebVTTParser::resetCueValues):
(WebCore::WebVTTParser::createNewRegion):
(WebCore::WebVTTParser::collectTimeStamp):

  • html/track/WebVTTParser.h:

(WebCore::WebVTTParserClient::~WebVTTParserClient):

  • loader/TextTrackLoader.cpp:

(WebCore::TextTrackLoader::newCuesParsed):
(WebCore::TextTrackLoader::newRegionsParsed):
(WebCore::TextTrackLoader::fileFailedToParse):
(WebCore::TextTrackLoader::getNewCues):
(WebCore::TextTrackLoader::getNewRegions):

  • loader/TextTrackLoader.h:
  • rendering/RenderVTTCue.cpp:

(WebCore::RenderVTTCue::layout):

Location:
trunk
Files:
1 added
35 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/http/tests/media/resources/serve-video.php

    r179011 r188660  
    2121        "stallOffset" => array_key_exists("stallOffset", $_GET) ? $_GET["stallOffset"] : 0,
    2222        "stallDuration" => array_key_exists("stallDuration", $_GET) ? $_GET["stallDuration"] : 2,
     23        "contentDisposition" => array_key_exists("content-disposition", $_GET) ? dirname($_GET["content-disposition"]) : "",
    2324    );
    2425
    … …  
    136137    if (isset($contentRange))
    137138        header("Content-Range: bytes " . $start . "-" . $end . "/" . $fileSize);
     139    if ($isset["contentDisposition"])
     140        header("Content-Disposition: " . $settings["contentDisposition"]);
    138141
    139142    $offset = $start;

  • trunk/Source/JavaScriptCore/ChangeLog

    r188656 r188660  
     12015-08-19  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Remove ENABLE_WEBVTT_REGIONS
     4        https://bugs.webkit.org/show_bug.cgi?id=148184
     5
     6        Reviewed by Jer Noble.
     7
     8        * Configurations/FeatureDefines.xcconfig: Remove ENABLE_WEBVTT_REGIONS.
     9
    1102015-08-19  Joseph Pecoraro  <pecoraro@apple.com>
    211

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r187575 r188660  
    216216ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
    217217
    218 ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
    219218ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
    220219
    … …  
    230229ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    231230
    232 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
     231FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);

  • trunk/Source/WebCore/ChangeLog

    r188659 r188660  
     12015-08-19  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Remove ENABLE_WEBVTT_REGIONS
     4        https://bugs.webkit.org/show_bug.cgi?id=148184
     5
     6        Reviewed by Jer Noble.
     7
     8        * Configurations/FeatureDefines.xcconfig: Remove ENABLE_WEBVTT_REGIONS.
     9        * html/HTMLMediaElement.cpp:
     10        (WebCore::HTMLMediaElement::textTrackRemoveCue):
     11        * html/shadow/MediaControlElements.cpp:
     12        (WebCore::MediaControlTextTrackContainerElement::updateDisplay):
     13        * html/track/InbandGenericTextTrack.cpp:
     14        (WebCore::InbandGenericTextTrack::newCuesParsed):
     15        (WebCore::InbandGenericTextTrack::newRegionsParsed):
     16        (WebCore::InbandGenericTextTrack::fileFailedToParse):
     17        * html/track/InbandGenericTextTrack.h:
     18        * html/track/InbandWebVTTTextTrack.cpp:
     19        (WebCore::InbandWebVTTTextTrack::newCuesParsed):
     20        (WebCore::InbandWebVTTTextTrack::newRegionsParsed):
     21        (WebCore::InbandWebVTTTextTrack::fileFailedToParse):
     22        * html/track/InbandWebVTTTextTrack.h:
     23        * html/track/LoadableTextTrack.cpp:
     24        (WebCore::LoadableTextTrack::cueLoadingCompleted):
     25        (WebCore::LoadableTextTrack::newRegionsAvailable):
     26        (WebCore::LoadableTextTrack::id):
     27        * html/track/LoadableTextTrack.h:
     28        * html/track/TextTrack.cpp:
     29        (WebCore::TextTrack::TextTrack):
     30        (WebCore::TextTrack::~TextTrack):
     31        (WebCore::TextTrack::removeCue):
     32        (WebCore::TextTrack::ensureVTTRegionList):
     33        (WebCore::TextTrack::removeRegion):
     34        (WebCore::TextTrack::cueWillChange):
     35        * html/track/TextTrack.h:
     36        * html/track/TextTrack.idl:
     37        * html/track/TextTrackCue.cpp:
     38        * html/track/VTTCue.cpp:
     39        (WebCore::VTTCueBox::applyCSSProperties):
     40        (WebCore::VTTCue::createCueRenderingTree):
     41        (WebCore::VTTCue::setRegionId):
     42        (WebCore::VTTCue::notifyRegionWhenRemovingDisplayTree):
     43        (WebCore::VTTCue::setIsActive):
     44        (WebCore::VTTCue::removeDisplayTree):
     45        (WebCore::VTTCue::settingName):
     46        (WebCore::VTTCue::setCueSettings):
     47        (WebCore::VTTCue::getCSSAlignment):
     48        * html/track/VTTCue.h:
     49        (WebCore::VTTCue::regionId):
     50        * html/track/VTTCue.idl:
     51        * html/track/VTTRegion.cpp:
     52        * html/track/VTTRegion.h:
     53        * html/track/VTTRegion.idl:
     54        * html/track/VTTRegionList.cpp:
     55        * html/track/VTTRegionList.h:
     56        * html/track/VTTRegionList.idl:
     57        * html/track/WebVTTParser.cpp:
     58        (WebCore::WebVTTParser::parseFloatPercentageValue):
     59        (WebCore::WebVTTParser::parseFloatPercentageValuePair):
     60        (WebCore::WebVTTParser::WebVTTParser):
     61        (WebCore::WebVTTParser::getNewCues):
     62        (WebCore::WebVTTParser::getNewRegions):
     63        (WebCore::WebVTTParser::parseFileHeader):
     64        (WebCore::WebVTTParser::parse):
     65        (WebCore::WebVTTParser::collectMetadataHeader):
     66        (WebCore::WebVTTParser::collectCueId):
     67        (WebCore::WebVTTParser::resetCueValues):
     68        (WebCore::WebVTTParser::createNewRegion):
     69        (WebCore::WebVTTParser::collectTimeStamp):
     70        * html/track/WebVTTParser.h:
     71        (WebCore::WebVTTParserClient::~WebVTTParserClient):
     72        * loader/TextTrackLoader.cpp:
     73        (WebCore::TextTrackLoader::newCuesParsed):
     74        (WebCore::TextTrackLoader::newRegionsParsed):
     75        (WebCore::TextTrackLoader::fileFailedToParse):
     76        (WebCore::TextTrackLoader::getNewCues):
     77        (WebCore::TextTrackLoader::getNewRegions):
     78        * loader/TextTrackLoader.h:
     79        * rendering/RenderVTTCue.cpp:
     80        (WebCore::RenderVTTCue::layout):
     81
    1822015-08-19  Brent Fulgham  <bfulgham@apple.com>
    283

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r187575 r188660  
    216216ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
    217217
    218 ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
    219218ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
    220219
    … …  
    230229ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    231230
    232 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
     231FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r188612 r188660  
    17361736    m_cueTree.remove(interval);
    17371737
    1738 #if ENABLE(WEBVTT_REGIONS)
    17391738    // Since the cue will be removed from the media element and likely the
    17401739    // TextTrack might also be destructed, notifying the region of the cue
    … …  
    17421741    if (cue->isRenderable())
    17431742        toVTTCue(cue.get())->notifyRegionWhenRemovingDisplayTree(false);
    1744 #endif
    17451743
    17461744    size_t index = m_currentlyActiveCues.find(interval);
    … …  
    17541752    updateActiveTextTrackCues(currentMediaTime());
    17551753
    1756 #if ENABLE(WEBVTT_REGIONS)
    17571754    if (cue->isRenderable())
    17581755        toVTTCue(cue.get())->notifyRegionWhenRemovingDisplayTree(true);
    1759 #endif
    17601756}
    17611757

  • trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

    r183735 r188660  
    5757#include "TextTrackList.h"
    5858#endif
    59 
    60 #if ENABLE(WEBVTT_REGIONS)
    6159#include "VTTRegionList.h"
    62 #endif
    6360
    6461namespace WebCore {
    … …  
    11801177
    11811178        RefPtr<VTTCueBox> displayBox = cue->getDisplayTree(m_videoDisplaySize.size(), m_fontSize);
    1182 #if ENABLE(WEBVTT_REGIONS)
    11831179        if (cue->track()->mode() == TextTrack::disabledKeyword())
    11841180            continue;
    … …  
    11891185            // WebVTT region whose region identifier is identical to cue's text
    11901186            // track cue region identifier, run the following substeps:
    1191 #endif
    11921187            if (displayBox->hasChildNodes() && !contains(displayBox.get())) {
    11931188                // Note: the display tree of a cue is removed when the active flag of the cue is unset.
    … …  
    11951190                cue->setFontSize(m_fontSize, m_videoDisplaySize.size(), m_fontSizeIsImportant);
    11961191            }
    1197 #if ENABLE(WEBVTT_REGIONS)
    11981192        } else {
    11991193            // Let region be the WebVTT region whose region identifier
    … …  
    12071201            region->appendTextTrackCueBox(displayBox);
    12081202        }
    1209 #endif
    12101203    }
    12111204

  • trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp

    r183975 r188660  
    3434#include "InbandTextTrackPrivate.h"
    3535#include "Logging.h"
     36#include "VTTRegionList.h"
    3637#include <math.h>
    3738#include <wtf/text/CString.h>
    3839
    39 #if ENABLE(WEBVTT_REGIONS)
    40 #include "VTTRegionList.h"
    41 #endif
    4240
    4341namespace WebCore {
    … …  
    234232}
    235233
    236 #if ENABLE(WEBVTT_REGIONS)
    237234void InbandGenericTextTrack::newRegionsParsed()
    238235{
    … …  
    245242    }
    246243}
     244
     245void InbandGenericTextTrack::fileFailedToParse()
     246{
     247    LOG(Media, "Error parsing WebVTT stream.");
     248}
     249
     250} // namespace WebCore
     251
    247252#endif
    248 
    249 void InbandGenericTextTrack::fileFailedToParse()
    250 {
    251     LOG(Media, "Error parsing WebVTT stream.");
    252 }
    253 
    254 } // namespace WebCore
    255 
    256 #endif

  • trunk/Source/WebCore/html/track/InbandGenericTextTrack.h

    r183975 r188660  
    8282
    8383    virtual void newCuesParsed() override;
    84 #if ENABLE(WEBVTT_REGIONS)
    8584    virtual void newRegionsParsed() override;
    86 #endif
    8785    virtual void fileFailedToParse() override;
    8886

  • trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp

    r183975 r188660  
    3333#include "Logging.h"
    3434#include "NotImplemented.h"
     35#include "VTTRegionList.h"
    3536#include <wtf/text/CString.h>
    36 
    37 #if ENABLE(WEBVTT_REGIONS)
    38 #include "VTTRegionList.h"
    39 #endif
    4037
    4138namespace WebCore {
    … …  
    9087}
    9188   
    92 #if ENABLE(WEBVTT_REGIONS)
    9389void InbandWebVTTTextTrack::newRegionsParsed()
    9490{
    … …  
    10197    }
    10298}
    103 #endif
    10499   
    105100void InbandWebVTTTextTrack::fileFailedToParse()

  • trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.h

    r183975 r188660  
    4949
    5050    virtual void newCuesParsed() override;
    51 #if ENABLE(WEBVTT_REGIONS)
    5251    virtual void newRegionsParsed() override;
    53 #endif
    5452    virtual void fileFailedToParse() override;
    5553

  • trunk/Source/WebCore/html/track/LoadableTextTrack.cpp

    r186388 r188660  
    3434#include "ScriptExecutionContext.h"
    3535#include "TextTrackCueList.h"
    36 
    37 #if ENABLE(WEBVTT_REGIONS)
    3836#include "VTTRegionList.h"
    39 #endif
    4037
    4138namespace WebCore {
    … …  
    133130}
    134131
    135 #if ENABLE(WEBVTT_REGIONS)
    136132void LoadableTextTrack::newRegionsAvailable(TextTrackLoader* loader)
    137133{
    … …  
    146142    }
    147143}
    148 #endif
    149144
    150145AtomicString LoadableTextTrack::id() const

  • trunk/Source/WebCore/html/track/LoadableTextTrack.h

    r183975 r188660  
    6565    virtual void newCuesAvailable(TextTrackLoader*) override;
    6666    virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) override;
    67 #if ENABLE(WEBVTT_REGIONS)
    6867    virtual void newRegionsAvailable(TextTrackLoader*) override;
    69 #endif
    7068
    7169    LoadableTextTrack(HTMLTrackElement*, const String& kind, const String& label, const String& language);

  • trunk/Source/WebCore/html/track/TextTrack.cpp

    r188612 r188660  
    117117    : TrackBase(TrackBase::TextTrack, id, label, language)
    118118    , m_cues(0)
    119 #if ENABLE(WEBVTT_REGIONS)
    120119    , m_regions(0)
    121 #endif
    122120    , m_scriptExecutionContext(context)
    123121    , m_mode(disabledKeyword().string())
    … …  
    140138        for (size_t i = 0; i < m_cues->length(); ++i)
    141139            m_cues->item(i)->setTrack(0);
    142 #if ENABLE(WEBVTT_REGIONS)
    143140        if (m_regions) {
    144141            for (size_t i = 0; i < m_regions->length(); ++i)
    145142                m_regions->item(i)->setTrack(0);
    146143        }
    147 #endif
    148144    }
    149145    clearClient();
    … …  
    343339}
    344340
    345 #if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
    346341VTTRegionList* TextTrack::ensureVTTRegionList()
    347342{
    … …  
    415410    region->setTrack(0);
    416411}
    417 #endif
    418412
    419413void TextTrack::cueWillChange(TextTrackCue* cue)

  • trunk/Source/WebCore/html/track/TextTrack.h

    r188612 r188660  
    4242class TextTrack;
    4343class TextTrackCueList;
    44 #if ENABLE(WEBVTT_REGIONS)
    4544class VTTRegion;
    4645class VTTRegionList;
    47 #endif
    4846
    4947class TextTrackClient {
    … …  
    107105    bool hasCue(TextTrackCue*, TextTrackCue::CueMatchRules = TextTrackCue::MatchAllFields);
    108106
    109 #if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
    110107    VTTRegionList* regions();
    111108    void addRegion(PassRefPtr<VTTRegion>);
    112109    void removeRegion(VTTRegion*, ExceptionCode&);
    113 #endif
    114110
    115111    void cueWillChange(TextTrackCue*);
    … …  
    163159    virtual void derefEventTarget() override final { deref(); }
    164160
    165 #if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
    166161    VTTRegionList* ensureVTTRegionList();
    167162    RefPtr<VTTRegionList> m_regions;
    168 #endif
    169163
    170164    TextTrackCueList* ensureTextTrackCueList();

  • trunk/Source/WebCore/html/track/TextTrack.idl

    r181507 r188660  
    5151
    5252#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
    53     [Conditional=WEBVTT_REGIONS] readonly attribute VTTRegionList regions;
    54     [Conditional=WEBVTT_REGIONS] void addRegion(VTTRegion region);
    55     [Conditional=WEBVTT_REGIONS, RaisesException] void removeRegion(VTTRegion region);
     53    readonly attribute VTTRegionList regions;
     54    void addRegion(VTTRegion region);
     55    [RaisesException] void removeRegion(VTTRegion region);
    5656#endif
    5757

  • trunk/Source/WebCore/html/track/TextTrackCue.cpp

    r173318 r188660  
    4848#include "TextTrackCueList.h"
    4949#include "VTTCue.h"
     50#include "VTTRegionList.h"
    5051#include <wtf/MathExtras.h>
    5152#include <wtf/text/StringBuilder.h>
    52 
    53 #if ENABLE(WEBVTT_REGIONS)
    54 #include "VTTRegionList.h"
    55 #endif
    5653
    5754namespace WebCore {

  • trunk/Source/WebCore/html/track/VTTCue.cpp

    r186279 r188660  
    4747#include "TextTrack.h"
    4848#include "TextTrackCueList.h"
     49#include "VTTRegionList.h"
    4950#include "VTTScanner.h"
    5051#include "WebVTTElement.h"
    … …  
    5354#include <wtf/text/StringBuilder.h>
    5455
    55 #if ENABLE(WEBVTT_REGIONS)
    56 #include "VTTRegionList.h"
    57 #endif
    58 
    5956namespace WebCore {
    6057
    … …  
    145142{
    146143    // FIXME: Apply all the initial CSS positioning properties. http://wkb.ug/79916
    147 #if ENABLE(WEBVTT_REGIONS)
    148144    if (!m_cue.regionId().isEmpty()) {
    149145        setInlineStyleProperty(CSSPropertyPosition, CSSValueRelative);
    150146        return;
    151147    }
    152 #endif
    153148
    154149    // 3.5.1 On the (root) List of WebVTT Node Objects:
    … …  
    531526}
    532527
    533 #if ENABLE(WEBVTT_REGIONS)
    534528void VTTCue::setRegionId(const String& regionId)
    535529{
    … …  
    546540    m_notifyRegion = notifyRegion;
    547541}
    548 #endif
    549542
    550543void VTTCue::setIsActive(bool active)
    … …  
    839832void VTTCue::removeDisplayTree()
    840833{
    841 #if ENABLE(WEBVTT_REGIONS)
    842834    // The region needs to be informed about the cue removal.
    843835    if (m_notifyRegion && track()) {
    … …  
    847839        }
    848840    }
    849 #endif
    850841
    851842    if (!hasDisplayTree())
    … …  
    905896    else if (input.scan("align"))
    906897        parsedSetting = Align;
    907 #if ENABLE(WEBVTT_REGIONS)
    908898    else if (input.scan("region"))
    909899        parsedSetting = RegionId;
    910 #endif
     900
    911901    // Verify that a ':' follows.
    912902    if (parsedSetting != None && input.scan(':'))
    … …  
    10591049            break;
    10601050        }
    1061 #if ENABLE(WEBVTT_REGIONS)
    10621051        case RegionId:
    10631052            m_regionId = input.extractString(valueRun);
    10641053            break;
    1065 #endif
    10661054        case None:
    10671055            break;
    … …  
    10711059        input.skipRun(valueRun);
    10721060    }
    1073 #if ENABLE(WEBVTT_REGIONS)
     1061
    10741062    // If cue's line position is not auto or cue's size is not 100 or cue's
    10751063    // writing direction is not horizontal, but cue's region identifier is not
    … …  
    10801068    if (m_linePosition != undefinedPosition || m_cueSize != 100 || m_writingDirection != Horizontal)
    10811069        m_regionId = emptyString();
    1082 #endif
    10831070}
    10841071

  • trunk/Source/WebCore/html/track/VTTCue.h

    r183735 r188660  
    118118    PassRefPtr<DocumentFragment> createCueRenderingTree();
    119119
    120 #if ENABLE(WEBVTT_REGIONS)
    121120    const String& regionId() const { return m_regionId; }
    122121    void setRegionId(const String&);
    123122    void notifyRegionWhenRemovingDisplayTree(bool);
    124 #endif
    125123
    126124    virtual void setIsActive(bool) override;
    … …  
    197195        Size,
    198196        Align,
    199 #if ENABLE(WEBVTT_REGIONS)
    200197        RegionId
    201 #endif
    202198    };
    203199    CueSetting settingName(VTTScanner&);
    … …  
    212208    WritingDirection m_writingDirection;
    213209    CueAlignment m_cueAlignment;
    214 #if ENABLE(WEBVTT_REGIONS)
    215210    String m_regionId;
    216 #endif
    217211
    218212    RefPtr<DocumentFragment> m_webVTTNodeTree;

  • trunk/Source/WebCore/html/track/VTTCue.idl

    r168302 r188660  
    3939    DocumentFragment getCueAsHTML();
    4040
    41 #if defined(ENABLE_WEBVTT_REGIONS) && ENABLE_WEBVTT_REGIONS
    4241    attribute DOMString regionId;
    43 #endif
    4442};

  • trunk/Source/WebCore/html/track/VTTRegion.cpp

    r177508 r188660  
    3333#include "VTTRegion.h"
    3434
    35 #if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
     35#if ENABLE(VIDEO_TRACK)
    3636
    3737#include "ClientRect.h"

  • trunk/Source/WebCore/html/track/VTTRegion.h

    r183735 r188660  
    3333#define VTTRegion_h
    3434
    35 #if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
     35#if ENABLE(VIDEO_TRACK)
    3636
    3737#include "ContextDestructionObserver.h"

  • trunk/Source/WebCore/html/track/VTTRegion.idl

    r168302 r188660  
    2626
    2727[
    28     Conditional=VIDEO_TRACK & WEBVTT_REGIONS,
     28    Conditional=VIDEO_TRACK,
    2929    JSGenerateToNativeObject,
    3030    Constructor(),

  • trunk/Source/WebCore/html/track/VTTRegionList.cpp

    r166022 r188660  
    2828#include "VTTRegionList.h"
    2929
    30 #if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
     30#if ENABLE(VIDEO_TRACK)
    3131
    3232

  • trunk/Source/WebCore/html/track/VTTRegionList.h

    r183975 r188660  
    2828#define VTTRegionList_h
    2929
    30 #if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
     30#if ENABLE(VIDEO_TRACK)
    3131
    3232#include "VTTRegion.h"

  • trunk/Source/WebCore/html/track/VTTRegionList.idl

    r166022 r188660  
    2626[
    2727    NoInterfaceObject,
    28     Conditional=VIDEO_TRACK & WEBVTT_REGIONS,
     28    Conditional=VIDEO_TRACK,
    2929    ImplementationLacksVTable,
    3030] interface VTTRegionList {

  • trunk/Source/WebCore/html/track/WebVTTParser.cpp

    r174067 r188660  
    6868}
    6969
    70 #if ENABLE(WEBVTT_REGIONS)
    7170bool WebVTTParser::parseFloatPercentageValuePair(VTTScanner& valueScanner, char delimiter, FloatPoint& valuePair)
    7271{
    … …  
    8584    return true;
    8685}
    87 #endif
    8886
    8987WebVTTParser::WebVTTParser(WebVTTParserClient* client, ScriptExecutionContext* context)
    … …  
    10199}
    102100
    103 #if ENABLE(WEBVTT_REGIONS)
    104101void WebVTTParser::getNewRegions(Vector<RefPtr<VTTRegion>>& outputRegions)
    105102{
    … …  
    107104    m_regionList.clear();
    108105}
    109 #endif
    110106
    111107void WebVTTParser::parseFileHeader(const String& data)
    … …  
    179175
    180176            if (line.isEmpty()) {
    181 #if ENABLE(WEBVTT_REGIONS)
    182177                // Steps 10-14 - Allow a header (comment area) under the WEBVTT line.
    183178                if (m_client && m_regionList.size())
    184179                    m_client->newRegionsParsed();
    185 #endif
    186180                m_state = Id;
    187181                break;
    … …  
    267261void WebVTTParser::collectMetadataHeader(const String& line)
    268262{
    269 #if ENABLE(WEBVTT_REGIONS)
    270263    // WebVTT header parsing (WebVTT parser algorithm step 12)
    271264    DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, regionHeaderName, ("Region", AtomicString::ConstructFromLiteral));
    … …  
    286279        createNewRegion(headerValue);
    287280    }
    288 #else
    289     UNUSED_PARAM(line);
    290 #endif
    291281}
    292282
    … …  
    442432}
    443433
    444 #if ENABLE(WEBVTT_REGIONS)
    445434void WebVTTParser::createNewRegion(const String& headerValue)
    446435{
    … …  
    463452    m_regionList.append(region);
    464453}
    465 #endif
    466454
    467455bool WebVTTParser::collectTimeStamp(const String& line, MediaTime& timeStamp)

  • trunk/Source/WebCore/html/track/WebVTTParser.h

    r183735 r188660  
    5959
    6060    virtual void newCuesParsed() = 0;
    61 #if ENABLE(WEBVTT_REGIONS)
    6261    virtual void newRegionsParsed() = 0;
    63 #endif
    6462    virtual void fileFailedToParse() = 0;
    6563};
    … …  
    133131    // Useful functions for parsing percentage settings.
    134132    static bool parseFloatPercentageValue(VTTScanner& valueScanner, float&);
    135 #if ENABLE(WEBVTT_REGIONS)
    136133    static bool parseFloatPercentageValuePair(VTTScanner& valueScanner, char, FloatPoint&);
    137 #endif
    138134
    139135    // Input data to the parser to parse.
    … …  
    146142    // Transfers ownership of last parsed cues to caller.
    147143    void getNewCues(Vector<RefPtr<WebVTTCueData>>&);
    148 #if ENABLE(WEBVTT_REGIONS)
    149144    void getNewRegions(Vector<RefPtr<VTTRegion>>&);
    150 #endif
    151145
    152146    // Create the DocumentFragment representation of the WebVTT cue text.
    … …  
    171165
    172166    void collectMetadataHeader(const String&);
    173 #if ENABLE(WEBVTT_REGIONS)
    174167    void createNewRegion(const String& headerValue);
    175 #endif
    176168
    177169    static bool collectTimeStamp(VTTScanner& input, MediaTime& timeStamp);
    … …  
    188180
    189181    Vector<RefPtr<WebVTTCueData>> m_cuelist;
    190 
    191 #if ENABLE(WEBVTT_REGIONS)
    192182    Vector<RefPtr<VTTRegion>> m_regionList;
    193 #endif
    194183};
    195184

  • trunk/Source/WebCore/loader/TextTrackLoader.cpp

    r186388 r188660  
    188188}
    189189
    190 #if ENABLE(WEBVTT_REGIONS)
    191190void TextTrackLoader::newRegionsParsed()
    192191{
    193192    m_client.newRegionsAvailable(this);
    194193}
    195 #endif
    196194
    197195void TextTrackLoader::fileFailedToParse()
    … …  
    219217}
    220218
    221 #if ENABLE(WEBVTT_REGIONS)
    222219void TextTrackLoader::getNewRegions(Vector<RefPtr<VTTRegion>>& outputRegions)
    223220{
    … …  
    226223        m_cueParser->getNewRegions(outputRegions);
    227224}
     225
     226}
     227
    228228#endif
    229 }
    230 
    231 #endif

  • trunk/Source/WebCore/loader/TextTrackLoader.h

    r186388 r188660  
    4848    virtual void newCuesAvailable(TextTrackLoader*) = 0;
    4949    virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) = 0;
    50 #if ENABLE(WEBVTT_REGIONS)
    5150    virtual void newRegionsAvailable(TextTrackLoader*) = 0;
    52 #endif
    5351};
    5452
    … …  
    6361    void cancelLoad();
    6462    void getNewCues(Vector<RefPtr<TextTrackCue>>& outputCues);
    65 #if ENABLE(WEBVTT_REGIONS)
    6663    void getNewRegions(Vector<RefPtr<VTTRegion>>& outputRegions);
    67 #endif
    6864private:
    6965
    … …  
    7470    // WebVTTParserClient
    7571    virtual void newCuesParsed() override;
    76 #if ENABLE(WEBVTT_REGIONS)
    7772    virtual void newRegionsParsed() override;
    78 #endif
    7973    virtual void fileFailedToParse() override;
    8074   

  • trunk/Source/WebCore/rendering/RenderVTTCue.cpp

    r177259 r188660  
    4848    RenderBlockFlow::layout();
    4949
    50 #if ENABLE(WEBVTT_REGIONS)
    5150    // If WebVTT Regions are used, the regular WebVTT layout algorithm is no
    5251    // longer necessary, since cues having the region parameter set do not have
    … …  
    5554    if (!m_cue->regionId().isEmpty())
    5655        return;
    57 #endif
    5856
    5957    LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());

  • trunk/Source/WebKit/mac/ChangeLog

    r188594 r188660  
     12015-08-19  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Remove ENABLE_WEBVTT_REGIONS
     4        https://bugs.webkit.org/show_bug.cgi?id=148184
     5
     6        Reviewed by Jer Noble.
     7
     8        * Configurations/FeatureDefines.xcconfig: Remove ENABLE_WEBVTT_REGIONS.
     9
    1102015-08-17  Filip Pizlo  <fpizlo@apple.com>
    211

  • trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r187575 r188660  
    216216ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
    217217
    218 ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
    219218ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
    220219
    … …  
    230229ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    231230
    232 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
     231FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);

  • trunk/Source/WebKit2/ChangeLog

    r188647 r188660  
     12015-08-19  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Remove ENABLE_WEBVTT_REGIONS
     4        https://bugs.webkit.org/show_bug.cgi?id=148184
     5
     6        Reviewed by Jer Noble.
     7
     8        * Configurations/FeatureDefines.xcconfig: Remove ENABLE_WEBVTT_REGIONS.
     9
    1102015-08-18  Dean Jackson  <dino@apple.com>
    211

  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r187575 r188660  
    216216ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
    217217
    218 ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
    219218ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
    220219
    … …  
    230229ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    231230
    232 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
     231FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
Note: See TracChangeset for help on using the changeset viewer.