WebKit Bugzilla
Attachment 371528 Details for
Bug 198624
: Remove dashboard code
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Removed the code
bug-198624-20190606151604.patch (text/plain), 212.84 KB, created by
Ryosuke Niwa
on 2019-06-06 15:16:05 PDT
(
hide
)
Description:
Removed the code
Filename:
MIME Type:
Creator:
Ryosuke Niwa
Created:
2019-06-06 15:16:05 PDT
Size:
212.84 KB
patch
obsolete
>Index: Source/JavaScriptCore/ChangeLog >=================================================================== >--- Source/JavaScriptCore/ChangeLog (revision 246172) >+++ Source/JavaScriptCore/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2019-06-06 Ryosuke Niwa <rniwa@webkit.org> >+ >+ Remove dashboard code >+ https://bugs.webkit.org/show_bug.cgi?id=198624 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Configurations/FeatureDefines.xcconfig: >+ > 2019-06-06 Keith Miller <keith_miller@apple.com> > > Fix typo in cageWithoutUntagging >Index: Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig >=================================================================== >--- Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (revision 246172) >+++ Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (working copy) >@@ -117,9 +117,6 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ; > ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); > ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; > >-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME)); >-ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT; >- > ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE; > > ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT; >@@ -445,4 +442,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >Index: Source/WTF/ChangeLog >=================================================================== >--- Source/WTF/ChangeLog (revision 246172) >+++ Source/WTF/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2019-06-06 Ryosuke Niwa <rniwa@webkit.org> >+ >+ Remove dashboard code >+ https://bugs.webkit.org/show_bug.cgi?id=198624 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * wtf/FeatureDefines.h: >+ > 2019-06-06 Caio Lima <ticaiolima@gmail.com> > > [JSCOnly] JSCOnly port is not building on macOS >Index: Source/WTF/wtf/FeatureDefines.h >=================================================================== >--- Source/WTF/wtf/FeatureDefines.h (revision 246172) >+++ Source/WTF/wtf/FeatureDefines.h (working copy) >@@ -219,10 +219,6 @@ the public iOS SDK. See <https://webkit. > #define ENABLE_CONTENT_EXTENSIONS 1 > #endif > >-#if !defined(ENABLE_DASHBOARD_SUPPORT) >-#define ENABLE_DASHBOARD_SUPPORT 1 >-#endif >- > #if !defined(ENABLE_FULLSCREEN_API) > #define ENABLE_FULLSCREEN_API 1 > #endif >@@ -453,11 +449,7 @@ the public iOS SDK. See <https://webkit. > #if !defined(ENABLE_DARK_MODE_CSS) > #define ENABLE_DARK_MODE_CSS 0 > #endif >- >-#if !defined(ENABLE_DASHBOARD_SUPPORT) >-#define ENABLE_DASHBOARD_SUPPORT 0 >-#endif >- >+\ > #if !defined(ENABLE_DATALIST_ELEMENT) > #define ENABLE_DATALIST_ELEMENT 0 > #endif >Index: Source/WebCore/ChangeLog >=================================================================== >--- Source/WebCore/ChangeLog (revision 246172) >+++ Source/WebCore/ChangeLog (working copy) >@@ -1,3 +1,123 @@ >+2019-06-06 Ryosuke Niwa <rniwa@webkit.org> >+ >+ Remove dashboard code >+ https://bugs.webkit.org/show_bug.cgi?id=198624 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Configurations/FeatureDefines.xcconfig: >+ * WebCore.xcodeproj/project.pbxproj: >+ * css/CSSCalculationValue.cpp: >+ (WebCore::hasDoubleValue): >+ * css/CSSComputedStyleDeclaration.cpp: >+ (WebCore::ComputedStyleExtractor::valueForPropertyInStyle): >+ * css/CSSPrimitiveValue.cpp: >+ (WebCore::isValidCSSUnitTypeForDoubleConversion): >+ (WebCore::isStringType): >+ (WebCore::CSSPrimitiveValue::cleanup): >+ (WebCore::CSSPrimitiveValue::formatNumberForCustomCSSText const): >+ (WebCore::CSSPrimitiveValue::equals const): >+ * css/CSSPrimitiveValue.h: >+ * css/CSSProperties.json: >+ * css/CSSValueKeywords.in: >+ * css/DashboardRegion.h: Removed. >+ * css/StyleBuilderCustom.h: >+ (WebCore::convertToIntLength): Deleted. >+ (WebCore::StyleBuilderCustom::applyValueWebkitDashboardRegion): Deleted. >+ * css/StyleResolver.cpp: >+ * css/parser/CSSPropertyParser.cpp: >+ (WebCore::CSSPropertyParser::parseSingleValue): >+ (WebCore::consumeWebkitDashboardRegion): Deleted. >+ * dom/DataTransfer.cpp: >+ (WebCore::DataTransfer::createForUpdatingDropTarget): >+ * dom/Document.cpp: >+ (WebCore::Document::invalidateRenderingDependentRegions): >+ (WebCore::Document::annotatedRegions const): Deleted. >+ (WebCore::Document::setAnnotatedRegions): Deleted. >+ (WebCore::Document::updateAnnotatedRegions): Deleted. >+ (WebCore::Document::invalidateScrollbarDependentRegions): Deleted. >+ (WebCore::Document::updateZOrderDependentRegions): Deleted. >+ * dom/Document.h: >+ (WebCore::Document::setHasAnnotatedRegions): Deleted. >+ (WebCore::Document::setAnnotatedRegionsDirty): Deleted. >+ (WebCore::Document::annotatedRegionsDirty const): Deleted. >+ (WebCore::Document::hasAnnotatedRegions const): Deleted. >+ * html/HTMLCanvasElement.cpp: >+ (WebCore::HTMLCanvasElement::createContext2d): >+ * html/HTMLEmbedElement.cpp: >+ (WebCore::HTMLEmbedElement::rendererIsNeeded): >+ * html/HTMLImageLoader.cpp: >+ (WebCore::HTMLImageLoader::sourceURI const): >+ * html/canvas/CanvasGradient.cpp: >+ (WebCore::CanvasGradient::addColorStop): >+ * html/canvas/CanvasGradient.h: >+ (WebCore::CanvasGradient::setDashboardCompatibilityMode): Deleted. >+ (): Deleted. >+ * html/canvas/CanvasRenderingContext2D.cpp: >+ (WebCore::CanvasRenderingContext2D::create): >+ (WebCore::CanvasRenderingContext2D::CanvasRenderingContext2D): >+ * html/canvas/CanvasRenderingContext2D.h: >+ * html/canvas/CanvasRenderingContext2DBase.cpp: >+ (WebCore::CanvasRenderingContext2DBase::CanvasRenderingContext2DBase): >+ (WebCore::CanvasRenderingContext2DBase::fill): >+ (WebCore::CanvasRenderingContext2DBase::stroke): >+ (WebCore::CanvasRenderingContext2DBase::clip): >+ (WebCore::CanvasRenderingContext2DBase::createLinearGradient): >+ (WebCore::CanvasRenderingContext2DBase::createRadialGradient): >+ (WebCore::CanvasRenderingContext2DBase::prepareGradientForDashboard const): Deleted. >+ (WebCore::CanvasRenderingContext2DBase::clearPathForDashboardBackwardCompatibilityMode): Deleted. >+ * html/canvas/CanvasRenderingContext2DBase.h: >+ * html/canvas/OffscreenCanvasRenderingContext2D.cpp: >+ (WebCore::OffscreenCanvasRenderingContext2D::OffscreenCanvasRenderingContext2D): >+ * html/canvas/PaintRenderingContext2D.cpp: >+ (WebCore::PaintRenderingContext2D::PaintRenderingContext2D): >+ * page/Chrome.cpp: >+ (WebCore::ChromeClient::annotatedRegionsChanged): Deleted. >+ * page/ChromeClient.h: >+ * page/EventHandler.cpp: >+ (WebCore::EventHandler::~EventHandler): >+ * page/FrameView.cpp: >+ (WebCore::FrameView::didLayout): >+ (WebCore::FrameView::didPaintContents): >+ * page/Settings.yaml: >+ * page/mac/EventHandlerMac.mm: >+ (WebCore::EventHandler::needsKeyboardEventDisambiguationQuirks const): >+ * platform/mac/PasteboardMac.mm: >+ (WebCore::Pasteboard::setDragImage): >+ * rendering/RenderInline.cpp: >+ (WebCore::RenderInline::addAnnotatedRegions): Deleted. >+ * rendering/RenderInline.h: >+ * rendering/RenderLayer.cpp: >+ (WebCore::RenderLayer::scrollTo): >+ (WebCore::RenderLayer::setHasHorizontalScrollbar): >+ (WebCore::RenderLayer::setHasVerticalScrollbar): >+ (WebCore::RenderLayer::updateScrollbarsAfterLayout): >+ * rendering/RenderListBox.cpp: >+ (WebCore::RenderListBox::setHasVerticalScrollbar): >+ * rendering/RenderObject.cpp: >+ (WebCore::RenderObject::addAnnotatedRegions): Deleted. >+ (WebCore::RenderObject::collectAnnotatedRegions): Deleted. >+ * rendering/RenderObject.h: >+ (WebCore::AnnotatedRegionValue::operator== const): Deleted. >+ (WebCore::AnnotatedRegionValue::operator!= const): Deleted. >+ * rendering/style/RenderStyle.cpp: >+ (WebCore::rareNonInheritedDataChangeRequiresLayout): >+ (WebCore::RenderStyle::initialDashboardRegions): Deleted. >+ (WebCore::RenderStyle::noneDashboardRegions): Deleted. >+ (WebCore::RenderStyle::setDashboardRegion): Deleted. >+ * rendering/style/RenderStyle.h: >+ (WebCore::RenderStyle::dashboardRegions const): Deleted. >+ (WebCore::RenderStyle::setDashboardRegions): Deleted. >+ * rendering/style/StyleDashboardRegion.h: Removed. >+ * rendering/style/StyleRareNonInheritedData.cpp: >+ (WebCore::StyleRareNonInheritedData::operator== const): >+ * rendering/style/StyleRareNonInheritedData.h: >+ * xml/XMLHttpRequest.cpp: >+ (WebCore::XMLHttpRequest::send): >+ (WebCore::XMLHttpRequest::setRequestHeader): >+ (WebCore::XMLHttpRequest::usesDashboardBackwardCompatibilityMode const): Deleted. >+ * xml/XMLHttpRequest.h: >+ > 2019-06-05 Said Abou-Hallawa <sabouhallawa@apple.com> > > REGRESSION (r243121): Load event should not be fired while animating the 'externalResourcesRequired' attribute >Index: Source/WebCore/Configurations/FeatureDefines.xcconfig >=================================================================== >--- Source/WebCore/Configurations/FeatureDefines.xcconfig (revision 246172) >+++ Source/WebCore/Configurations/FeatureDefines.xcconfig (working copy) >@@ -117,9 +117,6 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ; > ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); > ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; > >-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME)); >-ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT; >- > ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE; > > ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT; >@@ -445,4 +442,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >Index: Source/WebCore/PAL/ChangeLog >=================================================================== >--- Source/WebCore/PAL/ChangeLog (revision 246172) >+++ Source/WebCore/PAL/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2019-06-06 Ryosuke Niwa <rniwa@webkit.org> >+ >+ Remove dashboard code >+ https://bugs.webkit.org/show_bug.cgi?id=198624 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Configurations/FeatureDefines.xcconfig: >+ > 2019-06-05 Alex Christensen <achristensen@webkit.org> > > Progress towards resurrecting Mac CMake build >Index: Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig >=================================================================== >--- Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (revision 246172) >+++ Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (working copy) >@@ -117,9 +117,6 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ; > ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); > ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; > >-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME)); >-ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT; >- > ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE; > > ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT; >@@ -445,4 +442,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >Index: Source/WebCore/WebCore.xcodeproj/project.pbxproj >=================================================================== >--- Source/WebCore/WebCore.xcodeproj/project.pbxproj (revision 246172) >+++ Source/WebCore/WebCore.xcodeproj/project.pbxproj (working copy) >@@ -3192,7 +3192,6 @@ > A80E6D030A1989CA007FB8C5 /* CSSMediaRule.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CD90A1989CA007FB8C5 /* CSSMediaRule.h */; settings = {ATTRIBUTES = (Private, ); }; }; > A80E6D040A1989CA007FB8C5 /* Counter.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CDA0A1989CA007FB8C5 /* Counter.h */; settings = {ATTRIBUTES = (Private, ); }; }; > A80E6D080A1989CA007FB8C5 /* CSSInitialValue.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CDE0A1989CA007FB8C5 /* CSSInitialValue.h */; }; >- A80E6D0B0A1989CA007FB8C5 /* DashboardRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */; }; > A80E6D0C0A1989CA007FB8C5 /* CSSStyleRule.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CE20A1989CA007FB8C5 /* CSSStyleRule.h */; settings = {ATTRIBUTES = (Private, ); }; }; > A80E6D0D0A1989CA007FB8C5 /* CSSRule.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CE30A1989CA007FB8C5 /* CSSRule.h */; settings = {ATTRIBUTES = (Private, ); }; }; > A80E6DFC0A199067007FB8C5 /* StyleProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6DFA0A199067007FB8C5 /* StyleProperties.h */; settings = {ATTRIBUTES = (Private, ); }; }; >@@ -3762,7 +3761,6 @@ > BC5EB5E50E81BF6D00B25965 /* StyleSurroundData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB5E40E81BF6D00B25965 /* StyleSurroundData.h */; settings = {ATTRIBUTES = (Private, ); }; }; > BC5EB6680E81CB7100B25965 /* RenderStyleConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB6670E81CB7100B25965 /* RenderStyleConstants.h */; settings = {ATTRIBUTES = (Private, ); }; }; > BC5EB67B0E81D3BE00B25965 /* StyleBoxData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB67A0E81D3BE00B25965 /* StyleBoxData.h */; settings = {ATTRIBUTES = (Private, ); }; }; >- BC5EB67F0E81D4A700B25965 /* StyleDashboardRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */; settings = {ATTRIBUTES = (Private, ); }; }; > BC5EB69A0E81DA6300B25965 /* StyleVisualData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB6980E81DA6300B25965 /* StyleVisualData.h */; settings = {ATTRIBUTES = (Private, ); }; }; > BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB69D0E81DAEB00B25965 /* FillLayer.h */; settings = {ATTRIBUTES = (Private, ); }; }; > BC5EB6A30E81DC4F00B25965 /* StyleBackgroundData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB6A10E81DC4F00B25965 /* StyleBackgroundData.h */; settings = {ATTRIBUTES = (Private, ); }; }; >@@ -11609,7 +11607,6 @@ > A80E6CDC0A1989CA007FB8C5 /* CSSRule.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSRule.cpp; sourceTree = "<group>"; }; > A80E6CDE0A1989CA007FB8C5 /* CSSInitialValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSInitialValue.h; sourceTree = "<group>"; }; > A80E6CDF0A1989CA007FB8C5 /* CSSRuleList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSRuleList.cpp; sourceTree = "<group>"; }; >- A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DashboardRegion.h; sourceTree = "<group>"; }; > A80E6CE20A1989CA007FB8C5 /* CSSStyleRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSStyleRule.h; sourceTree = "<group>"; }; > A80E6CE30A1989CA007FB8C5 /* CSSRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSRule.h; sourceTree = "<group>"; }; > A80E6DF90A199067007FB8C5 /* StyleProperties.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StyleProperties.cpp; sourceTree = "<group>"; }; >@@ -12892,7 +12889,6 @@ > BC5EB6670E81CB7100B25965 /* RenderStyleConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderStyleConstants.h; sourceTree = "<group>"; }; > BC5EB67A0E81D3BE00B25965 /* StyleBoxData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBoxData.h; sourceTree = "<group>"; }; > BC5EB67C0E81D42000B25965 /* StyleBoxData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleBoxData.cpp; sourceTree = "<group>"; }; >- BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleDashboardRegion.h; sourceTree = "<group>"; }; > BC5EB6970E81DA6300B25965 /* StyleVisualData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleVisualData.cpp; sourceTree = "<group>"; }; > BC5EB6980E81DA6300B25965 /* StyleVisualData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleVisualData.h; sourceTree = "<group>"; }; > BC5EB69C0E81DAEB00B25965 /* FillLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FillLayer.cpp; sourceTree = "<group>"; }; >@@ -24906,7 +24902,6 @@ > 1C0AA16A21940DC700896829 /* StyleColorScheme.h */, > 9DAC7C561AF2CB6400437C44 /* StyleContentAlignmentData.h */, > BC779E151BB226A200CAA8BF /* StyleCustomPropertyData.h */, >- BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */, > BC5EB8B60E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp */, > BC5EB8B70E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h */, > 319AE061142D6B24006563A1 /* StyleFilterData.cpp */, >@@ -26727,7 +26722,6 @@ > 9444CBDD1D8861580073A074 /* CSSVariableData.h */, > 9444CBDC1D8861580073A074 /* CSSVariableReferenceValue.cpp */, > 9444CBDB1D8861580073A074 /* CSSVariableReferenceValue.h */, >- A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */, > 9479492A1E032EDB00018D85 /* DeprecatedCSSOMCounter.h */, > 930705C709E0C95F00B17FE4 /* DeprecatedCSSOMCounter.idl */, > 9479493B1E045CE100018D85 /* DeprecatedCSSOMPrimitiveValue.cpp */, >@@ -28767,7 +28761,6 @@ > 4B1E13E721790D660042CF98 /* CustomPaintCanvas.h in Headers */, > 4B7AE4932177B56F00C59959 /* CustomPaintImage.h in Headers */, > A8CB413E0E8633FD0032C4F0 /* DashArray.h in Headers */, >- A80E6D0B0A1989CA007FB8C5 /* DashboardRegion.h in Headers */, > 97BC6A211505F081001B74AC /* Database.h in Headers */, > 97BC6A241505F081001B74AC /* DatabaseAuthorizer.h in Headers */, > 97BC6A251505F081001B74AC /* DatabaseCallback.h in Headers */, >@@ -31545,7 +31538,6 @@ > 1C0AA16D21940DC800896829 /* StyleColorScheme.h in Headers */, > 9DAC7C571AF2CB6400437C44 /* StyleContentAlignmentData.h in Headers */, > BC779E171BB227CA00CAA8BF /* StyleCustomPropertyData.h in Headers */, >- BC5EB67F0E81D4A700B25965 /* StyleDashboardRegion.h in Headers */, > A8C4A7FD09D563270003AC8D /* StyledElement.h in Headers */, > BC5EB8B90E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h in Headers */, > 319AE064142D6B24006563A1 /* StyleFilterData.h in Headers */, >Index: Source/WebCore/css/CSSCalculationValue.cpp >=================================================================== >--- Source/WebCore/css/CSSCalculationValue.cpp (revision 246172) >+++ Source/WebCore/css/CSSCalculationValue.cpp (working copy) >@@ -143,9 +143,6 @@ static bool hasDoubleValue(CSSPrimitiveV > case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH: > case CSSPrimitiveValue::CSS_PROPERTY_ID: > case CSSPrimitiveValue::CSS_VALUE_ID: >-#if ENABLE(DASHBOARD_SUPPORT) >- case CSSPrimitiveValue::CSS_DASHBOARD_REGION: >-#endif > return false; > }; > ASSERT_NOT_REACHED(); >Index: Source/WebCore/css/CSSComputedStyleDeclaration.cpp >=================================================================== >--- Source/WebCore/css/CSSComputedStyleDeclaration.cpp (revision 246172) >+++ Source/WebCore/css/CSSComputedStyleDeclaration.cpp (working copy) >@@ -84,10 +84,6 @@ > #include "CSSGridTemplateAreasValue.h" > #include "RenderGrid.h" > >-#if ENABLE(DASHBOARD_SUPPORT) >-#include "DashboardRegion.h" >-#endif >- > namespace WebCore { > > WTF_MAKE_ISO_ALLOCATED_IMPL(CSSComputedStyleDeclaration); >@@ -305,9 +301,6 @@ static const CSSPropertyID computedPrope > #if ENABLE(CURSOR_VISIBILITY) > CSSPropertyWebkitCursorVisibility, > #endif >-#if ENABLE(DASHBOARD_SUPPORT) >- CSSPropertyWebkitDashboardRegion, >-#endif > CSSPropertyAlignContent, > CSSPropertyAlignItems, > CSSPropertyAlignSelf, >@@ -3559,38 +3552,6 @@ RefPtr<CSSValue> ComputedStyleExtractor: > if (style.boxSizing() == BoxSizing::ContentBox) > return cssValuePool.createIdentifierValue(CSSValueContentBox); > return cssValuePool.createIdentifierValue(CSSValueBorderBox); >-#if ENABLE(DASHBOARD_SUPPORT) >- case CSSPropertyWebkitDashboardRegion: >- { >- const Vector<StyleDashboardRegion>& regions = style.dashboardRegions(); >- unsigned count = regions.size(); >- if (count == 1 && regions[0].type == StyleDashboardRegion::None) >- return cssValuePool.createIdentifierValue(CSSValueNone); >- >- RefPtr<DashboardRegion> firstRegion; >- DashboardRegion* previousRegion = nullptr; >- for (unsigned i = 0; i < count; i++) { >- auto region = DashboardRegion::create(); >- StyleDashboardRegion styleRegion = regions[i]; >- >- region->m_label = styleRegion.label; >- LengthBox offset = styleRegion.offset; >- region->setTop(zoomAdjustedPixelValue(offset.top().value(), style)); >- region->setRight(zoomAdjustedPixelValue(offset.right().value(), style)); >- region->setBottom(zoomAdjustedPixelValue(offset.bottom().value(), style)); >- region->setLeft(zoomAdjustedPixelValue(offset.left().value(), style)); >- region->m_isRectangle = (styleRegion.type == StyleDashboardRegion::Rectangle); >- region->m_isCircle = (styleRegion.type == StyleDashboardRegion::Circle); >- >- if (previousRegion) >- previousRegion->m_next = region.copyRef(); >- else >- firstRegion = region.copyRef(); >- previousRegion = region.ptr(); >- } >- return cssValuePool.createValue(WTFMove(firstRegion)); >- } >-#endif > case CSSPropertyAnimationDelay: > return delayValue(style.animations()); > case CSSPropertyAnimationDirection: { >Index: Source/WebCore/css/CSSPrimitiveValue.cpp >=================================================================== >--- Source/WebCore/css/CSSPrimitiveValue.cpp (revision 246172) >+++ Source/WebCore/css/CSSPrimitiveValue.cpp (working copy) >@@ -45,11 +45,6 @@ > #include <wtf/text/StringBuilder.h> > #include <wtf/text/StringConcatenateNumbers.h> > >-#if ENABLE(DASHBOARD_SUPPORT) >-#include "DashboardRegion.h" >-#endif >- >- > namespace WebCore { > > static inline bool isValidCSSUnitTypeForDoubleConversion(CSSPrimitiveValue::UnitType unitType) >@@ -110,9 +105,6 @@ static inline bool isValidCSSUnitTypeFor > case CSSPrimitiveValue::CSS_UNKNOWN: > case CSSPrimitiveValue::CSS_URI: > case CSSPrimitiveValue::CSS_VALUE_ID: >-#if ENABLE(DASHBOARD_SUPPORT) >- case CSSPrimitiveValue::CSS_DASHBOARD_REGION: >-#endif > return false; > } > >@@ -175,9 +167,6 @@ static inline bool isStringType(CSSPrimi > case CSSPrimitiveValue::CSS_VMAX: > case CSSPrimitiveValue::CSS_VMIN: > case CSSPrimitiveValue::CSS_VW: >-#if ENABLE(DASHBOARD_SUPPORT) >- case CSSPrimitiveValue::CSS_DASHBOARD_REGION: >-#endif > return false; > } > >@@ -437,15 +426,6 @@ void CSSPrimitiveValue::init(Ref<Quad>&& > m_value.quad = &quad.leakRef(); > } > >-#if ENABLE(DASHBOARD_SUPPORT) >-void CSSPrimitiveValue::init(RefPtr<DashboardRegion>&& r) >-{ >- m_primitiveUnitType = CSS_DASHBOARD_REGION; >- m_hasCachedCSSText = false; >- m_value.region = r.leakRef(); >-} >-#endif >- > void CSSPrimitiveValue::init(Ref<Pair>&& p) > { > m_primitiveUnitType = CSS_PAIR; >@@ -496,12 +476,6 @@ void CSSPrimitiveValue::cleanup() > case CSS_PAIR: > m_value.pair->deref(); > break; >-#if ENABLE(DASHBOARD_SUPPORT) >- case CSS_DASHBOARD_REGION: >- if (m_value.region) >- m_value.region->deref(); >- break; >-#endif > case CSS_CALC: > m_value.calc->deref(); > break; >@@ -1045,42 +1019,6 @@ ALWAYS_INLINE String CSSPrimitiveValue:: > return color().cssText(); > case CSS_PAIR: > return pairValue()->cssText(); >-#if ENABLE(DASHBOARD_SUPPORT) >- case CSS_DASHBOARD_REGION: { >- StringBuilder result; >- for (DashboardRegion* region = dashboardRegionValue(); region; region = region->m_next.get()) { >- if (!result.isEmpty()) >- result.append(' '); >- result.appendLiteral("dashboard-region("); >- result.append(region->m_label); >- if (region->m_isCircle) >- result.appendLiteral(" circle"); >- else if (region->m_isRectangle) >- result.appendLiteral(" rectangle"); >- else >- break; >- if (region->top()->m_primitiveUnitType == CSS_VALUE_ID && region->top()->valueID() == CSSValueInvalid) { >- ASSERT(region->right()->m_primitiveUnitType == CSS_VALUE_ID); >- ASSERT(region->bottom()->m_primitiveUnitType == CSS_VALUE_ID); >- ASSERT(region->left()->m_primitiveUnitType == CSS_VALUE_ID); >- ASSERT(region->right()->valueID() == CSSValueInvalid); >- ASSERT(region->bottom()->valueID() == CSSValueInvalid); >- ASSERT(region->left()->valueID() == CSSValueInvalid); >- } else { >- result.append(' '); >- result.append(region->top()->cssText()); >- result.append(' '); >- result.append(region->right()->cssText()); >- result.append(' '); >- result.append(region->bottom()->cssText()); >- result.append(' '); >- result.append(region->left()->cssText()); >- } >- result.append(')'); >- } >- return result.toString(); >- } >-#endif > case CSS_CALC: > return m_value.calc->cssText(); > case CSS_SHAPE: >@@ -1175,10 +1113,6 @@ bool CSSPrimitiveValue::equals(const CSS > return color() == other.color(); > case CSS_PAIR: > return m_value.pair && other.m_value.pair && m_value.pair->equals(*other.m_value.pair); >-#if ENABLE(DASHBOARD_SUPPORT) >- case CSS_DASHBOARD_REGION: >- return m_value.region && other.m_value.region && m_value.region->equals(*other.m_value.region); >-#endif > case CSS_CALC: > return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc); > case CSS_SHAPE: >Index: Source/WebCore/css/CSSPrimitiveValue.h >=================================================================== >--- Source/WebCore/css/CSSPrimitiveValue.h (revision 246172) >+++ Source/WebCore/css/CSSPrimitiveValue.h (working copy) >@@ -37,7 +37,6 @@ class CSSBasicShape; > class CSSCalcValue; > class CSSToLengthConversionData; > class Counter; >-class DashboardRegion; > class DeprecatedCSSOMPrimitiveValue; > class Pair; > class Quad; >@@ -112,9 +111,6 @@ public: > CSS_DPCM = 32, > CSS_FR = 33, > CSS_PAIR = 100, // We envision this being exposed as a means of getting computed style values for pairs (border-spacing/radius, background-position, etc.) >-#if ENABLE(DASHBOARD_SUPPORT) >- CSS_DASHBOARD_REGION = 101, // FIXME: Dashboard region should not be a primitive value. >-#endif > CSS_UNICODE_RANGE = 102, > > // These are from CSS3 Values and Units, but that isn't a finished standard yet >@@ -268,10 +264,6 @@ public: > CSSBasicShape* shapeValue() const { return m_primitiveUnitType != CSS_SHAPE ? nullptr : m_value.shape; } > CSSValueID valueID() const { return m_primitiveUnitType == CSS_VALUE_ID ? m_value.valueID : CSSValueInvalid; } > >-#if ENABLE(DASHBOARD_SUPPORT) >- DashboardRegion* dashboardRegionValue() const { return m_primitiveUnitType != CSS_DASHBOARD_REGION ? nullptr : m_value.region; } >-#endif >- > template<typename T> inline operator T() const; // Defined in CSSPrimitiveValueMappings.h > > String customCSSText() const; >@@ -321,10 +313,6 @@ private: > void init(Ref<Quad>&&); > void init(Ref<Rect>&&); > >-#if ENABLE(DASHBOARD_SUPPORT) >- void init(RefPtr<DashboardRegion>&&); // FIXME: Dashboard region should not be a primitive value. >-#endif >- > Optional<double> doubleValueInternal(UnitType targetUnitType) const; > > double computeLengthDouble(const CSSToLengthConversionData&) const; >@@ -342,7 +330,6 @@ private: > Quad* quad; > const Color* color; > Pair* pair; >- DashboardRegion* region; > CSSBasicShape* shape; > CSSCalcValue* calc; > const CSSFontFamily* fontFamily; >Index: Source/WebCore/css/CSSProperties.json >=================================================================== >--- Source/WebCore/css/CSSProperties.json (revision 246172) >+++ Source/WebCore/css/CSSProperties.json (working copy) >@@ -6883,14 +6883,6 @@ > }, > "status": "non-standard" > }, >- "-webkit-dashboard-region": { >- "codegen-properties": { >- "name-for-methods": "DashboardRegions", >- "custom": "Value", >- "enable-if": "ENABLE_DASHBOARD_SUPPORT" >- }, >- "status": "non-standard" >- }, > "-webkit-overflow-scrolling": { > "inherited": true, > "values": [ >Index: Source/WebCore/css/CSSValueKeywords.in >=================================================================== >--- Source/WebCore/css/CSSValueKeywords.in (revision 246172) >+++ Source/WebCore/css/CSSValueKeywords.in (working copy) >@@ -1223,7 +1223,6 @@ repeating-conic-gradient > -webkit-named-image > filter > -webkit-filter >-dashboard-region > #if defined(ENABLE_CSS_PAINTING_API) && ENABLE_CSS_PAINTING_API > paint > #endif >Index: Source/WebCore/css/DashboardRegion.h >=================================================================== >--- Source/WebCore/css/DashboardRegion.h (revision 246172) >+++ Source/WebCore/css/DashboardRegion.h (nonexistent) >@@ -1,51 +0,0 @@ >-/* >- * (C) 1999-2003 Lars Knoll (knoll@kde.org) >- * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- */ >- >-#pragma once >- >-#if ENABLE(DASHBOARD_SUPPORT) >- >-#include "Rect.h" >- >-namespace WebCore { >- >-class DashboardRegion final : public RectBase, public RefCounted<DashboardRegion> { >-public: >- static Ref<DashboardRegion> create() { return adoptRef(*new DashboardRegion); } >- bool equals(const DashboardRegion& other) const >- { >- return m_label == other.m_label && m_geometryType == other.m_geometryType >- && m_isCircle == other.m_isCircle && m_isRectangle == other.m_isRectangle >- && m_next ? other.m_next && m_next->equals(*other.m_next) : !other.m_next; >- } >- >- RefPtr<DashboardRegion> m_next; >- String m_label; >- String m_geometryType; >- bool m_isCircle : 1; >- bool m_isRectangle : 1; >- >-private: >- DashboardRegion() : m_isCircle(false), m_isRectangle(false) { } >-}; >- >-} // namespace WebCore >- >-#endif > >Property changes on: Source/WebCore/css/DashboardRegion.h >___________________________________________________________________ >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Index: Source/WebCore/css/StyleBuilderCustom.h >=================================================================== >--- Source/WebCore/css/StyleBuilderCustom.h (revision 246172) >+++ Source/WebCore/css/StyleBuilderCustom.h (working copy) >@@ -37,7 +37,6 @@ > #include "Counter.h" > #include "CounterContent.h" > #include "CursorList.h" >-#include "DashboardRegion.h" > #include "ElementAncestorIterator.h" > #include "FontVariantBuilder.h" > #include "Frame.h" >@@ -129,9 +128,6 @@ public: > static void applyValueVerticalAlign(StyleResolver&, CSSValue&); > static void applyInitialTextAlign(StyleResolver&); > static void applyValueTextAlign(StyleResolver&, CSSValue&); >-#if ENABLE(DASHBOARD_SUPPORT) >- static void applyValueWebkitDashboardRegion(StyleResolver&, CSSValue&); >-#endif > static void applyValueWebkitLocale(StyleResolver&, CSSValue&); > static void applyValueWebkitTextOrientation(StyleResolver&, CSSValue&); > #if ENABLE(TEXT_AUTOSIZING) >@@ -328,54 +324,6 @@ inline void StyleBuilderCustom::applyVal > styleResolver.style()->setVerticalAlignLength(primitiveValue.convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(styleResolver.state().cssToLengthConversionData())); > } > >-#if ENABLE(DASHBOARD_SUPPORT) >- >-static Length convertToIntLength(const CSSPrimitiveValue* primitiveValue, const CSSToLengthConversionData& conversionData) >-{ >- return primitiveValue ? primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(conversionData) : Length(Undefined); >-} >- >-inline void StyleBuilderCustom::applyValueWebkitDashboardRegion(StyleResolver& styleResolver, CSSValue& value) >-{ >- auto& primitiveValue = downcast<CSSPrimitiveValue>(value); >- if (primitiveValue.valueID() == CSSValueNone) { >- styleResolver.style()->setDashboardRegions(RenderStyle::noneDashboardRegions()); >- return; >- } >- >- auto* region = primitiveValue.dashboardRegionValue(); >- if (!region) >- return; >- >- auto* first = region; >- while (region) { >- Length top = convertToIntLength(region->top(), styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f)); >- Length right = convertToIntLength(region->right(), styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f)); >- Length bottom = convertToIntLength(region->bottom(), styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f)); >- Length left = convertToIntLength(region->left(), styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f)); >- >- if (top.isUndefined()) >- top = Length(); >- if (right.isUndefined()) >- right = Length(); >- if (bottom.isUndefined()) >- bottom = Length(); >- if (left.isUndefined()) >- left = Length(); >- >- if (region->m_isCircle) >- styleResolver.style()->setDashboardRegion(StyleDashboardRegion::Circle, region->m_label, WTFMove(top), WTFMove(right), WTFMove(bottom), WTFMove(left), region != first); >- else if (region->m_isRectangle) >- styleResolver.style()->setDashboardRegion(StyleDashboardRegion::Rectangle, region->m_label, WTFMove(top), WTFMove(right), WTFMove(bottom), WTFMove(left), region != first); >- >- region = region->m_next.get(); >- } >- >- styleResolver.document().setHasAnnotatedRegions(true); >-} >- >-#endif // ENABLE(DASHBOARD_SUPPORT) >- > #if ENABLE(CSS_IMAGE_RESOLUTION) > > inline void StyleBuilderCustom::applyInheritImageResolution(StyleResolver& styleResolver) >Index: Source/WebCore/css/StyleResolver.cpp >=================================================================== >--- Source/WebCore/css/StyleResolver.cpp (revision 246172) >+++ Source/WebCore/css/StyleResolver.cpp (working copy) >@@ -113,13 +113,6 @@ > #include <wtf/Vector.h> > #include <wtf/text/AtomicStringHash.h> > >- >-#if ENABLE(DASHBOARD_SUPPORT) >-#endif >- >-#if ENABLE(VIDEO_TRACK) >-#endif >- > namespace WebCore { > > using namespace HTMLNames; >Index: Source/WebCore/css/parser/CSSPropertyParser.cpp >=================================================================== >--- Source/WebCore/css/parser/CSSPropertyParser.cpp (revision 246172) >+++ Source/WebCore/css/parser/CSSPropertyParser.cpp (working copy) >@@ -63,9 +63,6 @@ > #include "CSSVariableParser.h" > #include "CSSVariableReferenceValue.h" > #include "Counter.h" >-#if ENABLE(DASHBOARD_SUPPORT) >-#include "DashboardRegion.h" >-#endif > #include "FontFace.h" > #include "HashTools.h" > // FIXME-NEWPARSER: Replace Pair and Rect with actual CSSValue subclasses (CSSValuePair and CSSQuadValue). >@@ -3789,103 +3786,6 @@ static RefPtr<CSSValue> consumeColorSche > > #endif > >-#if ENABLE(DASHBOARD_SUPPORT) >- >-static RefPtr<CSSValue> consumeWebkitDashboardRegion(CSSParserTokenRange& range, CSSParserMode mode) >-{ >- if (range.atEnd()) >- return nullptr; >- >- if (range.peek().id() == CSSValueNone) >- return consumeIdent(range); >- >- auto firstRegion = DashboardRegion::create(); >- DashboardRegion* region = nullptr; >- >- bool requireCommas = false; >- >- while (!range.atEnd()) { >- if (!region) >- region = firstRegion.ptr(); >- else { >- auto nextRegion = DashboardRegion::create(); >- region->m_next = nextRegion.copyRef(); >- region = nextRegion.ptr(); >- } >- >- if (range.peek().functionId() != CSSValueDashboardRegion) >- return nullptr; >- >- CSSParserTokenRange rangeCopy = range; >- CSSParserTokenRange args = consumeFunction(rangeCopy); >- if (rangeCopy.end() == args.end()) >- return nullptr; // No ) was found. Be strict about this, since tests are. >- >- // First arg is a label. >- if (args.peek().type() != IdentToken) >- return nullptr; >- region->m_label = args.consumeIncludingWhitespace().value().toString(); >- >- // Comma is optional, so don't fail if we can't consume one. >- requireCommas = consumeCommaIncludingWhitespace(args); >- >- // Second arg is a type. >- if (args.peek().type() != IdentToken) >- return nullptr; >- region->m_geometryType = args.consumeIncludingWhitespace().value().toString(); >- if (equalLettersIgnoringASCIICase(region->m_geometryType, "circle")) >- region->m_isCircle = true; >- else if (equalLettersIgnoringASCIICase(region->m_geometryType, "rectangle")) >- region->m_isRectangle = true; >- else >- return nullptr; >- >- if (args.atEnd()) { >- // This originally used CSSValueInvalid by accident. It might be more logical to use something else. >- RefPtr<CSSPrimitiveValue> amount = CSSValuePool::singleton().createIdentifierValue(CSSValueInvalid); >- region->setTop(amount.copyRef()); >- region->setRight(amount.copyRef()); >- region->setBottom(amount.copyRef()); >- region->setLeft(WTFMove(amount)); >- range = rangeCopy; >- continue; >- } >- >- // Next four arguments must be offset numbers or auto. >- for (int i = 0; i < 4; ++i) { >- if (args.atEnd() || (requireCommas && !consumeCommaIncludingWhitespace(args))) >- return nullptr; >- >- if (args.atEnd()) >- return nullptr; >- >- RefPtr<CSSPrimitiveValue> amount; >- if (args.peek().id() == CSSValueAuto) >- amount = consumeIdent(args); >- else >- amount = consumeLength(args, mode, ValueRangeAll); >- >- if (!i) >- region->setTop(WTFMove(amount)); >- else if (i == 1) >- region->setRight(WTFMove(amount)); >- else if (i == 2) >- region->setBottom(WTFMove(amount)); >- else >- region->setLeft(WTFMove(amount)); >- } >- >- if (!args.atEnd()) >- return nullptr; >- >- range = rangeCopy; >- } >- >- return CSSValuePool::singleton().createValue(RefPtr<DashboardRegion>(WTFMove(firstRegion))); >-} >- >-#endif >- > RefPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID property, CSSPropertyID currentShorthand) > { > if (CSSParserFastPaths::isKeywordPropertyID(property)) { >@@ -4342,10 +4242,6 @@ RefPtr<CSSValue> CSSPropertyParser::pars > return nullptr; > return consumeColorScheme(m_range); > #endif >-#if ENABLE(DASHBOARD_SUPPORT) >- case CSSPropertyWebkitDashboardRegion: >- return consumeWebkitDashboardRegion(m_range, m_context.mode); >-#endif > default: > return nullptr; > } >Index: Source/WebCore/dom/DataTransfer.cpp >=================================================================== >--- Source/WebCore/dom/DataTransfer.cpp (revision 246172) >+++ Source/WebCore/dom/DataTransfer.cpp (working copy) >@@ -486,12 +486,6 @@ Ref<DataTransfer> DataTransfer::createFo > Ref<DataTransfer> DataTransfer::createForUpdatingDropTarget(Document& document, std::unique_ptr<Pasteboard>&& pasteboard, DragOperation sourceOperation, bool draggingFiles) > { > auto mode = DataTransfer::StoreMode::Protected; >-#if ENABLE(DASHBOARD_SUPPORT) >- if (document.settings().usesDashboardBackwardCompatibilityMode() && document.securityOrigin().isLocal()) >- mode = DataTransfer::StoreMode::Readonly; >-#else >- UNUSED_PARAM(document); >-#endif > auto dataTransfer = adoptRef(*new DataTransfer(mode, WTFMove(pasteboard), draggingFiles ? Type::DragAndDropFiles : Type::DragAndDropData)); > dataTransfer->setSourceOperation(sourceOperation); > dataTransfer->m_originIdentifier = document.originIdentifierForPasteboard(); >Index: Source/WebCore/dom/Document.cpp >=================================================================== >--- Source/WebCore/dom/Document.cpp (revision 246172) >+++ Source/WebCore/dom/Document.cpp (working copy) >@@ -4051,48 +4051,8 @@ void Document::elementInActiveChainDidDe > m_activeElement = m_activeElement->parentElement(); > } > >-#if ENABLE(DASHBOARD_SUPPORT) >-const Vector<AnnotatedRegionValue>& Document::annotatedRegions() const >+void Document::invalidateRenderingDependentRegions() > { >- return m_annotatedRegions; >-} >- >-void Document::setAnnotatedRegions(const Vector<AnnotatedRegionValue>& regions) >-{ >- m_annotatedRegions = regions; >- setAnnotatedRegionsDirty(false); >-} >- >-void Document::updateAnnotatedRegions() >-{ >- if (!hasAnnotatedRegions()) >- return; >- >- Vector<AnnotatedRegionValue> newRegions; >- renderBox()->collectAnnotatedRegions(newRegions); // FIXME. >- if (newRegions == annotatedRegions()) >- return; >- >- setAnnotatedRegions(newRegions); >- >- if (Page* page = this->page()) >- page->chrome().client().annotatedRegionsChanged(); >-} >-#endif >- >-void Document::invalidateRenderingDependentRegions(AnnotationsAction annotationsAction) >-{ >-#if ENABLE(DASHBOARD_SUPPORT) >- // FIXME: we don't have a good invalidation/update policy for Dashboard regions. They get eagerly updated >- // on forced layouts, and don't need to be. >- if (annotationsAction == AnnotationsAction::Update) >- updateAnnotatedRegions(); >- else >- setAnnotatedRegionsDirty(); >-#else >- UNUSED_PARAM(annotationsAction); >-#endif >- > #if PLATFORM(IOS_FAMILY) && ENABLE(TOUCH_EVENTS) > setTouchEventRegionsNeedUpdate(); > #endif >@@ -4107,22 +4067,6 @@ void Document::invalidateRenderingDepend > #endif > } > >-void Document::invalidateScrollbarDependentRegions() >-{ >-#if ENABLE(DASHBOARD_SUPPORT) >- if (hasAnnotatedRegions()) >- setAnnotatedRegionsDirty(); >-#endif >-} >- >-void Document::updateZOrderDependentRegions() >-{ >-#if ENABLE(DASHBOARD_SUPPORT) >- if (annotatedRegionsDirty()) >- updateAnnotatedRegions(); >-#endif >-} >- > bool Document::setFocusedElement(Element* element, FocusDirection direction, FocusRemovalEventsMode eventsMode) > { > RefPtr<Element> newFocusedElement = element; >Index: Source/WebCore/dom/Document.h >=================================================================== >--- Source/WebCore/dom/Document.h (revision 246172) >+++ Source/WebCore/dom/Document.h (working copy) >@@ -218,10 +218,6 @@ using PlatformDisplayID = uint32_t; > class TransformSource; > #endif > >-#if ENABLE(DASHBOARD_SUPPORT) >-struct AnnotatedRegionValue; >-#endif >- > #if ENABLE(TOUCH_EVENTS) || ENABLE(IOS_TOUCH_EVENTS) > class Touch; > class TouchList; >@@ -1129,15 +1125,7 @@ public: > > WEBCORE_EXPORT String displayStringModifiedByEncoding(const String&) const; > >-#if ENABLE(DASHBOARD_SUPPORT) >- void setHasAnnotatedRegions(bool f) { m_hasAnnotatedRegions = f; } >- WEBCORE_EXPORT const Vector<AnnotatedRegionValue>& annotatedRegions() const; >-#endif >- >- enum class AnnotationsAction { Invalidate, Update }; >- void invalidateRenderingDependentRegions(AnnotationsAction = AnnotationsAction::Invalidate); >- void invalidateScrollbarDependentRegions(); >- void updateZOrderDependentRegions(); >+ void invalidateRenderingDependentRegions(); > > void removeAllEventListeners() final; > >@@ -1613,14 +1601,6 @@ private: > > void wheelEventHandlersChanged(); > >-#if ENABLE(DASHBOARD_SUPPORT) >- void setAnnotatedRegionsDirty(bool f = true) { m_annotatedRegionsDirty = f; } >- bool annotatedRegionsDirty() const { return m_annotatedRegionsDirty; } >- bool hasAnnotatedRegions () const { return m_hasAnnotatedRegions; } >- void setAnnotatedRegions(const Vector<AnnotatedRegionValue>&); >- void updateAnnotatedRegions(); >-#endif >- > HttpEquivPolicy httpEquivPolicy() const; > AXObjectCache* existingAXObjectCacheSlow() const; > >@@ -1770,12 +1750,6 @@ private: > bool m_allowsColorSchemeTransformations { true }; > #endif > >-#if ENABLE(DASHBOARD_SUPPORT) >- Vector<AnnotatedRegionValue> m_annotatedRegions; >- bool m_hasAnnotatedRegions { false }; >- bool m_annotatedRegionsDirty { false }; >-#endif >- > HashMap<String, RefPtr<HTMLCanvasElement>> m_cssCanvasElements; > > HashSet<Element*> m_documentSuspensionCallbackElements; >Index: Source/WebCore/html/HTMLCanvasElement.cpp >=================================================================== >--- Source/WebCore/html/HTMLCanvasElement.cpp (revision 246172) >+++ Source/WebCore/html/HTMLCanvasElement.cpp (working copy) >@@ -329,11 +329,6 @@ CanvasRenderingContext2D* HTMLCanvasElem > ASSERT_UNUSED(HTMLCanvasElement::is2dType(type), type); > ASSERT(!m_context); > >- bool usesDashboardCompatibilityMode = false; >-#if ENABLE(DASHBOARD_SUPPORT) >- usesDashboardCompatibilityMode = document().settings().usesDashboardBackwardCompatibilityMode(); >-#endif >- > // Make sure we don't use more pixel memory than the system can support. > size_t requestedPixelMemory = 4 * width() * height(); > if (activePixelMemory + requestedPixelMemory > maxActivePixelMemory()) { >@@ -345,7 +340,7 @@ CanvasRenderingContext2D* HTMLCanvasElem > return nullptr; > } > >- m_context = CanvasRenderingContext2D::create(*this, document().inQuirksMode(), usesDashboardCompatibilityMode); >+ m_context = CanvasRenderingContext2D::create(*this, document().inQuirksMode()); > > downcast<CanvasRenderingContext2D>(*m_context).setUsesDisplayListDrawing(m_usesDisplayListDrawing); > downcast<CanvasRenderingContext2D>(*m_context).setTracksDisplayListReplay(m_tracksDisplayListReplay); >Index: Source/WebCore/html/HTMLEmbedElement.cpp >=================================================================== >--- Source/WebCore/html/HTMLEmbedElement.cpp (revision 246172) >+++ Source/WebCore/html/HTMLEmbedElement.cpp (working copy) >@@ -214,12 +214,6 @@ bool HTMLEmbedElement::rendererIsNeeded( > } > } > >-#if ENABLE(DASHBOARD_SUPPORT) >- // Workaround for <rdar://problem/6642221>. >- if (document().settings().usesDashboardBackwardCompatibilityMode()) >- return true; >-#endif >- > return HTMLPlugInImageElement::rendererIsNeeded(style); > } > >Index: Source/WebCore/html/HTMLImageLoader.cpp >=================================================================== >--- Source/WebCore/html/HTMLImageLoader.cpp (revision 246172) >+++ Source/WebCore/html/HTMLImageLoader.cpp (working copy) >@@ -63,11 +63,6 @@ void HTMLImageLoader::dispatchLoadEvent( > > String HTMLImageLoader::sourceURI(const AtomicString& attr) const > { >-#if ENABLE(DASHBOARD_SUPPORT) >- if (element().document().settings().usesDashboardBackwardCompatibilityMode() && attr.length() > 7 && attr.startsWith("url(\"") && attr.endsWith("\")")) >- return attr.string().substring(5, attr.length() - 7); >-#endif >- > return stripLeadingAndTrailingHTMLSpaces(attr); > } > >Index: Source/WebCore/html/canvas/CanvasGradient.cpp >=================================================================== >--- Source/WebCore/html/canvas/CanvasGradient.cpp (revision 246172) >+++ Source/WebCore/html/canvas/CanvasGradient.cpp (working copy) >@@ -50,10 +50,6 @@ ExceptionOr<void> CanvasGradient::addCol > // as required by the standard. > Color color = parseColorOrCurrentColor(colorString, nullptr /*canvas*/); > if (!color.isValid()) { >-#if ENABLE(DASHBOARD_SUPPORT) >- if (m_dashboardCompatibilityMode) >- return { }; >-#endif > return Exception { SyntaxError }; > } > >Index: Source/WebCore/html/canvas/CanvasGradient.h >=================================================================== >--- Source/WebCore/html/canvas/CanvasGradient.h (revision 246172) >+++ Source/WebCore/html/canvas/CanvasGradient.h (working copy) >@@ -47,18 +47,11 @@ public: > > ExceptionOr<void> addColorStop(float value, const String& color); > >-#if ENABLE(DASHBOARD_SUPPORT) >- void setDashboardCompatibilityMode() { m_dashboardCompatibilityMode = true; } >-#endif >- > private: > CanvasGradient(const FloatPoint& p0, const FloatPoint& p1); > CanvasGradient(const FloatPoint& p0, float r0, const FloatPoint& p1, float r1); > > Ref<Gradient> m_gradient; >-#if ENABLE(DASHBOARD_SUPPORT) >- bool m_dashboardCompatibilityMode { false }; >-#endif > }; > > } >Index: Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp >=================================================================== >--- Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (revision 246172) >+++ Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (working copy) >@@ -58,17 +58,17 @@ using namespace HTMLNames; > > WTF_MAKE_ISO_ALLOCATED_IMPL(CanvasRenderingContext2D); > >-std::unique_ptr<CanvasRenderingContext2D> CanvasRenderingContext2D::create(CanvasBase& canvas, bool usesCSSCompatibilityParseMode, bool usesDashboardCompatibilityMode) >+std::unique_ptr<CanvasRenderingContext2D> CanvasRenderingContext2D::create(CanvasBase& canvas, bool usesCSSCompatibilityParseMode) > { >- auto renderingContext = std::unique_ptr<CanvasRenderingContext2D>(new CanvasRenderingContext2D(canvas, usesCSSCompatibilityParseMode, usesDashboardCompatibilityMode)); >+ auto renderingContext = std::unique_ptr<CanvasRenderingContext2D>(new CanvasRenderingContext2D(canvas, usesCSSCompatibilityParseMode)); > > InspectorInstrumentation::didCreateCanvasRenderingContext(*renderingContext); > > return renderingContext; > } > >-CanvasRenderingContext2D::CanvasRenderingContext2D(CanvasBase& canvas, bool usesCSSCompatibilityParseMode, bool usesDashboardCompatibilityMode) >- : CanvasRenderingContext2DBase(canvas, usesCSSCompatibilityParseMode, usesDashboardCompatibilityMode) >+CanvasRenderingContext2D::CanvasRenderingContext2D(CanvasBase& canvas, bool usesCSSCompatibilityParseMode) >+ : CanvasRenderingContext2DBase(canvas, usesCSSCompatibilityParseMode) > { > } > >Index: Source/WebCore/html/canvas/CanvasRenderingContext2D.h >=================================================================== >--- Source/WebCore/html/canvas/CanvasRenderingContext2D.h (revision 246172) >+++ Source/WebCore/html/canvas/CanvasRenderingContext2D.h (working copy) >@@ -40,7 +40,7 @@ class TextMetrics; > class CanvasRenderingContext2D final : public CanvasRenderingContext2DBase { > WTF_MAKE_ISO_ALLOCATED(CanvasRenderingContext2D); > public: >- static std::unique_ptr<CanvasRenderingContext2D> create(CanvasBase&, bool usesCSSCompatibilityParseMode, bool usesDashboardCompatibilityMode); >+ static std::unique_ptr<CanvasRenderingContext2D> create(CanvasBase&, bool usesCSSCompatibilityParseMode); > > virtual ~CanvasRenderingContext2D(); > >@@ -70,7 +70,7 @@ public: > bool is2d() const override { return true; } > > private: >- CanvasRenderingContext2D(CanvasBase&, bool usesCSSCompatibilityParseMode, bool usesDashboardCompatibilityMode); >+ CanvasRenderingContext2D(CanvasBase&, bool usesCSSCompatibilityParseMode); > > // The relationship between FontCascade and CanvasRenderingContext2D::FontProxy must hold certain invariants. > // Therefore, all font operations must pass through the State. >@@ -80,8 +80,6 @@ private: > > void drawFocusIfNeededInternal(const Path&, Element&); > >- void prepareGradientForDashboard(CanvasGradient& gradient) const; >- > TextDirection toTextDirection(CanvasRenderingContext2DBase::Direction, const RenderStyle** computedStyle = nullptr) const; > > FloatPoint textOffset(float width, TextDirection); >Index: Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp >=================================================================== >--- Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (revision 246172) >+++ Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (working copy) >@@ -137,17 +137,11 @@ private: > CanvasRenderingContext2DBase* m_canvasContext; > }; > >-CanvasRenderingContext2DBase::CanvasRenderingContext2DBase(CanvasBase& canvas, bool usesCSSCompatibilityParseMode, bool usesDashboardCompatibilityMode) >+CanvasRenderingContext2DBase::CanvasRenderingContext2DBase(CanvasBase& canvas, bool usesCSSCompatibilityParseMode) > : CanvasRenderingContext(canvas) > , m_stateStack(1) > , m_usesCSSCompatibilityParseMode(usesCSSCompatibilityParseMode) >-#if ENABLE(DASHBOARD_SUPPORT) >- , m_usesDashboardCompatibilityMode(usesDashboardCompatibilityMode) >-#endif > { >-#if !ENABLE(DASHBOARD_SUPPORT) >- ASSERT_UNUSED(usesDashboardCompatibilityMode, !usesDashboardCompatibilityMode); >-#endif > } > > void CanvasRenderingContext2DBase::unwindStateStack() >@@ -1057,19 +1051,16 @@ static WindRule toWindRule(CanvasFillRul > void CanvasRenderingContext2DBase::fill(CanvasFillRule windingRule) > { > fillInternal(m_path, windingRule); >- clearPathForDashboardBackwardCompatibilityMode(); > } > > void CanvasRenderingContext2DBase::stroke() > { > strokeInternal(m_path); >- clearPathForDashboardBackwardCompatibilityMode(); > } > > void CanvasRenderingContext2DBase::clip(CanvasFillRule windingRule) > { > clipInternal(m_path, windingRule); >- clearPathForDashboardBackwardCompatibilityMode(); > } > > void CanvasRenderingContext2DBase::fill(Path2D& path, CanvasFillRule windingRule) >@@ -1879,16 +1870,6 @@ template<class T> void CanvasRenderingCo > compositeBuffer(*buffer, bufferRect, op); > } > >-void CanvasRenderingContext2DBase::prepareGradientForDashboard(CanvasGradient& gradient) const >-{ >-#if ENABLE(DASHBOARD_SUPPORT) >- if (m_usesDashboardCompatibilityMode) >- gradient.setDashboardCompatibilityMode(); >-#else >- UNUSED_PARAM(gradient); >-#endif >-} >- > static CanvasRenderingContext2DBase::Style toStyle(const CanvasStyle& style) > { > if (auto gradient = style.canvasGradient()) >@@ -1931,9 +1912,7 @@ ExceptionOr<Ref<CanvasGradient>> CanvasR > if (!std::isfinite(x0) || !std::isfinite(y0) || !std::isfinite(x1) || !std::isfinite(y1)) > return Exception { NotSupportedError }; > >- auto gradient = CanvasGradient::create(FloatPoint(x0, y0), FloatPoint(x1, y1)); >- prepareGradientForDashboard(gradient.get()); >- return gradient; >+ return CanvasGradient::create(FloatPoint(x0, y0), FloatPoint(x1, y1)); > } > > ExceptionOr<Ref<CanvasGradient>> CanvasRenderingContext2DBase::createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1) >@@ -1944,9 +1923,7 @@ ExceptionOr<Ref<CanvasGradient>> CanvasR > if (r0 < 0 || r1 < 0) > return Exception { IndexSizeError }; > >- auto gradient = CanvasGradient::create(FloatPoint(x0, y0), r0, FloatPoint(x1, y1), r1); >- prepareGradientForDashboard(gradient.get()); >- return gradient; >+ return CanvasGradient::create(FloatPoint(x0, y0), r0, FloatPoint(x1, y1), r1); > } > > ExceptionOr<RefPtr<CanvasPattern>> CanvasRenderingContext2DBase::createPattern(CanvasImageSource&& image, const String& repetition) >@@ -2370,12 +2347,4 @@ Ref<Path2D> CanvasRenderingContext2DBase > return Path2D::create(m_path); > } > >-inline void CanvasRenderingContext2DBase::clearPathForDashboardBackwardCompatibilityMode() >-{ >-#if ENABLE(DASHBOARD_SUPPORT) >- if (m_usesDashboardCompatibilityMode) >- m_path.clear(); >-#endif >-} >- > } // namespace WebCore >Index: Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h >=================================================================== >--- Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h (revision 246172) >+++ Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h (working copy) >@@ -80,7 +80,7 @@ using CanvasImageSource = Variant<RefPtr > class CanvasRenderingContext2DBase : public CanvasRenderingContext, public CanvasPath { > WTF_MAKE_ISO_ALLOCATED(CanvasRenderingContext2DBase); > public: >- CanvasRenderingContext2DBase(CanvasBase&, bool usesCSSCompatibilityParseMode, bool usesDashboardCompatibilityMode); >+ CanvasRenderingContext2DBase(CanvasBase&, bool usesCSSCompatibilityParseMode); > virtual ~CanvasRenderingContext2DBase(); > > float lineWidth() const; >@@ -366,8 +366,6 @@ protected: > > template<class T> void fullCanvasCompositedDrawImage(T&, const FloatRect&, const FloatRect&, CompositeOperator); > >- void prepareGradientForDashboard(CanvasGradient&) const; >- > ExceptionOr<RefPtr<ImageData>> getImageData(ImageBuffer::CoordinateSystem, float sx, float sy, float sw, float sh) const; > void putImageData(ImageData&, ImageBuffer::CoordinateSystem, float dx, float dy, float dirtyX, float dirtyY, float dirtyWidth, float dirtyHeight); > >@@ -379,15 +377,10 @@ protected: > PlatformLayer* platformLayer() const override; > #endif > >- void clearPathForDashboardBackwardCompatibilityMode(); >- > static const unsigned MaxSaveCount = 1024 * 16; > Vector<State, 1> m_stateStack; > unsigned m_unrealizedSaveCount { 0 }; > bool m_usesCSSCompatibilityParseMode; >-#if ENABLE(DASHBOARD_SUPPORT) >- bool m_usesDashboardCompatibilityMode; >-#endif > bool m_usesDisplayListDrawing { false }; > bool m_tracksDisplayListReplay { false }; > mutable std::unique_ptr<struct DisplayListDrawingContext> m_recordingContext; >Index: Source/WebCore/html/canvas/OffscreenCanvasRenderingContext2D.cpp >=================================================================== >--- Source/WebCore/html/canvas/OffscreenCanvasRenderingContext2D.cpp (revision 246172) >+++ Source/WebCore/html/canvas/OffscreenCanvasRenderingContext2D.cpp (working copy) >@@ -40,7 +40,7 @@ namespace WebCore { > WTF_MAKE_ISO_ALLOCATED_IMPL(OffscreenCanvasRenderingContext2D); > > OffscreenCanvasRenderingContext2D::OffscreenCanvasRenderingContext2D(CanvasBase& canvas) >- : CanvasRenderingContext2DBase(canvas, false, false) >+ : CanvasRenderingContext2DBase(canvas, false) > { > } > >Index: Source/WebCore/html/canvas/PaintRenderingContext2D.cpp >=================================================================== >--- Source/WebCore/html/canvas/PaintRenderingContext2D.cpp (revision 246172) >+++ Source/WebCore/html/canvas/PaintRenderingContext2D.cpp (working copy) >@@ -40,7 +40,7 @@ std::unique_ptr<PaintRenderingContext2D> > } > > PaintRenderingContext2D::PaintRenderingContext2D(CanvasBase& canvas) >- : CanvasRenderingContext2DBase(canvas, false, false) >+ : CanvasRenderingContext2DBase(canvas, false) > { > } > >Index: Source/WebCore/page/Chrome.cpp >=================================================================== >--- Source/WebCore/page/Chrome.cpp (revision 246172) >+++ Source/WebCore/page/Chrome.cpp (working copy) >@@ -525,12 +525,6 @@ void Chrome::windowScreenDidChange(Platf > #endif > } > >-#if ENABLE(DASHBOARD_SUPPORT) >-void ChromeClient::annotatedRegionsChanged() >-{ >-} >-#endif >- > bool ChromeClient::shouldReplaceWithGeneratedFileForUpload(const String&, String&) > { > return false; >Index: Source/WebCore/page/ChromeClient.h >=================================================================== >--- Source/WebCore/page/ChromeClient.h (revision 246172) >+++ Source/WebCore/page/ChromeClient.h (working copy) >@@ -234,10 +234,6 @@ public: > // the new cache. > virtual void reachedApplicationCacheOriginQuota(SecurityOrigin&, int64_t totalSpaceNeeded) = 0; > >-#if ENABLE(DASHBOARD_SUPPORT) >- virtual void annotatedRegionsChanged(); >-#endif >- > virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename); > virtual String generateReplacementFile(const String& path); > >Index: Source/WebCore/page/EventHandler.cpp >=================================================================== >--- Source/WebCore/page/EventHandler.cpp (revision 246172) >+++ Source/WebCore/page/EventHandler.cpp (working copy) >@@ -389,6 +389,7 @@ EventHandler::EventHandler(Frame& frame) > > EventHandler::~EventHandler() > { >+ WTFReportBacktrace(); > #if !ENABLE(IOS_TOUCH_EVENTS) > ASSERT(!m_fakeMouseMoveEventTimer.isActive()); > #endif >Index: Source/WebCore/page/FrameView.cpp >=================================================================== >--- Source/WebCore/page/FrameView.cpp (revision 246172) >+++ Source/WebCore/page/FrameView.cpp (working copy) >@@ -1276,7 +1276,7 @@ void FrameView::didLayout(WeakPtr<Render > cache->postNotification(layoutRoot.get(), AXObjectCache::AXLayoutComplete); > #endif > >- frame().document()->invalidateRenderingDependentRegions(Document::AnnotationsAction::Update); >+ frame().document()->invalidateRenderingDependentRegions(); > > updateCanBlitOnScrollRecursively(); > >@@ -4107,9 +4107,6 @@ void FrameView::didPaintContents(Graphic > m_paintBehavior = paintingState.paintBehavior; > m_lastPaintTime = MonotonicTime::now(); > >- // Regions may have changed as a result of the visibility/z-index of element changing. >- frame().document()->updateZOrderDependentRegions(); >- > if (paintingState.isTopLevelPainter) > sCurrentPaintTimeStamp = MonotonicTime(); > >Index: Source/WebCore/page/Settings.yaml >=================================================================== >--- Source/WebCore/page/Settings.yaml (revision 246172) >+++ Source/WebCore/page/Settings.yaml (working copy) >@@ -115,9 +115,6 @@ javaScriptCanAccessClipboard: > initial: false > shouldPrintBackgrounds: > initial: false >-usesDashboardBackwardCompatibilityMode: >- initial: false >- conditional: DASHBOARD_SUPPORT > clipboardAccessPolicy: > type: ClipboardAccessPolicy > initial: ClipboardAccessPolicy::RequiresUserGesture >Index: Source/WebCore/page/mac/EventHandlerMac.mm >=================================================================== >--- Source/WebCore/page/mac/EventHandlerMac.mm (revision 246172) >+++ Source/WebCore/page/mac/EventHandlerMac.mm (working copy) >@@ -752,15 +752,7 @@ bool EventHandler::tabsToAllFormControls > > bool EventHandler::needsKeyboardEventDisambiguationQuirks() const > { >-#if ENABLE(DASHBOARD_SUPPORT) >- if (m_frame.settings().usesDashboardBackwardCompatibilityMode()) >- return true; >-#endif >- >- if (m_frame.settings().needsKeyboardEventDisambiguationQuirks()) >- return true; >- >- return false; >+ return m_frame.settings().needsKeyboardEventDisambiguationQuirks(); > } > > OptionSet<PlatformEvent::Modifier> EventHandler::accessKeyModifiers() >Index: Source/WebCore/platform/mac/PasteboardMac.mm >=================================================================== >--- Source/WebCore/platform/mac/PasteboardMac.mm (revision 246172) >+++ Source/WebCore/platform/mac/PasteboardMac.mm (working copy) >@@ -670,6 +670,7 @@ void Pasteboard::setDragImage(DragImage > if (m_changeCount != platformStrategies()->pasteboardStrategy()->changeCount(m_pasteboardName)) > return; > >+ // FIXME: Can we remove this code now? > // Dashboard wants to be able to set the drag image during dragging, but Cocoa does not allow this. > // Instead we must drop down to the CoreGraphics API. > setDragImageImpl(image.get().get(), location); >Index: Source/WebCore/rendering/RenderInline.cpp >=================================================================== >--- Source/WebCore/rendering/RenderInline.cpp (revision 246172) >+++ Source/WebCore/rendering/RenderInline.cpp (working copy) >@@ -51,10 +51,6 @@ > #include <wtf/IsoMallocInlines.h> > #include <wtf/SetForScope.h> > >-#if ENABLE(DASHBOARD_SUPPORT) >-#include "Frame.h" >-#endif >- > namespace WebCore { > > WTF_MAKE_ISO_ALLOCATED_IMPL(RenderInline); >@@ -1394,47 +1390,4 @@ void RenderInline::paintOutlineForLine(G > } > } > >-#if ENABLE(DASHBOARD_SUPPORT) >-void RenderInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions) >-{ >- // Convert the style regions to absolute coordinates. >- if (style().visibility() != Visibility::Visible) >- return; >- >- const Vector<StyleDashboardRegion>& styleRegions = style().dashboardRegions(); >- unsigned i, count = styleRegions.size(); >- for (i = 0; i < count; i++) { >- StyleDashboardRegion styleRegion = styleRegions[i]; >- >- LayoutRect linesBoundingBox = this->linesBoundingBox(); >- LayoutUnit w = linesBoundingBox.width(); >- LayoutUnit h = linesBoundingBox.height(); >- >- AnnotatedRegionValue region; >- region.label = styleRegion.label; >- region.bounds = LayoutRect(linesBoundingBox.x() + styleRegion.offset.left().value(), >- linesBoundingBox.y() + styleRegion.offset.top().value(), >- w - styleRegion.offset.left().value() - styleRegion.offset.right().value(), >- h - styleRegion.offset.top().value() - styleRegion.offset.bottom().value()); >- region.type = styleRegion.type; >- >- RenderObject* container = containingBlock(); >- if (!container) >- container = this; >- >- region.clip = container->computeAbsoluteRepaintRect(region.bounds); >- if (region.clip.height() < 0) { >- region.clip.setHeight(0); >- region.clip.setWidth(0); >- } >- >- FloatPoint absPos = container->localToAbsolute(); >- region.bounds.setX(absPos.x() + region.bounds.x()); >- region.bounds.setY(absPos.y() + region.bounds.y()); >- >- regions.append(region); >- } >-} >-#endif >- > } // namespace WebCore >Index: Source/WebCore/rendering/RenderInline.h >=================================================================== >--- Source/WebCore/rendering/RenderInline.h (revision 246172) >+++ Source/WebCore/rendering/RenderInline.h (working copy) >@@ -151,10 +151,6 @@ private: > > void imageChanged(WrappedImagePtr, const IntRect* = 0) final; > >-#if ENABLE(DASHBOARD_SUPPORT) >- void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) final; >-#endif >- > void paintOutlineForLine(GraphicsContext&, const LayoutPoint&, const LayoutRect& prevLine, const LayoutRect& thisLine, const LayoutRect& nextLine, const Color&); > > bool willChangeCreatesStackingContext() const >Index: Source/WebCore/rendering/RenderLayer.cpp >=================================================================== >--- Source/WebCore/rendering/RenderLayer.cpp (revision 246172) >+++ Source/WebCore/rendering/RenderLayer.cpp (working copy) >@@ -2522,7 +2522,7 @@ void RenderLayer::scrollTo(const ScrollP > } > > // Update regions, scrolling may change the clip of a particular region. >- renderer().document().invalidateRenderingDependentRegions(Document::AnnotationsAction::Update); >+ renderer().document().invalidateRenderingDependentRegions(); > DebugPageOverlays::didLayout(renderer().frame()); > } > >@@ -3339,8 +3339,6 @@ void RenderLayer::setHasHorizontalScroll > m_hBar->styleChanged(); > if (m_vBar) > m_vBar->styleChanged(); >- >- renderer().document().invalidateScrollbarDependentRegions(); > } > > void RenderLayer::setHasVerticalScrollbar(bool hasScrollbar) >@@ -3366,8 +3364,6 @@ void RenderLayer::setHasVerticalScrollba > m_hBar->styleChanged(); > if (m_vBar) > m_vBar->styleChanged(); >- >- renderer().document().invalidateScrollbarDependentRegions(); > } > > ScrollableArea* RenderLayer::enclosingScrollableArea() const >@@ -3638,7 +3634,6 @@ void RenderLayer::updateScrollbarsAfterL > > updateSelfPaintingLayer(); > >- renderer().document().invalidateScrollbarDependentRegions(); > renderer().repaint(); > > if (renderer().style().overflowX() == Overflow::Auto || renderer().style().overflowY() == Overflow::Auto) { >Index: Source/WebCore/rendering/RenderListBox.cpp >=================================================================== >--- Source/WebCore/rendering/RenderListBox.cpp (revision 246172) >+++ Source/WebCore/rendering/RenderListBox.cpp (working copy) >@@ -953,8 +953,6 @@ void RenderListBox::setHasVerticalScroll > > if (m_vBar) > m_vBar->styleChanged(); >- >- document().invalidateScrollbarDependentRegions(); > } > > bool RenderListBox::scrolledToTop() const >Index: Source/WebCore/rendering/RenderObject.cpp >=================================================================== >--- Source/WebCore/rendering/RenderObject.cpp (revision 246172) >+++ Source/WebCore/rendering/RenderObject.cpp (working copy) >@@ -1614,55 +1614,6 @@ int RenderObject::innerLineHeight() cons > return style().computedLineHeight(); > } > >-#if ENABLE(DASHBOARD_SUPPORT) >-void RenderObject::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions) >-{ >- // Convert the style regions to absolute coordinates. >- if (style().visibility() != Visibility::Visible || !is<RenderBox>(*this)) >- return; >- >- auto& box = downcast<RenderBox>(*this); >- FloatPoint absPos = localToAbsolute(); >- >- const Vector<StyleDashboardRegion>& styleRegions = style().dashboardRegions(); >- for (const auto& styleRegion : styleRegions) { >- LayoutUnit w = box.width(); >- LayoutUnit h = box.height(); >- >- AnnotatedRegionValue region; >- region.label = styleRegion.label; >- region.bounds = LayoutRect(styleRegion.offset.left().value(), >- styleRegion.offset.top().value(), >- w - styleRegion.offset.left().value() - styleRegion.offset.right().value(), >- h - styleRegion.offset.top().value() - styleRegion.offset.bottom().value()); >- region.type = styleRegion.type; >- >- region.clip = computeAbsoluteRepaintRect(region.bounds); >- if (region.clip.height() < 0) { >- region.clip.setHeight(0); >- region.clip.setWidth(0); >- } >- >- region.bounds.setX(absPos.x() + styleRegion.offset.left().value()); >- region.bounds.setY(absPos.y() + styleRegion.offset.top().value()); >- >- regions.append(region); >- } >-} >- >-void RenderObject::collectAnnotatedRegions(Vector<AnnotatedRegionValue>& regions) >-{ >- // RenderTexts don't have their own style, they just use their parent's style, >- // so we don't want to include them. >- if (is<RenderText>(*this)) >- return; >- >- addAnnotatedRegions(regions); >- for (RenderObject* current = downcast<RenderElement>(*this).firstChild(); current; current = current->nextSibling()) >- current->collectAnnotatedRegions(regions); >-} >-#endif >- > int RenderObject::caretMinOffset() const > { > return 0; >Index: Source/WebCore/rendering/RenderObject.h >=================================================================== >--- Source/WebCore/rendering/RenderObject.h (revision 246172) >+++ Source/WebCore/rendering/RenderObject.h (working copy) >@@ -85,24 +85,6 @@ enum class ShouldAllowCrossOriginScrolli > > struct ScrollRectToVisibleOptions; > >-#if ENABLE(DASHBOARD_SUPPORT) >-struct AnnotatedRegionValue { >- bool operator==(const AnnotatedRegionValue& o) const >- { >- return type == o.type && bounds == o.bounds && clip == o.clip && label == o.label; >- } >- bool operator!=(const AnnotatedRegionValue& o) const >- { >- return !(*this == o); >- } >- >- LayoutRect bounds; >- String label; >- LayoutRect clip; >- int type; >-}; >-#endif >- > // Base class for all rendering tree objects. > class RenderObject : public CachedImageClient, public CanMakeWeakPtr<RenderObject> { > WTF_MAKE_ISO_ALLOCATED(RenderObject); >@@ -569,11 +551,6 @@ public: > // repaint and do not need a relayout > virtual void updateFromElement() { } > >-#if ENABLE(DASHBOARD_SUPPORT) >- virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&); >- void collectAnnotatedRegions(Vector<AnnotatedRegionValue>&); >-#endif >- > bool isComposited() const; > > bool hitTest(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestFilter = HitTestAll); >Index: Source/WebCore/rendering/style/RenderStyle.cpp >=================================================================== >--- Source/WebCore/rendering/style/RenderStyle.cpp (revision 246172) >+++ Source/WebCore/rendering/style/RenderStyle.cpp (working copy) >@@ -616,12 +616,6 @@ static bool rareNonInheritedDataChangeRe > || first.gridItem != second.gridItem) > return true; > >-#if ENABLE(DASHBOARD_SUPPORT) >- // If regions change, trigger a relayout to re-calc regions. >- if (first.dashboardRegions != second.dashboardRegions) >- return true; >-#endif >- > if (!arePointingToEqualData(first.willChange, second.willChange)) { > changedContextSensitiveProperties.add(StyleDifferenceContextSensitiveProperty::WillChange); > // Don't return; keep looking for another change >@@ -1538,27 +1532,6 @@ const AtomicString& RenderStyle::textEmp > return nullAtom(); > } > >-#if ENABLE(DASHBOARD_SUPPORT) >- >-const Vector<StyleDashboardRegion>& RenderStyle::initialDashboardRegions() >-{ >- static NeverDestroyed<Vector<StyleDashboardRegion>> emptyList; >- return emptyList; >-} >- >-const Vector<StyleDashboardRegion>& RenderStyle::noneDashboardRegions() >-{ >- static NeverDestroyed<Vector<StyleDashboardRegion>> noneList; >- static bool noneListInitialized = false; >- if (!noneListInitialized) { >- noneList.get().append(StyleDashboardRegion { emptyString(), { }, StyleDashboardRegion::None }); >- noneListInitialized = true; >- } >- return noneList; >-} >- >-#endif >- > void RenderStyle::adjustAnimations() > { > auto* animationList = m_rareNonInheritedData->animations.get(); >@@ -2403,17 +2376,6 @@ bool RenderStyle::shouldPlaceBlockDirect > return !isLeftToRightDirection() && isHorizontalWritingMode(); > } > >-#if ENABLE(DASHBOARD_SUPPORT) >- >-void RenderStyle::setDashboardRegion(int type, const String& label, Length&& top, Length&& right, Length&& bottom, Length&& left, bool append) >-{ >- if (!append) >- m_rareNonInheritedData.access().dashboardRegions.clear(); >- m_rareNonInheritedData.access().dashboardRegions.append({ label, { WTFMove(top), WTFMove(right), WTFMove(bottom), WTFMove(left) }, type }); >-} >- >-#endif >- > Vector<PaintType, 3> RenderStyle::paintTypesForPaintOrder(PaintOrder order) > { > Vector<PaintType, 3> paintOrder; >Index: Source/WebCore/rendering/style/RenderStyle.h >=================================================================== >--- Source/WebCore/rendering/style/RenderStyle.h (revision 246172) >+++ Source/WebCore/rendering/style/RenderStyle.h (working copy) >@@ -77,10 +77,6 @@ > #include "StyleGridData.h" > #include "StyleGridItemData.h" > >-#if ENABLE(DASHBOARD_SUPPORT) >-#include "StyleDashboardRegion.h" >-#endif >- > #if ENABLE(TEXT_AUTOSIZING) > #include "TextSizeAdjustment.h" > #endif >@@ -834,12 +830,6 @@ public: > void setMinHeight(Length&& length) { SET_VAR(m_boxData, m_minHeight, WTFMove(length)); } > void setMaxHeight(Length&& length) { SET_VAR(m_boxData, m_maxHeight, WTFMove(length)); } > >-#if ENABLE(DASHBOARD_SUPPORT) >- const Vector<StyleDashboardRegion>& dashboardRegions() const { return m_rareNonInheritedData->dashboardRegions; } >- void setDashboardRegions(const Vector<StyleDashboardRegion>& regions) { SET_VAR(m_rareNonInheritedData, dashboardRegions, regions); } >- void setDashboardRegion(int type, const String& label, Length&& top, Length&& right, Length&& bottom, Length&& left, bool append); >-#endif >- > void resetBorder() { resetBorderImage(); resetBorderTop(); resetBorderRight(); resetBorderBottom(); resetBorderLeft(); resetBorderRadius(); } > void resetBorderTop() { SET_VAR(m_surroundData, border.m_top, BorderValue()); } > void resetBorderRight() { SET_VAR(m_surroundData, border.m_right, BorderValue()); } >@@ -1694,11 +1684,6 @@ public: > static bool initialUseTouchOverflowScrolling() { return false; } > #endif > >-#if ENABLE(DASHBOARD_SUPPORT) >- static const Vector<StyleDashboardRegion>& initialDashboardRegions(); >- static const Vector<StyleDashboardRegion>& noneDashboardRegions(); >-#endif >- > static const FilterOperations& initialFilter() { static NeverDestroyed<FilterOperations> ops; return ops; } > static const FilterOperations& initialAppleColorFilter() { static NeverDestroyed<FilterOperations> ops; return ops; } > >Index: Source/WebCore/rendering/style/StyleDashboardRegion.h >=================================================================== >--- Source/WebCore/rendering/style/StyleDashboardRegion.h (revision 246172) >+++ Source/WebCore/rendering/style/StyleDashboardRegion.h (nonexistent) >@@ -1,60 +0,0 @@ >-/* >- * Copyright (C) 2000 Lars Knoll (knoll@kde.org) >- * (C) 2000 Antti Koivisto (koivisto@kde.org) >- * (C) 2000 Dirk Mueller (mueller@kde.org) >- * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. >- * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >- >-#pragma once >- >-#if ENABLE(DASHBOARD_SUPPORT) >- >-#include "LengthBox.h" >-#include <wtf/text/WTFString.h> >- >-namespace WebCore { >- >-// Dashboard region attributes. Not inherited. >- >-struct StyleDashboardRegion { >- String label; >- LengthBox offset; >- int type; >- >- enum { >- None, >- Circle, >- Rectangle >- }; >- >- bool operator==(const StyleDashboardRegion& o) const >- { >- return type == o.type && offset == o.offset && label == o.label; >- } >- >- bool operator!=(const StyleDashboardRegion& o) const >- { >- return !(*this == o); >- } >-}; >- >-} // namespace WebCore >- >-#endif // ENABLE(DASHBOARD_SUPPORT) > >Property changes on: Source/WebCore/rendering/style/StyleDashboardRegion.h >___________________________________________________________________ >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Index: Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp >=================================================================== >--- Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (revision 246172) >+++ Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (working copy) >@@ -223,9 +223,6 @@ bool StyleRareNonInheritedData::operator > && perspectiveOriginY == o.perspectiveOriginY > && lineClamp == o.lineClamp > && initialLetter == o.initialLetter >-#if ENABLE(DASHBOARD_SUPPORT) >- && dashboardRegions == o.dashboardRegions >-#endif > && deprecatedFlexibleBox == o.deprecatedFlexibleBox > && flexibleBox == o.flexibleBox > && marquee == o.marquee >Index: Source/WebCore/rendering/style/StyleRareNonInheritedData.h >=================================================================== >--- Source/WebCore/rendering/style/StyleRareNonInheritedData.h (revision 246172) >+++ Source/WebCore/rendering/style/StyleRareNonInheritedData.h (working copy) >@@ -60,7 +60,6 @@ class StyleScrollSnapPort; > class StyleTransformData; > > struct LengthSize; >-struct StyleDashboardRegion; > > // Page size type. > // StyleRareNonInheritedData::pageSize is meaningful only when >@@ -107,10 +106,6 @@ public: > > IntSize initialLetter; > >-#if ENABLE(DASHBOARD_SUPPORT) >- Vector<StyleDashboardRegion> dashboardRegions; >-#endif >- > DataRef<StyleDeprecatedFlexibleBoxData> deprecatedFlexibleBox; // Flexible box properties > DataRef<StyleFlexibleBoxData> flexibleBox; > DataRef<StyleMarqueeData> marquee; // Marquee properties >Index: Source/WebCore/xml/XMLHttpRequest.cpp >=================================================================== >--- Source/WebCore/xml/XMLHttpRequest.cpp (revision 246172) >+++ Source/WebCore/xml/XMLHttpRequest.cpp (working copy) >@@ -148,17 +148,6 @@ SecurityOrigin* XMLHttpRequest::security > return scriptExecutionContext()->securityOrigin(); > } > >-#if ENABLE(DASHBOARD_SUPPORT) >- >-bool XMLHttpRequest::usesDashboardBackwardCompatibilityMode() const >-{ >- if (scriptExecutionContext()->isWorkerGlobalScope()) >- return false; >- return document()->settings().usesDashboardBackwardCompatibilityMode(); >-} >- >-#endif >- > ExceptionOr<OwnedString> XMLHttpRequest::responseText() > { > if (responseType() != ResponseType::EmptyString && responseType() != ResponseType::Text) >@@ -465,13 +454,8 @@ ExceptionOr<void> XMLHttpRequest::send(D > > if (m_method != "GET" && m_method != "HEAD") { > if (!m_requestHeaders.contains(HTTPHeaderName::ContentType)) { >-#if ENABLE(DASHBOARD_SUPPORT) >- if (usesDashboardBackwardCompatibilityMode()) >- m_requestHeaders.set(HTTPHeaderName::ContentType, "application/x-www-form-urlencoded"_s); >- else >-#endif >- // FIXME: this should include the charset used for encoding. >- m_requestHeaders.set(HTTPHeaderName::ContentType, document.isHTMLDocument() ? "text/html;charset=UTF-8"_s : "application/xml;charset=UTF-8"_s); >+ // FIXME: this should include the charset used for encoding. >+ m_requestHeaders.set(HTTPHeaderName::ContentType, document.isHTMLDocument() ? "text/html;charset=UTF-8"_s : "application/xml;charset=UTF-8"_s); > } else { > String contentType = m_requestHeaders.get(HTTPHeaderName::ContentType); > replaceCharsetInMediaTypeIfNeeded(contentType); >@@ -495,14 +479,9 @@ ExceptionOr<void> XMLHttpRequest::send(c > > if (!body.isNull() && m_method != "GET" && m_method != "HEAD") { > String contentType = m_requestHeaders.get(HTTPHeaderName::ContentType); >- if (contentType.isNull()) { >-#if ENABLE(DASHBOARD_SUPPORT) >- if (usesDashboardBackwardCompatibilityMode()) >- m_requestHeaders.set(HTTPHeaderName::ContentType, "application/x-www-form-urlencoded"_s); >- else >-#endif >- m_requestHeaders.set(HTTPHeaderName::ContentType, HTTPHeaderValues::textPlainContentType()); >- } else { >+ if (contentType.isNull()) >+ m_requestHeaders.set(HTTPHeaderName::ContentType, HTTPHeaderValues::textPlainContentType()); >+ else { > replaceCharsetInMediaTypeIfNeeded(contentType); > m_requestHeaders.set(HTTPHeaderName::ContentType, contentType); > } >@@ -801,26 +780,15 @@ ExceptionOr<void> XMLHttpRequest::overri > > ExceptionOr<void> XMLHttpRequest::setRequestHeader(const String& name, const String& value) > { >- if (readyState() != OPENED || m_sendFlag) { >-#if ENABLE(DASHBOARD_SUPPORT) >- if (usesDashboardBackwardCompatibilityMode()) >- return { }; >-#endif >+ if (readyState() != OPENED || m_sendFlag) > return Exception { InvalidStateError }; >- } > > String normalizedValue = stripLeadingAndTrailingHTTPSpaces(value); > if (!isValidHTTPToken(name) || !isValidHTTPHeaderValue(normalizedValue)) > return Exception { SyntaxError }; > >- bool allowUnsafeHeaderField = false; >-#if ENABLE(DASHBOARD_SUPPORT) >- allowUnsafeHeaderField = usesDashboardBackwardCompatibilityMode(); >-#endif >- > // FIXME: The allowSettingAnyXHRHeaderFromFileURLs setting currently only applies to Documents, not workers. >- if (securityOrigin()->canLoadLocalResources() && scriptExecutionContext()->isDocument() && document()->settings().allowSettingAnyXHRHeaderFromFileURLs()) >- allowUnsafeHeaderField = true; >+ bool allowUnsafeHeaderField = securityOrigin()->canLoadLocalResources() && scriptExecutionContext()->isDocument() && document()->settings().allowSettingAnyXHRHeaderFromFileURLs(); > if (!allowUnsafeHeaderField && isForbiddenHeaderName(name)) { > logConsoleError(scriptExecutionContext(), "Refused to set unsafe header \"" + name + "\""); > return { }; >Index: Source/WebCore/xml/XMLHttpRequest.h >=================================================================== >--- Source/WebCore/xml/XMLHttpRequest.h (revision 246172) >+++ Source/WebCore/xml/XMLHttpRequest.h (working copy) >@@ -149,10 +149,6 @@ private: > Document* document() const; > SecurityOrigin* securityOrigin() const; > >-#if ENABLE(DASHBOARD_SUPPORT) >- bool usesDashboardBackwardCompatibilityMode() const; >-#endif >- > // ThreadableLoaderClient > void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override; > void didReceiveResponse(unsigned long identifier, const ResourceResponse&) override; >Index: Source/WebKit/ChangeLog >=================================================================== >--- Source/WebKit/ChangeLog (revision 246172) >+++ Source/WebKit/ChangeLog (working copy) >@@ -1,3 +1,21 @@ >+2019-06-06 Ryosuke Niwa <rniwa@webkit.org> >+ >+ Remove dashboard code >+ https://bugs.webkit.org/show_bug.cgi?id=198624 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Configurations/FeatureDefines.xcconfig: >+ * WebProcess/InjectedBundle/API/c/WKBundle.cpp: >+ (WKBundleSetUseDashboardCompatibilityMode): Deleted. >+ * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: >+ * WebProcess/InjectedBundle/InjectedBundle.cpp: >+ (WebKit::InjectedBundle::setUseDashboardCompatibilityMode): Deleted. >+ * WebProcess/InjectedBundle/InjectedBundle.h: >+ * WebProcess/WebCoreSupport/WebChromeClient.cpp: >+ (WebKit::WebChromeClient::annotatedRegionsChanged): Deleted. >+ * WebProcess/WebCoreSupport/WebChromeClient.h: >+ > 2019-06-06 Antoine Quint <graouts@apple.com> > > Remove duplicated websiteDataStoreParameters code from WebsitePoliciesData::applyToDocumentLoader() >Index: Source/WebKit/Configurations/FeatureDefines.xcconfig >=================================================================== >--- Source/WebKit/Configurations/FeatureDefines.xcconfig (revision 246172) >+++ Source/WebKit/Configurations/FeatureDefines.xcconfig (working copy) >@@ -117,9 +117,6 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ; > ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); > ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; > >-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME)); >-ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT; >- > ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE; > > ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT; >@@ -445,4 +442,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >Index: Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp >=================================================================== >--- Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp (revision 246172) >+++ Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp (working copy) >@@ -355,14 +355,6 @@ void InjectedBundle::setPrivateBrowsingE > (*iter)->enableLegacyPrivateBrowsing(enabled); > } > >-void InjectedBundle::setUseDashboardCompatibilityMode(WebPageGroupProxy* pageGroup, bool enabled) >-{ >-#if ENABLE(DASHBOARD_SUPPORT) >- for (auto& page : PageGroup::pageGroup(pageGroup->identifier())->pages()) >- page->settings().setUsesDashboardBackwardCompatibilityMode(enabled); >-#endif >-} >- > void InjectedBundle::setPopupBlockingEnabled(WebPageGroupProxy* pageGroup, bool enabled) > { > const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages(); >Index: Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h >=================================================================== >--- Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h (revision 246172) >+++ Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h (working copy) >@@ -105,7 +105,6 @@ public: > void setPluginsEnabled(WebPageGroupProxy*, bool); > void setJavaScriptCanAccessClipboard(WebPageGroupProxy*, bool); > void setPrivateBrowsingEnabled(WebPageGroupProxy*, bool); >- void setUseDashboardCompatibilityMode(WebPageGroupProxy*, bool); > void setPopupBlockingEnabled(WebPageGroupProxy*, bool); > void setAuthorAndUserStylesEnabled(WebPageGroupProxy*, bool); > void setSpatialNavigationEnabled(WebPageGroupProxy*, bool); >Index: Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp >=================================================================== >--- Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp (revision 246172) >+++ Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp (working copy) >@@ -171,11 +171,6 @@ void WKBundleSetPrivateBrowsingEnabled(W > WebKit::toImpl(bundleRef)->setPrivateBrowsingEnabled(WebKit::toImpl(pageGroupRef), enabled); > } > >-void WKBundleSetUseDashboardCompatibilityMode(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled) >-{ >- WebKit::toImpl(bundleRef)->setUseDashboardCompatibilityMode(WebKit::toImpl(pageGroupRef), enabled); >-} >- > void WKBundleSetPopupBlockingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled) > { > WebKit::toImpl(bundleRef)->setPopupBlockingEnabled(WebKit::toImpl(pageGroupRef), enabled); >Index: Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h >=================================================================== >--- Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (revision 246172) >+++ Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (working copy) >@@ -50,7 +50,6 @@ WK_EXPORT void WKBundleSetMinimumLogical > WK_EXPORT void WKBundleSetFrameFlatteningEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); > WK_EXPORT void WKBundleSetJavaScriptCanAccessClipboard(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); > WK_EXPORT void WKBundleSetPrivateBrowsingEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); >-WK_EXPORT void WKBundleSetUseDashboardCompatibilityMode(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); > WK_EXPORT void WKBundleSetPopupBlockingEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); > WK_EXPORT void WKBundleSetAuthorAndUserStylesEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); > WK_EXPORT void WKBundleSetSpatialNavigationEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); >Index: Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp >=================================================================== >--- Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (revision 246172) >+++ Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (working copy) >@@ -775,15 +775,6 @@ void WebChromeClient::reachedApplication > cacheStorage.storeUpdatedQuotaForOrigin(&origin, newQuota); > } > >-#if ENABLE(DASHBOARD_SUPPORT) >- >-void WebChromeClient::annotatedRegionsChanged() >-{ >- notImplemented(); >-} >- >-#endif >- > bool WebChromeClient::shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename) > { > generatedFilename = m_page.injectedBundleUIClient().shouldGenerateFileForUpload(&m_page, path); >Index: Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h >=================================================================== >--- Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h (revision 246172) >+++ Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h (working copy) >@@ -143,10 +143,6 @@ private: > void reachedMaxAppCacheSize(int64_t spaceNeeded) final; > void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin&, int64_t spaceNeeded) final; > >-#if ENABLE(DASHBOARD_SUPPORT) >- void annotatedRegionsChanged() final; >-#endif >- > bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename) final; > String generateReplacementFile(const String& path) final; > >Index: Source/WebKitLegacy/ChangeLog >=================================================================== >--- Source/WebKitLegacy/ChangeLog (revision 246172) >+++ Source/WebKitLegacy/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2019-06-06 Ryosuke Niwa <rniwa@webkit.org> >+ >+ Remove dashboard code >+ https://bugs.webkit.org/show_bug.cgi?id=198624 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * WebKitLegacy.xcodeproj/project.pbxproj: >+ > 2019-06-05 Alex Christensen <achristensen@webkit.org> > > Progress towards resurrecting Mac CMake build >Index: Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj >=================================================================== >--- Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (revision 246172) >+++ Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (working copy) >@@ -664,8 +664,6 @@ > 93D4379C1D57ABEF00AB85EA /* ObjCEventListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93D4364A1D57ABEE00AB85EA /* ObjCEventListener.mm */; }; > 93D4379D1D57ABEF00AB85EA /* ObjCNodeFilterCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D4364B1D57ABEE00AB85EA /* ObjCNodeFilterCondition.h */; }; > 93D4379E1D57ABEF00AB85EA /* ObjCNodeFilterCondition.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93D4364C1D57ABEE00AB85EA /* ObjCNodeFilterCondition.mm */; }; >- 93E2A1A4123B0B3C009FE12A /* WebDashboardRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E2A1A2123B0B3C009FE12A /* WebDashboardRegion.h */; settings = {ATTRIBUTES = (Private, ); }; }; >- 93E2A1A5123B0B3C009FE12A /* WebDashboardRegion.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93E2A1A3123B0B3C009FE12A /* WebDashboardRegion.mm */; }; > 93FDE9330D79CAF30074F029 /* WebHistoryInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */; }; > A10C1D1818202F9C0036883A /* WebDefaultFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = A10C1D1018202F9C0036883A /* WebDefaultFormDelegate.h */; }; > A10C1D1918202F9C0036883A /* WebDefaultFormDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A10C1D1118202F9C0036883A /* WebDefaultFormDelegate.m */; }; >@@ -1440,8 +1438,6 @@ > 93D4364B1D57ABEE00AB85EA /* ObjCNodeFilterCondition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCNodeFilterCondition.h; sourceTree = "<group>"; }; > 93D4364C1D57ABEE00AB85EA /* ObjCNodeFilterCondition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ObjCNodeFilterCondition.mm; sourceTree = "<group>"; }; > 93D623DD051E791F002F47DD /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; >- 93E2A1A2123B0B3C009FE12A /* WebDashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDashboardRegion.h; sourceTree = "<group>"; }; >- 93E2A1A3123B0B3C009FE12A /* WebDashboardRegion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDashboardRegion.mm; sourceTree = "<group>"; }; > 93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryInternal.h; sourceTree = "<group>"; }; > 9CAE9D070252A4130ECA16EA /* WebPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; > 9CF0E249021361B00ECA16EA /* WebFramePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFramePrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; >@@ -2019,8 +2015,6 @@ > 44BB8B131241A022001E3A22 /* WebArchiveInternal.h */, > 933D659903413FF2008635CE /* WebClipView.h */, > 933D659A03413FF2008635CE /* WebClipView.mm */, >- 93E2A1A2123B0B3C009FE12A /* WebDashboardRegion.h */, >- 93E2A1A3123B0B3C009FE12A /* WebDashboardRegion.mm */, > 39446070020F50ED0ECA1767 /* WebDataSource.h */, > 39446071020F50ED0ECA1767 /* WebDataSource.mm */, > 658A40950A14853B005E6987 /* WebDataSourceInternal.h */, >@@ -2951,7 +2945,6 @@ > 065AD5A30B0C32C7005A2B1D /* WebContextMenuClient.h in Headers */, > 939810160824BF01008DF038 /* WebCoreStatistics.h in Headers */, > E13E782C1E5A7365001849D1 /* WebCreateFragmentInternal.h in Headers */, >- 93E2A1A4123B0B3C009FE12A /* WebDashboardRegion.h in Headers */, > 511F3FD70CECC88F00852565 /* WebDatabaseManagerClient.h in Headers */, > 51AEDEF10CECF45700854328 /* WebDatabaseManagerInternal.h in Headers */, > 511F3FD60CECC88F00852565 /* WebDatabaseManagerPrivate.h in Headers */, >@@ -3515,7 +3508,6 @@ > 939810EB0824BF01008DF038 /* WebClipView.mm in Sources */, > 065AD5A40B0C32C7005A2B1D /* WebContextMenuClient.mm in Sources */, > 939810BF0824BF01008DF038 /* WebCoreStatistics.mm in Sources */, >- 93E2A1A5123B0B3C009FE12A /* WebDashboardRegion.mm in Sources */, > 511F3FD50CECC88F00852565 /* WebDatabaseManager.mm in Sources */, > 511F3FD80CECC88F00852565 /* WebDatabaseManagerClient.mm in Sources */, > 1AA83F831A5C4AE400026EC6 /* WebDatabaseProvider.cpp in Sources */, >Index: Source/WebKitLegacy/mac/ChangeLog >=================================================================== >--- Source/WebKitLegacy/mac/ChangeLog (revision 246172) >+++ Source/WebKitLegacy/mac/ChangeLog (working copy) >@@ -1 +1,35 @@ >+2019-06-06 Ryosuke Niwa <rniwa@webkit.org> >+ >+ Remove dashboard code >+ https://bugs.webkit.org/show_bug.cgi?id=198624 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Configurations/FeatureDefines.xcconfig: >+ * WebCoreSupport/WebChromeClient.h: >+ * WebCoreSupport/WebChromeClient.mm: >+ (WebChromeClient::annotatedRegionsChanged): Deleted. >+ * WebView/WebClipView.mm: >+ (-[WebClipView scrollWheel:]): >+ * WebView/WebDashboardRegion.h: Removed. >+ * WebView/WebDashboardRegion.mm: Removed. >+ * WebView/WebHTMLView.mm: >+ (-[WebHTMLView _updateMouseoverWithEvent:]): >+ (-[WebHTMLView acceptsFirstMouse:]): >+ (-[WebHTMLView setDataSource:]): >+ * WebView/WebUIDelegatePrivate.h: >+ * WebView/WebView.mm: >+ (-[WebView _needsPreHTML5ParserQuirks]): >+ (-[WebView _addControlRect:clip:fromView:toDashboardRegions:]): Deleted. >+ (-[WebView _addScrollerDashboardRegionsForFrameView:dashboardRegions:]): Deleted. >+ (-[WebView _addScrollerDashboardRegions:from:]): Deleted. >+ (-[WebView _addScrollerDashboardRegions:]): Deleted. >+ (-[WebView _dashboardRegions]): Deleted. >+ (-[WebView _setDashboardBehavior:to:]): Deleted. >+ (-[WebView _dashboardBehavior:]): Deleted. >+ * WebView/WebViewData.h: >+ * WebView/WebViewData.mm: >+ (-[WebViewPrivate init]): >+ * WebView/WebViewPrivate.h: >+ > == Rolled over to ChangeLog-2019-06-05 == >Index: Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig >=================================================================== >--- Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (revision 246172) >+++ Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (working copy) >@@ -117,9 +117,6 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ; > ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); > ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; > >-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME)); >-ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT; >- > ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE; > > ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT; >@@ -445,4 +442,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >Index: Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h >=================================================================== >--- Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h (revision 246172) >+++ Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h (working copy) >@@ -126,10 +126,6 @@ private: > void reachedMaxAppCacheSize(int64_t spaceNeeded) final; > void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin&, int64_t totalSpaceNeeded) final; > >-#if ENABLE(DASHBOARD_SUPPORT) >- void annotatedRegionsChanged() final; >-#endif >- > void runOpenPanel(WebCore::Frame&, WebCore::FileChooser&) override; > void showShareSheet(WebCore::ShareDataWithParsedURL&, CompletionHandler<void(bool)>&&) override; > >Index: Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm >=================================================================== >--- Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm (revision 246172) >+++ Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm (working copy) >@@ -706,17 +706,6 @@ void WebChromeClient::reachedApplication > END_BLOCK_OBJC_EXCEPTIONS; > } > >-#if ENABLE(DASHBOARD_SUPPORT) >- >-void WebChromeClient::annotatedRegionsChanged() >-{ >- BEGIN_BLOCK_OBJC_EXCEPTIONS; >- CallUIDelegate(m_webView, @selector(webView:dashboardRegionsChanged:), [m_webView _dashboardRegions]); >- END_BLOCK_OBJC_EXCEPTIONS; >-} >- >-#endif >- > #if ENABLE(INPUT_TYPE_COLOR) > > std::unique_ptr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient& client, const Color& initialColor) >Index: Source/WebKitLegacy/mac/WebView/WebClipView.mm >=================================================================== >--- Source/WebKitLegacy/mac/WebView/WebClipView.mm (revision 246172) >+++ Source/WebKitLegacy/mac/WebView/WebClipView.mm (working copy) >@@ -174,15 +174,8 @@ - (NSRect)_focusRingVisibleRect > - (void)scrollWheel:(NSEvent *)event > { > NSView *docView = [self documentView]; >- if ([docView respondsToSelector:@selector(_webView)]) { >-#if ENABLE(DASHBOARD_SUPPORT) >- WebView *wv = [docView _webView]; >- if ([wv _dashboardBehavior:WebDashboardBehaviorAllowWheelScrolling]) { >- [super scrollWheel:event]; >- } >-#endif >+ if ([docView respondsToSelector:@selector(_webView)]) > return; >- } > [super scrollWheel:event]; > } > >Index: Source/WebKitLegacy/mac/WebView/WebDashboardRegion.h >=================================================================== >--- Source/WebKitLegacy/mac/WebView/WebDashboardRegion.h (revision 246172) >+++ Source/WebKitLegacy/mac/WebView/WebDashboardRegion.h (nonexistent) >@@ -1,51 +0,0 @@ >-/* >- * Copyright (C) 2004 Apple Inc. All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY >- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR >- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, >- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR >- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY >- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE >- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >- */ >- >-#if !defined(ENABLE_DASHBOARD_SUPPORT) >-#define ENABLE_DASHBOARD_SUPPORT 1 >-#endif >- >-#if ENABLE_DASHBOARD_SUPPORT >- >-typedef enum { >- WebDashboardRegionTypeNone, >- WebDashboardRegionTypeCircle, >- WebDashboardRegionTypeRectangle, >- WebDashboardRegionTypeScrollerRectangle >-} WebDashboardRegionType; >- >-@interface WebDashboardRegion : NSObject <NSCopying> >-{ >- NSRect rect; >- NSRect clip; >- WebDashboardRegionType type; >-} >-- (id)initWithRect:(NSRect)rect clip:(NSRect)clip type:(WebDashboardRegionType)type; >-- (NSRect)dashboardRegionClip; >-- (NSRect)dashboardRegionRect; >-- (WebDashboardRegionType)dashboardRegionType; >-@end >- >-#endif > >Property changes on: Source/WebKitLegacy/mac/WebView/WebDashboardRegion.h >___________________________________________________________________ >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Index: Source/WebKitLegacy/mac/WebView/WebDashboardRegion.mm >=================================================================== >--- Source/WebKitLegacy/mac/WebView/WebDashboardRegion.mm (revision 246172) >+++ Source/WebKitLegacy/mac/WebView/WebDashboardRegion.mm (nonexistent) >@@ -1,95 +0,0 @@ >-/* >- * Copyright (C) 2004 Apple Inc. All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY >- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR >- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, >- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR >- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY >- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE >- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >- */ >- >-#import "WebDashboardRegion.h" >- >-#if ENABLE(DASHBOARD_SUPPORT) >- >-@implementation WebDashboardRegion >- >-- (id)initWithRect:(NSRect)r clip:(NSRect)c type:(WebDashboardRegionType)t >-{ >- self = [super init]; >- rect = r; >- clip = c; >- type = t; >- return self; >-} >- >-- (id)copyWithZone:(NSZone *)unusedZone >-{ >- UNUSED_PARAM(unusedZone); >- >- return [self retain]; >-} >- >-- (NSRect)dashboardRegionClip >-{ >- return clip; >-} >- >-- (NSRect)dashboardRegionRect >-{ >- return rect; >-} >- >-- (WebDashboardRegionType)dashboardRegionType >-{ >- return type; >-} >- >-static const char* typeName(WebDashboardRegionType type) >-{ >- switch (type) { >- case WebDashboardRegionTypeNone: >- return "None"; >- case WebDashboardRegionTypeCircle: >- return "Circle"; >- case WebDashboardRegionTypeRectangle: >- return "Rectangle"; >- case WebDashboardRegionTypeScrollerRectangle: >- return "ScrollerRectangle"; >- } >- return "Unknown"; >-} >- >-- (NSString *)description >-{ >- return [NSString stringWithFormat:@"rect:%@ clip:%@ type:%s", NSStringFromRect(rect), NSStringFromRect(clip), typeName(type)]; >-} >- >-// FIXME: Overriding isEqual: without overriding hash will cause trouble if this ever goes into an NSSet or is the key in an NSDictionary, >-// since two equal objects could have different hashes. >-- (BOOL)isEqual:(id)other >-{ >- if (![other isKindOfClass:[WebDashboardRegion class]]) >- return NO; >- >- return NSEqualRects(rect, [other dashboardRegionRect]) && NSEqualRects(clip, [other dashboardRegionClip]) && type == [other dashboardRegionType]; >-} >- >-@end >- >-#endif > >Property changes on: Source/WebKitLegacy/mac/WebView/WebDashboardRegion.mm >___________________________________________________________________ >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Index: Source/WebKitLegacy/mac/WebView/WebHTMLView.mm >=================================================================== >--- Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (revision 246172) >+++ Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (working copy) >@@ -1983,14 +1983,9 @@ - (void)_updateMouseoverWithEvent:(NSEve > // If it is one of those cases where the page is not active and the mouse is not pressed, then we can > // fire a much more restricted and efficient scrollbars-only version of the event. > >- if ([[self window] isKeyWindow] >- || mouseEventIsPartOfClickOrDrag(event) >-#if ENABLE(DASHBOARD_SUPPORT) >- || [[self _webView] _dashboardBehavior:WebDashboardBehaviorAlwaysSendMouseEventsToAllWindows] >-#endif >- ) { >+ if ([[self window] isKeyWindow] || mouseEventIsPartOfClickOrDrag(event)) > coreFrame->eventHandler().mouseMoved(event, [[self _webView] _pressureEvent]); >- } else { >+ else { > [self removeAllToolTips]; > coreFrame->eventHandler().passMouseMovedEventToScrollbars(event, [[self _webView] _pressureEvent]); > } >@@ -4147,12 +4142,7 @@ - (BOOL)acceptsFirstMouse:(NSEvent *)eve > > NSView *hitView = [self _hitViewForEvent:event]; > WebHTMLView *hitHTMLView = [hitView isKindOfClass:[self class]] ? (WebHTMLView *)hitView : nil; >- >-#if ENABLE(DASHBOARD_SUPPORT) >- if ([[self _webView] _dashboardBehavior:WebDashboardBehaviorAlwaysAcceptsFirstMouse]) >- return YES; >-#endif >- >+ > if (hitHTMLView) { > bool result = false; > if (Frame* coreFrame = core([hitHTMLView _frame])) { >@@ -4687,11 +4677,7 @@ - (void)setDataSource:(WebDataSource *)d > #if PLATFORM(MAC) > if (!_private->installedTrackingArea) { > NSTrackingAreaOptions options = NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect | NSTrackingCursorUpdate; >- if (_NSRecommendedScrollerStyle() == NSScrollerStyleLegacy >-#if ENABLE(DASHBOARD_SUPPORT) >- || [[self _webView] _dashboardBehavior:WebDashboardBehaviorAlwaysSendMouseEventsToAllWindows] >-#endif >- ) >+ if (_NSRecommendedScrollerStyle() == NSScrollerStyleLegacy) > options |= NSTrackingActiveAlways; > else > options |= NSTrackingActiveInKeyWindow; >Index: Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h >=================================================================== >--- Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h (revision 246172) >+++ Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h (working copy) >@@ -29,14 +29,6 @@ > #import <WebKitLegacy/WebAllowDenyPolicyListener.h> > #import <WebKitLegacy/WebUIDelegate.h> > >-#if !defined(ENABLE_DASHBOARD_SUPPORT) >-#if !TARGET_OS_IPHONE >-#define ENABLE_DASHBOARD_SUPPORT 1 >-#else >-#define ENABLE_DASHBOARD_SUPPORT 0 >-#endif >-#endif >- > #if !defined(ENABLE_FULLSCREEN_API) > #if !TARGET_OS_IPHONE > #define ENABLE_FULLSCREEN_API 1 >@@ -202,11 +194,6 @@ @interface NSObject (WebUIDelegatePrivat > > - (NSView *)webView:(WebView *)webView plugInViewWithArguments:(NSDictionary *)arguments; > >-#if ENABLE_DASHBOARD_SUPPORT >-// regions is an dictionary whose keys are regions label and values are arrays of WebDashboardRegions. >-- (void)webView:(WebView *)webView dashboardRegionsChanged:(NSDictionary *)regions; >-#endif >- > #if !TARGET_OS_IPHONE > - (void)webView:(WebView *)sender dragImage:(NSImage *)anImage at:(NSPoint)viewLocation offset:(NSSize)initialOffset event:(NSEvent *)event pasteboard:(NSPasteboard *)pboard source:(id)sourceObj slideBack:(BOOL)slideFlag forView:(NSView *)view; > #endif >Index: Source/WebKitLegacy/mac/WebView/WebView.mm >=================================================================== >--- Source/WebKitLegacy/mac/WebView/WebView.mm (revision 246172) >+++ Source/WebKitLegacy/mac/WebView/WebView.mm (working copy) >@@ -304,10 +304,6 @@ > #import <wtf/FastMalloc.h> > #endif > >-#if ENABLE(DASHBOARD_SUPPORT) >-#import <WebKitLegacy/WebDashboardRegion.h> >-#endif >- > #if ENABLE(REMOTE_INSPECTOR) > #import <JavaScriptCore/RemoteInspector.h> > #if PLATFORM(IOS_FAMILY) >@@ -2801,11 +2797,6 @@ - (BOOL)_needsPreHTML5ParserQuirks > > return isApplicationNeedingParserQuirks > || isAppleMail >-#if ENABLE(DASHBOARD_SUPPORT) >- // Pre-HTML5 parser quirks are required to remain compatible with many >- // Dashboard widgets. See <rdar://problem/8175982>. >- || (_private->page && _private->page->settings().usesDashboardBackwardCompatibilityMode()) >-#endif > || [[self preferences] usePreHTML5ParserQuirks]; > #else > return [[self preferences] usePreHTML5ParserQuirks]; >@@ -3766,185 +3757,6 @@ - (void)_didCommitLoadForFrame:(WebFrame > > #endif // PLATFORM(IOS_FAMILY) > >-#if ENABLE(DASHBOARD_SUPPORT) >- >-#define DASHBOARD_CONTROL_LABEL @"control" >- >-- (void)_addControlRect:(NSRect)bounds clip:(NSRect)clip fromView:(NSView *)view toDashboardRegions:(NSMutableDictionary *)regions >-{ >- NSRect adjustedBounds = bounds; >- adjustedBounds.origin = [self convertPoint:bounds.origin fromView:view]; >- adjustedBounds.origin.y = [self bounds].size.height - adjustedBounds.origin.y; >- adjustedBounds.size = bounds.size; >- >- NSRect adjustedClip; >- adjustedClip.origin = [self convertPoint:clip.origin fromView:view]; >- adjustedClip.origin.y = [self bounds].size.height - adjustedClip.origin.y; >- adjustedClip.size = clip.size; >- >- WebDashboardRegion *region = [[WebDashboardRegion alloc] initWithRect:adjustedBounds >- clip:adjustedClip type:WebDashboardRegionTypeScrollerRectangle]; >- NSMutableArray *scrollerRegions = [regions objectForKey:DASHBOARD_CONTROL_LABEL]; >- if (!scrollerRegions) { >- scrollerRegions = [[NSMutableArray alloc] init]; >- [regions setObject:scrollerRegions forKey:DASHBOARD_CONTROL_LABEL]; >- [scrollerRegions release]; >- } >- [scrollerRegions addObject:region]; >- [region release]; >-} >- >-- (void)_addScrollerDashboardRegionsForFrameView:(FrameView*)frameView dashboardRegions:(NSMutableDictionary *)regions >-{ >- NSView *documentView = [[kit(&frameView->frame()) frameView] documentView]; >- >- for (const auto& widget: frameView->children()) { >- if (is<FrameView>(widget)) { >- [self _addScrollerDashboardRegionsForFrameView:&downcast<FrameView>(widget.get()) dashboardRegions:regions]; >- continue; >- } >- >- if (!widget->isScrollbar()) >- continue; >- >- // FIXME: This should really pass an appropriate clip, but our first try got it wrong, and >- // it's not common to need this to be correct in Dashboard widgets. >- NSRect bounds = widget->frameRect(); >- [self _addControlRect:bounds clip:bounds fromView:documentView toDashboardRegions:regions]; >- } >-} >- >-- (void)_addScrollerDashboardRegions:(NSMutableDictionary *)regions from:(NSArray *)views >-{ >- // Add scroller regions for NSScroller and WebCore scrollbars >- NSUInteger count = [views count]; >- for (NSUInteger i = 0; i < count; i++) { >- NSView *view = [views objectAtIndex:i]; >- >- if ([view isKindOfClass:[WebHTMLView class]]) { >- if (Frame* coreFrame = core([(WebHTMLView*)view _frame])) { >- if (FrameView* coreView = coreFrame->view()) >- [self _addScrollerDashboardRegionsForFrameView:coreView dashboardRegions:regions]; >- } >- } else if ([view isKindOfClass:[NSScroller class]]) { >- // AppKit places absent scrollers at -100,-100 >- if ([view frame].origin.y < 0) >- continue; >- [self _addControlRect:[view bounds] clip:[view visibleRect] fromView:view toDashboardRegions:regions]; >- } >- [self _addScrollerDashboardRegions:regions from:[view subviews]]; >- } >-} >- >-- (void)_addScrollerDashboardRegions:(NSMutableDictionary *)regions >-{ >- [self _addScrollerDashboardRegions:regions from:[self subviews]]; >-} >- >-- (NSDictionary *)_dashboardRegions >-{ >- // Only return regions from main frame. >- Frame* mainFrame = [self _mainCoreFrame]; >- if (!mainFrame) >- return nil; >- >- const Vector<AnnotatedRegionValue>& regions = mainFrame->document()->annotatedRegions(); >- size_t size = regions.size(); >- >- NSMutableDictionary *webRegions = [NSMutableDictionary dictionaryWithCapacity:size]; >- for (size_t i = 0; i < size; i++) { >- const AnnotatedRegionValue& region = regions[i]; >- >- if (region.type == StyleDashboardRegion::None) >- continue; >- >- NSString *label = region.label; >- WebDashboardRegionType type = WebDashboardRegionTypeNone; >- if (region.type == StyleDashboardRegion::Circle) >- type = WebDashboardRegionTypeCircle; >- else if (region.type == StyleDashboardRegion::Rectangle) >- type = WebDashboardRegionTypeRectangle; >- NSMutableArray *regionValues = [webRegions objectForKey:label]; >- if (!regionValues) { >- regionValues = [[NSMutableArray alloc] initWithCapacity:1]; >- [webRegions setObject:regionValues forKey:label]; >- [regionValues release]; >- } >- >- WebDashboardRegion *webRegion = [[WebDashboardRegion alloc] initWithRect:snappedIntRect(region.bounds) clip:snappedIntRect(region.clip) type:type]; >- [regionValues addObject:webRegion]; >- [webRegion release]; >- } >- >- [self _addScrollerDashboardRegions:webRegions]; >- >- return webRegions; >-} >- >-- (void)_setDashboardBehavior:(WebDashboardBehavior)behavior to:(BOOL)flag >-{ >- // FIXME: Remove this blanket assignment once Dashboard and Dashcode implement >- // specific support for the backward compatibility mode flag. >- if (behavior == WebDashboardBehaviorAllowWheelScrolling && flag == NO && _private->page) >- _private->page->settings().setUsesDashboardBackwardCompatibilityMode(true); >- >- switch (behavior) { >- case WebDashboardBehaviorAlwaysSendMouseEventsToAllWindows: { >- _private->dashboardBehaviorAlwaysSendMouseEventsToAllWindows = flag; >- break; >- } >- case WebDashboardBehaviorAlwaysSendActiveNullEventsToPlugIns: { >- _private->dashboardBehaviorAlwaysSendActiveNullEventsToPlugIns = flag; >- break; >- } >- case WebDashboardBehaviorAlwaysAcceptsFirstMouse: { >- _private->dashboardBehaviorAlwaysAcceptsFirstMouse = flag; >- break; >- } >- case WebDashboardBehaviorAllowWheelScrolling: { >- _private->dashboardBehaviorAllowWheelScrolling = flag; >- break; >- } >- case WebDashboardBehaviorUseBackwardCompatibilityMode: { >- if (_private->page) >- _private->page->settings().setUsesDashboardBackwardCompatibilityMode(flag); >-#if ENABLE(LEGACY_CSS_VENDOR_PREFIXES) >- RuntimeEnabledFeatures::sharedFeatures().setLegacyCSSVendorPrefixesEnabled(flag); >-#endif >- break; >- } >- } >- >- // Pre-HTML5 parser quirks should be enabled if Dashboard is in backward >- // compatibility mode. See <rdar://problem/8175982>. >- if (_private->page) >- _private->page->settings().setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]); >-} >- >-- (BOOL)_dashboardBehavior:(WebDashboardBehavior)behavior >-{ >- switch (behavior) { >- case WebDashboardBehaviorAlwaysSendMouseEventsToAllWindows: { >- return _private->dashboardBehaviorAlwaysSendMouseEventsToAllWindows; >- } >- case WebDashboardBehaviorAlwaysSendActiveNullEventsToPlugIns: { >- return _private->dashboardBehaviorAlwaysSendActiveNullEventsToPlugIns; >- } >- case WebDashboardBehaviorAlwaysAcceptsFirstMouse: { >- return _private->dashboardBehaviorAlwaysAcceptsFirstMouse; >- } >- case WebDashboardBehaviorAllowWheelScrolling: { >- return _private->dashboardBehaviorAllowWheelScrolling; >- } >- case WebDashboardBehaviorUseBackwardCompatibilityMode: { >- return _private->page && _private->page->settings().usesDashboardBackwardCompatibilityMode(); >- } >- } >- return NO; >-} >- >-#endif /* ENABLE(DASHBOARD_SUPPORT) */ >- > + (void)_setShouldUseFontSmoothing:(BOOL)f > { > FontCascade::setShouldUseSmoothing(f); >Index: Source/WebKitLegacy/mac/WebView/WebViewData.h >=================================================================== >--- Source/WebKitLegacy/mac/WebView/WebViewData.h (revision 246172) >+++ Source/WebKitLegacy/mac/WebView/WebViewData.h (working copy) >@@ -269,13 +269,6 @@ @interface WebViewPrivate : NSObject { > BOOL hasSpellCheckerDocumentTag; > NSInteger spellCheckerDocumentTag; > >-#if ENABLE(DASHBOARD_SUPPORT) >- BOOL dashboardBehaviorAlwaysSendMouseEventsToAllWindows; >- BOOL dashboardBehaviorAlwaysSendActiveNullEventsToPlugIns; >- BOOL dashboardBehaviorAlwaysAcceptsFirstMouse; >- BOOL dashboardBehaviorAllowWheelScrolling; >-#endif >- > #if PLATFORM(IOS_FAMILY) > BOOL isStopping; > >Index: Source/WebKitLegacy/mac/WebView/WebViewData.mm >=================================================================== >--- Source/WebKitLegacy/mac/WebView/WebViewData.mm (revision 246172) >+++ Source/WebKitLegacy/mac/WebView/WebViewData.mm (working copy) >@@ -198,10 +198,6 @@ - (id)init > // The default value should be synchronized with WebCore/page/Settings.cpp. > validationMessageTimerMagnification = 50; > >-#if ENABLE(DASHBOARD_SUPPORT) >- dashboardBehaviorAllowWheelScrolling = YES; >-#endif >- > #if PLATFORM(IOS_FAMILY) > isStopping = NO; > _geolocationProvider = [WebGeolocationProviderIOS sharedGeolocationProvider]; >Index: Source/WebKitLegacy/mac/WebView/WebViewPrivate.h >=================================================================== >--- Source/WebKitLegacy/mac/WebView/WebViewPrivate.h (revision 246172) >+++ Source/WebKitLegacy/mac/WebView/WebViewPrivate.h (working copy) >@@ -34,14 +34,6 @@ > #import <CoreGraphics/CGColor.h> > #endif > >-#if !defined(ENABLE_DASHBOARD_SUPPORT) >-#if TARGET_OS_IPHONE >-#define ENABLE_DASHBOARD_SUPPORT 0 >-#else >-#define ENABLE_DASHBOARD_SUPPORT 1 >-#endif >-#endif >- > #if !defined(ENABLE_REMOTE_INSPECTOR) > // FIXME: Should we just remove this ENABLE flag everywhere? > #define ENABLE_REMOTE_INSPECTOR 1 >@@ -123,16 +115,6 @@ extern NSString *WebQuickLookUTIKey; > > extern NSString * const WebViewWillCloseNotification; > >-#if ENABLE_DASHBOARD_SUPPORT >-typedef enum { >- WebDashboardBehaviorAlwaysSendMouseEventsToAllWindows, >- WebDashboardBehaviorAlwaysSendActiveNullEventsToPlugIns, >- WebDashboardBehaviorAlwaysAcceptsFirstMouse, >- WebDashboardBehaviorAllowWheelScrolling, >- WebDashboardBehaviorUseBackwardCompatibilityMode >-} WebDashboardBehavior; >-#endif >- > typedef enum { > WebInjectAtDocumentStart, > WebInjectAtDocumentEnd, >@@ -553,14 +535,6 @@ Could be worth adding to the API. > - (NSCachedURLResponse *)_cachedResponseForURL:(NSURL *)URL; > #endif > >-#if ENABLE_DASHBOARD_SUPPORT >-- (void)_addScrollerDashboardRegions:(NSMutableDictionary *)regions; >-- (NSDictionary *)_dashboardRegions; >- >-- (void)_setDashboardBehavior:(WebDashboardBehavior)behavior to:(BOOL)flag; >-- (BOOL)_dashboardBehavior:(WebDashboardBehavior)behavior; >-#endif >- > + (void)_setShouldUseFontSmoothing:(BOOL)f; > + (BOOL)_shouldUseFontSmoothing; > >Index: Tools/ChangeLog >=================================================================== >--- Tools/ChangeLog (revision 246172) >+++ Tools/ChangeLog (working copy) >@@ -1,3 +1,31 @@ >+2019-06-06 Ryosuke Niwa <rniwa@webkit.org> >+ >+ Remove dashboard code >+ https://bugs.webkit.org/show_bug.cgi?id=198624 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * DumpRenderTree/TestRunner.cpp: >+ (TestRunner::staticFunctions): >+ (setUseDashboardCompatibilityModeCallback): Deleted. >+ * DumpRenderTree/TestRunner.h: >+ * DumpRenderTree/mac/Configurations/Base.xcconfig: >+ * DumpRenderTree/mac/DumpRenderTree.mm: >+ (resetWebViewToConsistentStateBeforeTesting): >+ * DumpRenderTree/mac/TestRunnerMac.mm: >+ (TestRunner::setUseDashboardCompatibilityMode): Deleted. >+ * TestWebKitAPI/Configurations/Base.xcconfig: >+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig: >+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: >+ * TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm: Removed. >+ * WebKitTestRunner/Configurations/Base.xcconfig: >+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: >+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp: >+ (WTR::InjectedBundle::beginTesting): >+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp: >+ (WTR::TestRunner::setUseDashboardCompatibilityMode): Deleted. >+ * WebKitTestRunner/InjectedBundle/TestRunner.h: >+ > 2019-06-06 Daniel Bates <dabates@apple.com> > > [lldb-webkit] TypeError: cannot concatenate 'str' and 'int' objects when prettify SecurityOrigin with >Index: Tools/DumpRenderTree/TestRunner.cpp >=================================================================== >--- Tools/DumpRenderTree/TestRunner.cpp (revision 246172) >+++ Tools/DumpRenderTree/TestRunner.cpp (working copy) >@@ -1266,18 +1266,6 @@ static JSValueRef setPagePausedCallback( > } > #endif > >-static JSValueRef setUseDashboardCompatibilityModeCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) >-{ >- // Has mac implementation >- if (argumentCount < 1) >- return JSValueMakeUndefined(context); >- >- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject)); >- controller->setUseDashboardCompatibilityMode(JSValueToBoolean(context, arguments[0])); >- >- return JSValueMakeUndefined(context); >-} >- > static JSValueRef setUserStyleSheetEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) > { > // Has mac implementation >@@ -2254,7 +2242,6 @@ JSStaticFunction* TestRunner::staticFunc > { "setTelephoneNumberParsingEnabled", setTelephoneNumberParsingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "setPagePaused", setPagePausedCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > #endif >- { "setUseDashboardCompatibilityMode", setUseDashboardCompatibilityModeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "setUserStyleSheetEnabled", setUserStyleSheetEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "setUserStyleSheetLocation", setUserStyleSheetLocationCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, > { "setValueForUser", setValueForUserCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, >Index: Tools/DumpRenderTree/TestRunner.h >=================================================================== >--- Tools/DumpRenderTree/TestRunner.h (revision 246172) >+++ Tools/DumpRenderTree/TestRunner.h (working copy) >@@ -118,7 +118,6 @@ public: > void setPopupBlockingEnabled(bool); > void setPrivateBrowsingEnabled(bool); > void setTabKeyCyclesThroughElements(bool); >- void setUseDashboardCompatibilityMode(bool flag); > void setUserStyleSheetEnabled(bool flag); > void setUserStyleSheetLocation(JSStringRef path); > void setValueForUser(JSContextRef, JSValueRef nodeObject, JSStringRef value); >Index: Tools/DumpRenderTree/mac/DumpRenderTree.mm >=================================================================== >--- Tools/DumpRenderTree/mac/DumpRenderTree.mm (revision 246172) >+++ Tools/DumpRenderTree/mac/DumpRenderTree.mm (working copy) >@@ -1861,9 +1861,6 @@ static void resetWebViewToConsistentStat > [policyDelegate setControllerToNotifyDone:0]; > [uiDelegate resetToConsistentStateBeforeTesting:options]; > [frameLoadDelegate resetToConsistentState]; >-#if !PLATFORM(IOS_FAMILY) >- [webView _setDashboardBehavior:WebDashboardBehaviorUseBackwardCompatibilityMode to:NO]; >-#endif > [webView _clearMainFrameName]; > [[webView undoManager] removeAllActions]; > [WebView _removeAllUserContentFromGroup:[webView groupName]]; >Index: Tools/DumpRenderTree/mac/TestRunnerMac.mm >=================================================================== >--- Tools/DumpRenderTree/mac/TestRunnerMac.mm (revision 246172) >+++ Tools/DumpRenderTree/mac/TestRunnerMac.mm (working copy) >@@ -591,13 +591,6 @@ void TestRunner::setPagePaused(bool paus > } > #endif > >-void TestRunner::setUseDashboardCompatibilityMode(bool flag) >-{ >-#if !PLATFORM(IOS_FAMILY) >- [[mainFrame webView] _setDashboardBehavior:WebDashboardBehaviorUseBackwardCompatibilityMode to:flag]; >-#endif >-} >- > void TestRunner::setUserStyleSheetEnabled(bool flag) > { > [[WebPreferences standardPreferences] setUserStyleSheetEnabled:flag]; >Index: Tools/DumpRenderTree/mac/Configurations/Base.xcconfig >=================================================================== >--- Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (revision 246172) >+++ Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (working copy) >@@ -45,7 +45,7 @@ PLATFORM_HEADER_SEARCH_PATHS[sdk=macosx* > GCC_NO_COMMON_BLOCKS = YES; > ENABLE_STRICT_OBJC_MSGSEND=YES; > GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME)); >-GCC_PREPROCESSOR_DEFINITIONS_macosx = ENABLE_DASHBOARD_SUPPORT; >+GCC_PREPROCESSOR_DEFINITIONS_macosx = ; > DEBUG_INFORMATION_FORMAT = dwarf-with-dsym; > PREBINDING = NO > GCC_C_LANGUAGE_STANDARD = gnu99 >Index: Tools/TestWebKitAPI/Configurations/Base.xcconfig >=================================================================== >--- Tools/TestWebKitAPI/Configurations/Base.xcconfig (revision 246172) >+++ Tools/TestWebKitAPI/Configurations/Base.xcconfig (working copy) >@@ -37,7 +37,7 @@ HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_D > > GCC_NO_COMMON_BLOCKS = YES; > GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME)); >-GCC_PREPROCESSOR_DEFINITIONS_macosx = ENABLE_DASHBOARD_SUPPORT; >+GCC_PREPROCESSOR_DEFINITIONS_macosx = ; > DEBUG_INFORMATION_FORMAT = dwarf-with-dsym; > PREBINDING = NO > GCC_C_LANGUAGE_STANDARD = gnu99 >Index: Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig >=================================================================== >--- Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (revision 246172) >+++ Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (working copy) >@@ -117,9 +117,6 @@ ENABLE_CUSTOM_SCHEME_HANDLER = ; > ENABLE_DARK_MODE_CSS = $(ENABLE_DARK_MODE_CSS_$(WK_PLATFORM_NAME)); > ENABLE_DARK_MODE_CSS_macosx = ENABLE_DARK_MODE_CSS; > >-ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(WK_PLATFORM_NAME)); >-ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT; >- > ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE; > > ENABLE_DATALIST_ELEMENT = ENABLE_DATALIST_ELEMENT; >@@ -445,4 +442,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NOTIFICATIONS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_PROCESS_SANDBOX) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >Index: Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj >=================================================================== >--- Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (revision 246172) >+++ Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (working copy) >@@ -507,7 +507,6 @@ > 7CCE7EB61A411A7E00447C4C /* CancelLoadFromResourceLoadDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26DF5A5D15A29BAA003689C2 /* CancelLoadFromResourceLoadDelegate.mm */; }; > 7CCE7EB71A411A7E00447C4C /* CloseNewWindowInNavigationPolicyDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 290A9BB51735DE8A00D71BBC /* CloseNewWindowInNavigationPolicyDelegate.mm */; }; > 7CCE7EB81A411A7E00447C4C /* ContextMenuCanCopyURL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5142B2701517C88B00C32B19 /* ContextMenuCanCopyURL.mm */; }; >- 7CCE7EB91A411A7E00447C4C /* DeviceScaleFactorInDashboardRegions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3776BC62150946BC0043A66D /* DeviceScaleFactorInDashboardRegions.mm */; }; > 7CCE7EBA1A411A7E00447C4C /* DeviceScaleFactorOnBack.mm in Sources */ = {isa = PBXBuildFile; fileRef = 939BA91614103412001A01BD /* DeviceScaleFactorOnBack.mm */; }; > 7CCE7EBB1A411A7E00447C4C /* DOMHTMLTableCellCellAbove.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37E1064A1697676400B78BD0 /* DOMHTMLTableCellCellAbove.mm */; }; > 7CCE7EBC1A411A7E00447C4C /* DOMNodeFromJSObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3751AF7A169518F800764319 /* DOMNodeFromJSObject.mm */; }; >@@ -1567,7 +1566,6 @@ > 3760C4F0211249AF00233ACC /* AttrStyle.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AttrStyle.mm; sourceTree = "<group>"; }; > 3760C4F221124BD000233ACC /* AttrStyle.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = AttrStyle.html; sourceTree = "<group>"; }; > 376C8C041D6E197C007D2BB9 /* FrameHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameHandle.cpp; sourceTree = "<group>"; }; >- 3776BC62150946BC0043A66D /* DeviceScaleFactorInDashboardRegions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DeviceScaleFactorInDashboardRegions.mm; sourceTree = "<group>"; }; > 3781746C2198AE2400062C26 /* WKProcessPoolConfiguration.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessPoolConfiguration.mm; sourceTree = "<group>"; }; > 378E64711632646D00B6C676 /* InjectedBundleFrameHitTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleFrameHitTest.cpp; sourceTree = "<group>"; }; > 378E64751632655D00B6C676 /* InjectedBundleFrameHitTest_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleFrameHitTest_Bundle.cpp; sourceTree = "<group>"; }; >@@ -3629,7 +3627,6 @@ > 5142B2701517C88B00C32B19 /* ContextMenuCanCopyURL.mm */, > 37FB72951DB2E82F00E41BE4 /* ContextMenuDefaultItemsHaveTags.mm */, > 7AEAD47C1E20113800416EFE /* CrossPartitionFileSchemeAccess.mm */, >- 3776BC62150946BC0043A66D /* DeviceScaleFactorInDashboardRegions.mm */, > 939BA91614103412001A01BD /* DeviceScaleFactorOnBack.mm */, > 37E1064A1697676400B78BD0 /* DOMHTMLTableCellCellAbove.mm */, > 2D51A0C51C8BF00400765C45 /* DOMHTMLVideoElementWrapper.mm */, >@@ -4192,7 +4189,6 @@ > 2D1646E21D1862CD00015A1A /* DeferredViewInWindowStateChange.mm in Sources */, > 2D2D13B3229F408B005068AF /* DeviceManagementRestrictions.mm in Sources */, > 46918EFC2237283C00468DFE /* DeviceOrientation.mm in Sources */, >- 7CCE7EB91A411A7E00447C4C /* DeviceScaleFactorInDashboardRegions.mm in Sources */, > 7CCE7EBA1A411A7E00447C4C /* DeviceScaleFactorOnBack.mm in Sources */, > 7C83E04D1D0A641800FEBCF3 /* DFACombiner.cpp in Sources */, > 7C83E04E1D0A641800FEBCF3 /* DFAMinimizer.cpp in Sources */, >Index: Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm >=================================================================== >--- Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm (revision 246172) >+++ Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm (nonexistent) >@@ -1,79 +0,0 @@ >-/* >- * Copyright (C) 2012 Apple Inc. All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >- * THE POSSIBILITY OF SUCH DAMAGE. >- */ >- >-#import "config.h" >- >-#import "PlatformUtilities.h" >-#import "SyntheticBackingScaleFactorWindow.h" >-#import "Test.h" >-#import <WebKit/WebDashboardRegion.h> >-#import <wtf/RetainPtr.h> >- >-static bool gotDashboardRegions; >-static NSDictionary *regions; >- >-@interface DeviceScaleFactorInDashboardRegionsUIDelegate : NSObject <WebUIDelegate> { >-} >-@end >- >-@implementation DeviceScaleFactorInDashboardRegionsUIDelegate >- >-- (void)webView:(WebView *)webView dashboardRegionsChanged:(NSDictionary *)newRegions >-{ >- gotDashboardRegions = true; >- regions = [newRegions retain]; >-} >- >-@end >- >-namespace TestWebKitAPI { >- >-TEST(WebKitLegacy, DeviceScaleFactorInDashboardRegions) >-{ >- NSRect viewFrame = NSMakeRect(0, 0, 800, 600); >- RetainPtr<SyntheticBackingScaleFactorWindow> window = adoptNS([[SyntheticBackingScaleFactorWindow alloc] initWithContentRect:viewFrame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]); >- [window.get() setReleasedWhenClosed:NO]; >- [window.get() setBackingScaleFactor:2]; >- >- RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:viewFrame frameName:nil groupName:nil]); >- RetainPtr<DeviceScaleFactorInDashboardRegionsUIDelegate> uiDelegate = adoptNS([DeviceScaleFactorInDashboardRegionsUIDelegate new]); >- webView.get().UIDelegate = uiDelegate.get(); >- [window.get().contentView addSubview:webView.get()]; >- >- [webView.get().mainFrame loadHTMLString:@"<div style='position: absolute; top: 10px; left: 10px; width: 50px; height: 50px; -webkit-dashboard-region: dashboard-region(control rectangle);'></div>" baseURL:[NSURL URLWithString:@"about:blank"]]; >- >- Util::run(&gotDashboardRegions); >- >- NSRect controlRegionRect = [[[regions objectForKey:@"control"] objectAtIndex:0] dashboardRegionRect]; >- >- EXPECT_EQ(10, controlRegionRect.origin.x); >- EXPECT_EQ(10, controlRegionRect.origin.y); >- EXPECT_EQ(50, controlRegionRect.size.width); >- EXPECT_EQ(50, controlRegionRect.size.height); >- >- [regions release]; >-} >- >-} // namespace TestWebKitAPI >Index: Tools/WebKitTestRunner/Configurations/Base.xcconfig >=================================================================== >--- Tools/WebKitTestRunner/Configurations/Base.xcconfig (revision 246172) >+++ Tools/WebKitTestRunner/Configurations/Base.xcconfig (working copy) >@@ -56,7 +56,7 @@ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIO > HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport $(PLATFORM_HEADER_SEARCH_PATHS); > PLATFORM_HEADER_SEARCH_PATHS[sdk=iphone*] = $(SRCROOT)/../../Source/WebKit/Platform/spi/ios; > GCC_NO_COMMON_BLOCKS = YES; >-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 ENABLE_DASHBOARD_SUPPORT; >+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0; > DEBUG_INFORMATION_FORMAT = dwarf-with-dsym; > PREBINDING = NO > GCC_C_LANGUAGE_STANDARD = gnu99 >Index: Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp >=================================================================== >--- Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (revision 246172) >+++ Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (working copy) >@@ -494,7 +494,6 @@ void InjectedBundle::beginTesting(WKDict > WKBundleSetAllowUniversalAccessFromFileURLs(m_bundle, m_pageGroup, true); > WKBundleSetJavaScriptCanAccessClipboard(m_bundle, m_pageGroup, true); > WKBundleSetPrivateBrowsingEnabled(m_bundle, m_pageGroup, false); >- WKBundleSetUseDashboardCompatibilityMode(m_bundle, m_pageGroup, false); > WKBundleSetAuthorAndUserStylesEnabled(m_bundle, m_pageGroup, true); > WKBundleSetFrameFlatteningEnabled(m_bundle, m_pageGroup, false); > WKBundleSetMinimumLogicalFontSize(m_bundle, m_pageGroup, 9); >Index: Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp >=================================================================== >--- Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (revision 246172) >+++ Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (working copy) >@@ -536,16 +536,6 @@ void TestRunner::setPrivateBrowsingEnabl > WKBundleSetPrivateBrowsingEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled); > } > >-void TestRunner::setUseDashboardCompatibilityMode(bool enabled) >-{ >-#if ENABLE(DASHBOARD_SUPPORT) >- auto& injectedBundle = InjectedBundle::singleton(); >- WKBundleSetUseDashboardCompatibilityMode(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled); >-#else >- UNUSED_PARAM(enabled); >-#endif >-} >- > void TestRunner::setPopupBlockingEnabled(bool enabled) > { > auto& injectedBundle = InjectedBundle::singleton(); >Index: Tools/WebKitTestRunner/InjectedBundle/TestRunner.h >=================================================================== >--- Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (revision 246172) >+++ Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (working copy) >@@ -113,7 +113,6 @@ public: > void setPluginsEnabled(bool); > void setJavaScriptCanAccessClipboard(bool); > void setPrivateBrowsingEnabled(bool); >- void setUseDashboardCompatibilityMode(bool); > void setPopupBlockingEnabled(bool); > void setAuthorAndUserStylesEnabled(bool); > void setCustomPolicyDelegate(bool enabled, bool permissive = false); >Index: Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl >=================================================================== >--- Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (revision 246172) >+++ Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (working copy) >@@ -86,7 +86,6 @@ interface TestRunner { > void setPluginsEnabled(boolean value); > void setJavaScriptCanAccessClipboard(boolean value); > void setPrivateBrowsingEnabled(boolean value); >- void setUseDashboardCompatibilityMode(boolean value); > void setPopupBlockingEnabled(boolean value); > void setAuthorAndUserStylesEnabled(boolean value); > void setCustomPolicyDelegate(boolean enabled, boolean permissive); >Index: LayoutTests/ChangeLog >=================================================================== >--- LayoutTests/ChangeLog (revision 246172) >+++ LayoutTests/ChangeLog (working copy) >@@ -1,3 +1,38 @@ >+2019-06-06 Ryosuke Niwa <rniwa@webkit.org> >+ >+ Remove dashboard code >+ https://bugs.webkit.org/show_bug.cgi?id=198624 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * fast/canvas/fill-stroke-clip-reset-path-expected.txt: Removed. >+ * fast/canvas/fill-stroke-clip-reset-path.html: Removed. >+ * http/tests/xmlhttprequest/default-content-type-dashboard-expected.txt: Removed. >+ * http/tests/xmlhttprequest/default-content-type-dashboard.html: Removed. >+ * mathml/mathml-in-dashboard-expected.txt: Removed. >+ * mathml/mathml-in-dashboard.html: Removed. >+ * platform/gtk/TestExpectations: >+ * platform/gtk/fast/canvas/fill-stroke-clip-reset-path-expected.png: Removed. >+ * platform/ios-simulator-wk2/TestExpectations: >+ * platform/ios-wk1/TestExpectations: >+ * platform/ios/TestExpectations: >+ * platform/ios/mathml/mathml-in-dashboard-expected.txt: Removed. >+ * platform/mac/fast/canvas/fill-stroke-clip-reset-path-expected.png: Removed. >+ * platform/mac/fast/dom/HTMLImageElement/dashboard-src-quirk-expected.txt: Removed. >+ * platform/mac/fast/dom/HTMLImageElement/dashboard-src-quirk.html: Removed. >+ * platform/mac/mathml/mathml-in-dashboard-expected.png: Removed. >+ * platform/mac/mathml/mathml-in-dashboard-expected.txt: Removed. >+ * platform/win/TestExpectations: >+ * platform/wincairo/TestExpectations: >+ * svg/custom/embedded-svg-allowed-in-dashboard-expected.txt: Removed. >+ * svg/custom/embedded-svg-allowed-in-dashboard.xml: Removed. >+ * svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard-expected.txt: Removed. >+ * svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html: Removed. >+ * svg/custom/manually-parsed-svg-allowed-in-dashboard-expected.txt: Removed. >+ * svg/custom/manually-parsed-svg-allowed-in-dashboard.html: Removed. >+ * svg/custom/svg-allowed-in-dashboard-object-expected.txt: Removed. >+ * svg/custom/svg-allowed-in-dashboard-object.html: Removed. >+ > 2019-06-05 Said Abou-Hallawa <sabouhallawa@apple.com> > > REGRESSION (r243121): Load event should not be fired while animating the 'externalResourcesRequired' attribute >Index: LayoutTests/fast/canvas/fill-stroke-clip-reset-path-expected.txt >=================================================================== >--- LayoutTests/fast/canvas/fill-stroke-clip-reset-path-expected.txt (revision 246172) >+++ LayoutTests/fast/canvas/fill-stroke-clip-reset-path-expected.txt (nonexistent) >@@ -1,6 +0,0 @@ >-All three of these small canvases should be green, not red. >- >- >-All three of these small canvases should be green, not red, too, but these test the Dashboard compatibility mode so they work properly only under DumpRenderTree. >- >- >Index: LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html >=================================================================== >--- LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html (revision 246172) >+++ LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html (nonexistent) >@@ -1,49 +0,0 @@ >-<html> >-<head> >-<script> >-function testOne(operation, quirk) >-{ >- if (window.testRunner){ >- testRunner.dumpAsText(true); >- if (testRunner.setUseDashboardCompatibilityMode) >- testRunner.setUseDashboardCompatibilityMode(quirk); >- } >- >- var canvas = document.getElementById(operation + "-" + (quirk ? "" : "no-") + "quirk"); >- var context = canvas.getContext('2d'); >- >- context.fillStyle = quirk ? "green" : "red"; >- context.fillRect(0, 0, 1000, 1000); >- >- context.moveTo(0, 0); >- context.lineTo(0, 1000); >- context.lineTo(1000, 1000); >- context.lineTo(1000, 0); >- context.closePath(); >- context[operation](); >- >- context.fillStyle = quirk ? "red" : "green"; >- context.fill(); >-} >-function test() >-{ >- testOne("fill", false); >- testOne("stroke", false); >- testOne("clip", false); >- testOne("fill", true); >- testOne("stroke", true); >- testOne("clip", true); >-} >-</script> >-</head> >-<body onload="test()"> >-<p>All three of these small canvases should be green, not red.</p> >-<canvas id="fill-no-quirk" width="20" height="20"></canvas> >-<canvas id="stroke-no-quirk" width="20" height="20"></canvas> >-<canvas id="clip-no-quirk" width="20" height="20"></canvas> >-<p>All three of these small canvases should be green, not red, too, but these test the Dashboard compatibility mode so they work properly only under DumpRenderTree.</p> >-<canvas id="fill-quirk" width="20" height="20"></canvas> >-<canvas id="stroke-quirk" width="20" height="20"></canvas> >-<canvas id="clip-quirk" width="20" height="20"></canvas> >-</body> >-</html> > >Property changes on: LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html >___________________________________________________________________ >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/html >\ No newline at end of property >Index: LayoutTests/http/tests/xmlhttprequest/default-content-type-dashboard-expected.txt >=================================================================== >--- LayoutTests/http/tests/xmlhttprequest/default-content-type-dashboard-expected.txt (revision 246172) >+++ LayoutTests/http/tests/xmlhttprequest/default-content-type-dashboard-expected.txt (nonexistent) >@@ -1,4 +0,0 @@ >-This tests that the default Content-Type for XMLHttpRequest is application/x-www-form-urlencoded when running in the Dashboard compatibility mode. >- >-application/x-www-form-urlencoded >- >Index: LayoutTests/http/tests/xmlhttprequest/default-content-type-dashboard.html >=================================================================== >--- LayoutTests/http/tests/xmlhttprequest/default-content-type-dashboard.html (revision 246172) >+++ LayoutTests/http/tests/xmlhttprequest/default-content-type-dashboard.html (nonexistent) >@@ -1,16 +0,0 @@ >-<html> >-<body> >-<p>This tests that the default Content-Type for XMLHttpRequest is application/x-www-form-urlencoded when running in the Dashboard compatibility mode.</p> >-<script> >- if (window.testRunner) { >- testRunner.setUseDashboardCompatibilityMode(true); >- testRunner.dumpAsText(); >- } >- >- objXmlHttp = new XMLHttpRequest; >- objXmlHttp.open("POST", "print-content-type.cgi", false); >- objXmlHttp.send(""); >- document.write("<pre>" + objXmlHttp.responseText + "</pre>"); >-</script> >-</body> >-</html> >Index: LayoutTests/mathml/mathml-in-dashboard-expected.txt >=================================================================== >--- LayoutTests/mathml/mathml-in-dashboard-expected.txt (revision 246172) >+++ LayoutTests/mathml/mathml-in-dashboard-expected.txt (nonexistent) >@@ -1,13 +0,0 @@ >-layer at (0,0) size 800x600 >- RenderView at (0,0) size 800x600 >-layer at (0,0) size 800x600 >- RenderBlock {HTML} at (0,0) size 800x600 >- RenderBody {BODY} at (8,8) size 784x584 >- RenderBlock {P} at (0,0) size 784x34 >- RenderText {#text} at (0,0) size 651x34 >- text run at (0,0) width 210: "This tests that MathML works in " >- text run at (210,0) width 441: "dashboard compatibility mode. The render tree dump should include a" >- text run at (0,17) width 140: "RenderMathMLMath." >- RenderBlock (anonymous) at (0,50) size 784x0 >- RenderMathMLMath {math} at (0,0) size 0x0 >- RenderText {#text} at (0,0) size 0x0 >Index: LayoutTests/mathml/mathml-in-dashboard.html >=================================================================== >--- LayoutTests/mathml/mathml-in-dashboard.html (revision 246172) >+++ LayoutTests/mathml/mathml-in-dashboard.html (nonexistent) >@@ -1,7 +0,0 @@ >-<script> >- if (window.testRunner) >- testRunner.setUseDashboardCompatibilityMode(true); >- >-</script> >-<p>This tests that MathML works in dashboard compatibility mode. The render tree dump should include a RenderMathMLMath.</p> >-<math></math> >Index: LayoutTests/platform/gtk/TestExpectations >=================================================================== >--- LayoutTests/platform/gtk/TestExpectations (revision 246172) >+++ LayoutTests/platform/gtk/TestExpectations (working copy) >@@ -1059,15 +1059,6 @@ webkit.org/b/168189 fast/scrolling/scrol > webkit.org/b/168366 http/tests/security/credentials-iframes.html > webkit.org/b/168366 http/tests/security/credentials-iframes-allowCrossOriginSubresourcesToAskForCredentials.html > >-# DASHBOARD_SUPPORT is mac only >-http/tests/xmlhttprequest/default-content-type-dashboard.html [ Skip ] >-http/tests/xmlhttprequest/svg-created-by-xhr-allowed-in-dashboard.html [ Skip ] >-svg/custom/embedded-svg-allowed-in-dashboard.xml [ Skip ] >-svg/custom/manually-parsed-svg-allowed-in-dashboard.html [ Skip ] >-svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html [ Skip ] >-svg/custom/svg-allowed-in-dashboard-object.html [ Skip ] >-mathml/mathml-in-dashboard.html [ Skip ] >- > # No embedded PDF support > fast/hidpi/pdf-image-scaled.html [ Skip ] > fast/images/displaced-non-cached-pdf.html [ Skip ] >Index: LayoutTests/platform/gtk/fast/canvas/fill-stroke-clip-reset-path-expected.png >=================================================================== >Cannot display: file marked as a binary type. >svn:mime-type = image/png > >Property changes on: LayoutTests/platform/gtk/fast/canvas/fill-stroke-clip-reset-path-expected.png >___________________________________________________________________ >Deleted: svn:mime-type >## -1 +0,0 ## >-image/png >\ No newline at end of property >Index: LayoutTests/platform/ios-simulator-wk2/TestExpectations >=================================================================== >--- LayoutTests/platform/ios-simulator-wk2/TestExpectations (revision 246172) >+++ LayoutTests/platform/ios-simulator-wk2/TestExpectations (working copy) >@@ -18,14 +18,6 @@ webkit.org/b/152439 compositing/overflow > > webkit.org/b/173178 [ Release ] svg/animations/svglength-element-removed-crash.svg [ Skip ] > >-# iOS simulator doesnât support dashboard. >-mathml/mathml-in-dashboard.html [ Failure ] >-svg/custom/embedded-svg-allowed-in-dashboard.xml [ Failure ] >-svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html [ Failure ] >-svg/custom/manually-parsed-svg-allowed-in-dashboard.html [ Failure ] >-svg/custom/svg-allowed-in-dashboard-object.html [ Failure ] >-http/tests/xmlhttprequest/svg-created-by-xhr-allowed-in-dashboard.html [ Failure ] >- > webkit.org/b/174100 webgl/1.0.2/conformance/glsl/misc/shader-with-non-reserved-words.html [ Skip ] > > webkit.org/b/173010 js/slow-stress/Int32Array-alloc-huge.html [ Pass Timeout ] >Index: LayoutTests/platform/ios-wk1/TestExpectations >=================================================================== >--- LayoutTests/platform/ios-wk1/TestExpectations (revision 246172) >+++ LayoutTests/platform/ios-wk1/TestExpectations (working copy) >@@ -722,7 +722,6 @@ mathml/opentype/munderover-layout-resize > mathml/presentation/mo-invisible.html > > # MathML tests that fail: >-mathml/mathml-in-dashboard.html [ Failure ] > mathml/opentype/large-operators-displaystyle-dynamic.html [ ImageOnlyFailure ] > mathml/presentation/mo-stretch-update.html [ ImageOnlyFailure ] > >Index: LayoutTests/platform/ios/TestExpectations >=================================================================== >--- LayoutTests/platform/ios/TestExpectations (revision 246172) >+++ LayoutTests/platform/ios/TestExpectations (working copy) >@@ -1558,7 +1558,6 @@ http/tests/webarchive/test-css-url-encod > > # XMLHttpRequest tests that fail: > http/tests/xmlhttprequest/basic-auth-nopassword.html [ Failure ] >-http/tests/xmlhttprequest/default-content-type-dashboard.html [ Failure ] > > # DeviceMotion tests that time out: > fast/dom/DeviceMotion/no-page-cache.html >Index: LayoutTests/platform/ios/mathml/mathml-in-dashboard-expected.txt >=================================================================== >--- LayoutTests/platform/ios/mathml/mathml-in-dashboard-expected.txt (revision 246172) >+++ LayoutTests/platform/ios/mathml/mathml-in-dashboard-expected.txt (nonexistent) >@@ -1,13 +0,0 @@ >-layer at (0,0) size 800x600 >- RenderView at (0,0) size 800x600 >-layer at (0,0) size 800x600 >- RenderBlock {HTML} at (0,0) size 800x600 >- RenderBody {BODY} at (8,8) size 784x584 >- RenderBlock {P} at (0,0) size 784x40 >- RenderText {#text} at (0,0) size 664x39 >- text run at (0,0) width 214: "This tests that MathML works in " >- text run at (213,0) width 451: "dashboard compatibility mode. The render tree dump should include a" >- text run at (0,20) width 142: "RenderMathMLMath." >- RenderBlock (anonymous) at (0,56) size 784x0 >- RenderMathMLMath {math} at (0,0) size 2x0 [padding: 0 1 0 1] >- RenderText {#text} at (0,0) size 0x0 > >Property changes on: LayoutTests/platform/ios/mathml/mathml-in-dashboard-expected.txt >___________________________________________________________________ >Deleted: svn:eol-style >## -1 +0,0 ## >-LF >\ No newline at end of property >Index: LayoutTests/platform/mac/fast/canvas/fill-stroke-clip-reset-path-expected.png >=================================================================== >Cannot display: file marked as a binary type. >svn:mime-type = image/png > >Property changes on: LayoutTests/platform/mac/fast/canvas/fill-stroke-clip-reset-path-expected.png >___________________________________________________________________ >Deleted: svn:mime-type >## -1 +0,0 ## >-image/png >\ No newline at end of property >Index: LayoutTests/platform/mac/fast/dom/HTMLImageElement/dashboard-src-quirk-expected.txt >=================================================================== >--- LayoutTests/platform/mac/fast/dom/HTMLImageElement/dashboard-src-quirk-expected.txt (revision 246172) >+++ LayoutTests/platform/mac/fast/dom/HTMLImageElement/dashboard-src-quirk-expected.txt (nonexistent) >@@ -1,3 +0,0 @@ >-Test a Dashboard quirk that allows the src attribute of an HTML img element to be specified using a form of CSS URL value notation. >- >-PASS >Index: LayoutTests/platform/mac/fast/dom/HTMLImageElement/dashboard-src-quirk.html >=================================================================== >--- LayoutTests/platform/mac/fast/dom/HTMLImageElement/dashboard-src-quirk.html (revision 246172) >+++ LayoutTests/platform/mac/fast/dom/HTMLImageElement/dashboard-src-quirk.html (nonexistent) >@@ -1,28 +0,0 @@ >-<p> >- Test a Dashboard quirk that allows the <tt>src</tt> attribute of an HTML <tt>img</tt> element to >- be specified using a form of CSS URL value notation. >-</p> >-<p id="result"> >- This test can only run in DumpRenderTree. >-</p> >-<script> >- if (window.testRunner) { >- testRunner.dumpAsText(); >- testRunner.waitUntilDone(); >- testRunner.setUseDashboardCompatibilityMode(true); >- >- var image = document.createElement("img"); >- >- image.addEventListener("load", function(event) { >- document.getElementById("result").innerText = "PASS"; >- testRunner.notifyDone(); >- }, false); >- >- image.addEventListener("error", function(event) { >- document.getElementById("result").innerText = "FAIL"; >- testRunner.notifyDone(); >- }, false); >- >- image.src = 'url("resources/blue_rect.jpg")'; >- } >-</script> >Index: LayoutTests/platform/mac/mathml/mathml-in-dashboard-expected.png >=================================================================== >Cannot display: file marked as a binary type. >svn:mime-type = image/png > >Property changes on: LayoutTests/platform/mac/mathml/mathml-in-dashboard-expected.png >___________________________________________________________________ >Deleted: svn:mime-type >## -1 +0,0 ## >-image/png >\ No newline at end of property >Index: LayoutTests/platform/mac/mathml/mathml-in-dashboard-expected.txt >=================================================================== >--- LayoutTests/platform/mac/mathml/mathml-in-dashboard-expected.txt (revision 246172) >+++ LayoutTests/platform/mac/mathml/mathml-in-dashboard-expected.txt (nonexistent) >@@ -1,13 +0,0 @@ >-layer at (0,0) size 800x600 >- RenderView at (0,0) size 800x600 >-layer at (0,0) size 800x600 >- RenderBlock {HTML} at (0,0) size 800x600 >- RenderBody {BODY} at (8,8) size 784x584 >- RenderBlock {P} at (0,0) size 784x36 >- RenderText {#text} at (0,0) size 664x36 >- text run at (0,0) width 214: "This tests that MathML works in " >- text run at (213,0) width 451: "dashboard compatibility mode. The render tree dump should include a" >- text run at (0,18) width 142: "RenderMathMLMath." >- RenderBlock (anonymous) at (0,52) size 784x0 >- RenderMathMLMath {math} at (0,0) size 0x0 >- RenderText {#text} at (0,0) size 0x0 >Index: LayoutTests/platform/win/TestExpectations >=================================================================== >--- LayoutTests/platform/win/TestExpectations (revision 246172) >+++ LayoutTests/platform/win/TestExpectations (working copy) >@@ -142,15 +142,6 @@ http/tests/misc/willCacheResponse-delega > # testRunner.setAlwaysAcceptCookies() is not implemented on Windows. > http/tests/xmlhttprequest/cross-origin-cookie-storage.html [ Skip ] > >-# No Dashboard compatibility mode on Windows. >-http/tests/xmlhttprequest/default-content-type-dashboard.html [ Skip ] >-http/tests/xmlhttprequest/svg-created-by-xhr-allowed-in-dashboard.html [ Skip ] >-svg/custom/embedded-svg-allowed-in-dashboard.xml [ Skip ] >-svg/custom/manually-parsed-svg-allowed-in-dashboard.html [ Skip ] >-svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html [ Skip ] >-svg/custom/svg-allowed-in-dashboard-object.html [ Skip ] >-mathml/mathml-in-dashboard.html [ Skip ] >- > # Dark mode not supported on Windows > css-dark-mode [ Skip ] > >Index: LayoutTests/platform/wincairo/TestExpectations >=================================================================== >--- LayoutTests/platform/wincairo/TestExpectations (revision 246172) >+++ LayoutTests/platform/wincairo/TestExpectations (working copy) >@@ -416,15 +416,6 @@ Bug(GTK) fast/text/font-weights-zh.html > # This requires a specific font on Mac > fast/text/hidpi-text-selection-gap-between-words.html [ Skip ] > >-# DASHBOARD_SUPPORT is mac only >-http/tests/xmlhttprequest/default-content-type-dashboard.html [ Skip ] >-http/tests/xmlhttprequest/svg-created-by-xhr-allowed-in-dashboard.html [ Skip ] >-svg/custom/embedded-svg-allowed-in-dashboard.xml [ Skip ] >-svg/custom/manually-parsed-svg-allowed-in-dashboard.html [ Skip ] >-svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html [ Skip ] >-svg/custom/svg-allowed-in-dashboard-object.html [ Skip ] >-mathml/mathml-in-dashboard.html [ Skip ] >- > # This test relies on iOS-specific font fallback. > fast/text/arabic-blacklisted-expected.html [ Pass ImageOnlyFailure ] > >Index: LayoutTests/svg/custom/embedded-svg-allowed-in-dashboard-expected.txt >=================================================================== >--- LayoutTests/svg/custom/embedded-svg-allowed-in-dashboard-expected.txt (revision 246172) >+++ LayoutTests/svg/custom/embedded-svg-allowed-in-dashboard-expected.txt (nonexistent) >@@ -1,4 +0,0 @@ >-This test is to ensure SVG elements can be created by being embedded in xml documents. It can not be tested manually. >- >-PASS: Successfully embedded SVG in document >- >Index: LayoutTests/svg/custom/embedded-svg-allowed-in-dashboard.xml >=================================================================== >--- LayoutTests/svg/custom/embedded-svg-allowed-in-dashboard.xml (revision 246172) >+++ LayoutTests/svg/custom/embedded-svg-allowed-in-dashboard.xml (nonexistent) >@@ -1,29 +0,0 @@ >-<html xmlns="http://www.w3.org/1999/xhtml"> >- <head> >- <title>Make sure embedded SVG is turned on in dashboard</title> >- </head> >- <script> >- if (window.testRunner) { >- testRunner.setUseDashboardCompatibilityMode(true); >- testRunner.dumpAsText(); >- } >- >- function debug(str) { >- var c = document.getElementById('console') >- c.appendChild(document.createTextNode(str + '\n')); >- } >- </script> >- <body> >- <p>This test is to ensure SVG elements can be created by being embedded in xml documents. It can not be tested manually.</p> >- <pre id="console"></pre> >- <svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"> >- <circle id="svgCircleNode" cx="100" cy="100" r="50" fill="red"/> >- </svg> >- <script> >- if(document.getElementById('svgCircleNode') instanceof SVGElement) >- debug("PASS: Successfully embedded SVG in document"); >- else >- debug("FAIL: SVG Elements could not be created"); >- </script> >- </body> >-</html> >Index: LayoutTests/svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard-expected.txt >=================================================================== >--- LayoutTests/svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard-expected.txt (revision 246172) >+++ LayoutTests/svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard-expected.txt (nonexistent) >@@ -1,6 +0,0 @@ >-This test makes sure we can add manually parsed SVG to the document when in dashboard compatibility mode. It can not be tested manually. >- >-Parsing of the document isn't prevented and produces a [object XMLDocument] >-The circle element is of type [object SVGCircleElement] >-PASS: Managed to insert SVG element into tree >- >Index: LayoutTests/svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html >=================================================================== >--- LayoutTests/svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html (revision 246172) >+++ LayoutTests/svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard.html (nonexistent) >@@ -1,49 +0,0 @@ >-<html xmlns="http://www.w3.org/1999/xhtml"> >- <head> >- <title>Make sure embedded SVG is turned off in dashboard</title> >- </head> >- <script> >- function debug(str) { >- var c = document.getElementById('console') >- c.appendChild(document.createTextNode(str + '\n')); >- } >- >- if (window.testRunner) { >- testRunner.setUseDashboardCompatibilityMode(true); >- testRunner.dumpAsText(); >- } >- </script> >- <body> >- <p>This test makes sure we can add manually parsed SVG to the document when in dashboard compatibility mode. It can not be tested manually.</p> >- <div id="targetDiv"></div> >- <pre id="console"></pre> >- <script> >- var documentString = '<html xmlns="http://www.w3.org/1999/xhtml">' + >- '<body>' + >- '<svg xmlns="http://www.w3.org/2000/svg" width="400" height="400">' + >- '<circle id="svgCircle" cx="50" cy="50" r="50" fill="red"/></svg>' + >- '</body></html>'; >- >- // Use DOMParser interface to create a SVGDocument datastructure from SVG content string >- var parser = new DOMParser(); >- var xhtmlDocument = parser.parseFromString(documentString, "application/xhtml+xml"); >- >- debug("Parsing of the document isn't prevented and produces a " + xhtmlDocument); >- debug("The circle element is of type " + xhtmlDocument.getElementById('svgCircle')); >- >- // Import SVG element into tree. >- var importedNode = null; >- try { >- importedNode = document.importNode(xhtmlDocument.firstChild, true); >- } catch(e) { >- } >- >- if (importedNode) { >- debug("PASS: Managed to insert SVG element into tree"); >- document.getElementById('targetDiv').appendChild(importedNode); >- } else { >- debug("FAIL: Could not insert SVG element into tree"); >- } >- </script> >- </body> >-</html> >Index: LayoutTests/svg/custom/manually-parsed-svg-allowed-in-dashboard-expected.txt >=================================================================== >--- LayoutTests/svg/custom/manually-parsed-svg-allowed-in-dashboard-expected.txt (revision 246172) >+++ LayoutTests/svg/custom/manually-parsed-svg-allowed-in-dashboard-expected.txt (nonexistent) >@@ -1,5 +0,0 @@ >-This test makes sure we can add manually parsed SVG to the document when in dashboard compatibility mode. It can not be tested manually. >- >-Parsing of the document isn't prevented and produces a [object XMLDocument] >-PASS: Managed to insert SVG element into tree >- >Index: LayoutTests/svg/custom/manually-parsed-svg-allowed-in-dashboard.html >=================================================================== >--- LayoutTests/svg/custom/manually-parsed-svg-allowed-in-dashboard.html (revision 246172) >+++ LayoutTests/svg/custom/manually-parsed-svg-allowed-in-dashboard.html (nonexistent) >@@ -1,45 +0,0 @@ >-<html xmlns="http://www.w3.org/1999/xhtml"> >- <head> >- <title>Make sure embedded SVG is turned on in dashboard</title> >- </head> >- <script> >- function debug(str) { >- var c = document.getElementById('console') >- c.appendChild(document.createTextNode(str + '\n')); >- } >- >- if (window.testRunner) { >- testRunner.setUseDashboardCompatibilityMode(true); >- testRunner.dumpAsText(); >- } >- </script> >- <body> >- <p>This test makes sure we can add manually parsed SVG to the document when in dashboard compatibility mode. It can not be tested manually.</p> >- <div id="targetDiv"></div> >- <pre id="console"></pre> >- <script> >- var documentString = '<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100">' + >- '<circle cx="50" cy="50" r="50" fill="red"/></svg>'; >- >- // Use DOMParser interface to create a SVGDocument datastructure from SVG content string >- var parser = new DOMParser(); >- var svgDocument = parser.parseFromString(documentString, "image/svg+xml"); >- >- debug("Parsing of the document isn't prevented and produces a " + svgDocument); >- >- // Import SVG element into tree. >- var importedNode = null; >- try { >- importedNode = document.importNode(svgDocument.firstChild, true); >- } catch(e) { >- } >- >- if (importedNode) { >- debug("PASS: Managed to insert SVG element into tree"); >- document.getElementById('targetDiv').appendChild(importedNode); >- } else { >- debug("FAIL: Could not insert SVG element into tree"); >- } >- </script> >- </body> >-</html> >Index: LayoutTests/svg/custom/svg-allowed-in-dashboard-object-expected.txt >=================================================================== >--- LayoutTests/svg/custom/svg-allowed-in-dashboard-object-expected.txt (revision 246172) >+++ LayoutTests/svg/custom/svg-allowed-in-dashboard-object-expected.txt (nonexistent) >@@ -1,8 +0,0 @@ >-This test makes sure we can open SVG documents in Dashboard compatibility mode. It can not be tested manually. >- >- >-PASS: Loaded SVG document in <object> tag. >-PASS: Loaded SVG document in <element> tag. >-PASS: Loaded SVG document in <iframe> tag. >-PASS: SVG Documents were loaded >- >Index: LayoutTests/svg/custom/svg-allowed-in-dashboard-object.html >=================================================================== >--- LayoutTests/svg/custom/svg-allowed-in-dashboard-object.html (revision 246172) >+++ LayoutTests/svg/custom/svg-allowed-in-dashboard-object.html (nonexistent) >@@ -1,70 +0,0 @@ >-<html> >-<body onload="runTest()"> >-<p>This test makes sure we can open SVG documents in Dashboard compatibility mode. It can not be tested manually.</p> >-<script> >- if (window.testRunner) { >- testRunner.setUseDashboardCompatibilityMode(true); >- testRunner.dumpAsText(); >- testRunner.waitUntilDone(); >- } >- >- function debug(str) { >- var c = document.getElementById('console') >- c.appendChild(document.createTextNode(str + '\n')); >- } >- >- function runTest() { >- try { >- var failed = false; >- var svgDoc = null; >- try { >- svgDoc = document.getElementById('svgObject').getSVGDocument(); >- } catch (e) { >- svgDoc = null; >- } >- if (svgDoc) { >- debug("PASS: Loaded SVG document in <object> tag."); >- failed = true; >- } else >- debug("FAIL: Did not load SVG document in <object> tag"); >- >- try { >- svgDoc = document.getElementById('svgEmbed').getSVGDocument(); >- } catch (e) { >- svgDoc = null; >- } >- if (svgDoc) { >- debug("PASS: Loaded SVG document in <element> tag."); >- failed = true; >- } else >- debug("FAIL: Did not load SVG document in <element> tag"); >- >- try { >- svgDoc = document.getElementById('svgIFrame').getSVGDocument(); >- } catch (e) { >- svgDoc = null; >- } >- if (svgDoc) { >- debug("PASS: Loaded SVG document in <iframe> tag."); >- failed = true; >- } else >- debug("FAIL: Did not load SVG document in <iframe> tag"); >- >- if (failed) >- debug("PASS: SVG Documents were loaded"); >- else >- debug("FAIL: SVG Documents were not loaded"); >- } catch (e) { >- debug("FAIL: Exception thrown: " + e) >- } >- if (window.testRunner) >- testRunner.notifyDone(); >- } >-</script> >- >- <object id="svgObject" data="../W3C-SVG-1.1/text-ws-02-t.svg" width="100px" height="100px"></object> >- <embed id="svgEmbed" src="../W3C-SVG-1.1/text-ws-02-t.svg" width="100px" height="100px"></embed> >- <iframe id="svgIFrame" src="../W3C-SVG-1.1/text-ws-02-t.svg" width="100px" height="100px"></iframe> >- <pre id="console"></pre> >-</body> >-</html>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198624
: 371528