Diff
Modified: trunk/ChangeLog (172757 => 172758)
--- trunk/ChangeLog 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/ChangeLog 2014-08-19 21:02:25 UTC (rev 172758)
@@ -1,3 +1,18 @@
+2014-08-19 Zalan Bujtas <[email protected]>
+
+ Remove ENABLE(SUBPIXEL_LAYOUT).
+ https://bugs.webkit.org/show_bug.cgi?id=136077
+
+ Reviewed by Simon Fraser.
+
+ Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
2014-08-17 Zan Dobersek <[email protected]>
[CMake] Optimization-disabling compiler flags should be appended to CMAKE_C(XX)_FLAGS_RELEASE
Modified: trunk/Source/_javascript_Core/ChangeLog (172757 => 172758)
--- trunk/Source/_javascript_Core/ChangeLog 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-08-19 21:02:25 UTC (rev 172758)
@@ -1,3 +1,14 @@
+2014-08-19 Zalan Bujtas <[email protected]>
+
+ Remove ENABLE(SUBPIXEL_LAYOUT).
+ https://bugs.webkit.org/show_bug.cgi?id=136077
+
+ Reviewed by Simon Fraser.
+
+ Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-08-19 Alex Christensen <[email protected]>
[CMake] Generate LLInt assembly correctly on Windows.
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (172757 => 172758)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2014-08-19 21:02:25 UTC (rev 172758)
@@ -185,7 +185,6 @@
ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME));
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
-ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
@@ -244,4 +243,4 @@
ENABLE_LLINT_C_LOOP = ;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
Modified: trunk/Source/WTF/ChangeLog (172757 => 172758)
--- trunk/Source/WTF/ChangeLog 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WTF/ChangeLog 2014-08-19 21:02:25 UTC (rev 172758)
@@ -1,3 +1,14 @@
+2014-08-19 Zalan Bujtas <[email protected]>
+
+ Remove ENABLE(SUBPIXEL_LAYOUT).
+ https://bugs.webkit.org/show_bug.cgi?id=136077
+
+ Reviewed by Simon Fraser.
+
+ Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
+
+ * wtf/FeatureDefines.h:
+
2014-08-18 Maciej Stachowiak <[email protected]>
Use NSURLFileTypeMappings directly instead of depending on WebKitSystemInterface wrappers for it
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (172757 => 172758)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2014-08-19 21:02:25 UTC (rev 172758)
@@ -300,10 +300,6 @@
#define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1
#endif
-#if !defined(ENABLE_SUBPIXEL_LAYOUT)
-#define ENABLE_SUBPIXEL_LAYOUT 1
-#endif
-
#endif /* PLATFORM(EFL) */
/* --------- Gtk port (Unix, Windows, Mac) --------- */
@@ -315,10 +311,6 @@
#endif
#endif
-#if !defined(ENABLE_SUBPIXEL_LAYOUT)
-#define ENABLE_SUBPIXEL_LAYOUT 1
-#endif
-
#endif /* PLATFORM(GTK) */
/* ENABLE macro defaults for WebCore */
@@ -692,10 +684,6 @@
#define ENABLE_SQL_DATABASE 1
#endif
-#if !defined(ENABLE_SUBPIXEL_LAYOUT)
-#define ENABLE_SUBPIXEL_LAYOUT 0
-#endif
-
#if !defined(ENABLE_SVG_FONTS)
#define ENABLE_SVG_FONTS 1
#endif
@@ -794,10 +782,6 @@
/* Asserts, invariants for macro definitions */
-#if ENABLE(SATURATED_LAYOUT_ARITHMETIC) && !ENABLE(SUBPIXEL_LAYOUT)
-#error "ENABLE(SATURATED_LAYOUT_ARITHMETIC) requires ENABLE(SUBPIXEL_LAYOUT)"
-#endif
-
#if ENABLE(VIDEO_TRACK) && !ENABLE(VIDEO)
#error "ENABLE(VIDEO_TRACK) requires ENABLE(VIDEO)"
#endif
Modified: trunk/Source/WebCore/ChangeLog (172757 => 172758)
--- trunk/Source/WebCore/ChangeLog 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/ChangeLog 2014-08-19 21:02:25 UTC (rev 172758)
@@ -1,3 +1,62 @@
+2014-08-19 Zalan Bujtas <[email protected]>
+
+ Remove ENABLE(SUBPIXEL_LAYOUT).
+ https://bugs.webkit.org/show_bug.cgi?id=136077
+
+ Reviewed by Simon Fraser.
+
+ Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::computeLength):
+ * dom/Element.cpp:
+ (WebCore::adjustForLocalZoom):
+ (WebCore::Element::offsetWidth):
+ (WebCore::Element::offsetHeight):
+ (WebCore::Element::clientLeft):
+ (WebCore::Element::clientTop):
+ (WebCore::Element::clientWidth):
+ (WebCore::Element::clientHeight):
+ * platform/LayoutUnit.h:
+ (WebCore::LayoutUnit::LayoutUnit):
+ (WebCore::LayoutUnit::ceilToFloat):
+ (WebCore::LayoutUnit::ceil):
+ (WebCore::LayoutUnit::round):
+ (WebCore::LayoutUnit::floor):
+ (WebCore::boundedMultiply):
+ (WebCore::operator*):
+ (WebCore::operator/):
+ (WebCore::intMod):
+ (WebCore::operator%):
+ (WebCore::roundedLayoutUnit):
+ (WebCore::ceiledLayoutUnit):
+ (WebCore::LayoutUnit::toInt): Deleted.
+ (WebCore::LayoutUnit::toFloat): Deleted.
+ (WebCore::LayoutUnit::toDouble): Deleted.
+ (WebCore::LayoutUnit::epsilon): Deleted.
+ * platform/graphics/LayoutPoint.h:
+ (WebCore::roundedForPainting):
+ (WebCore::flooredForPainting):
+ (WebCore::ceiledForPainting):
+ (WebCore::roundedLayoutPoint):
+ * platform/graphics/LayoutRect.cpp:
+ (WebCore::enclosingLayoutRect):
+ * platform/graphics/LayoutRect.h:
+ (WebCore::pixelSnappedIntRect):
+ (WebCore::pixelSnappedForPainting):
+ * platform/graphics/LayoutSize.h:
+ (WebCore::roundedLayoutSize):
+ (WebCore::flooredForPainting):
+ * rendering/RenderBlock.cpp:
+ (WebCore::adjustFloatForSubPixelLayout):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::layoutBlockChild):
+ * rendering/RenderElement.h:
+ (WebCore::adjustLayoutUnitForAbsoluteZoom):
+ * rendering/style/RenderStyle.h:
+ (WebCore::adjustLayoutUnitForAbsoluteZoom):
+
2014-08-19 Bem Jones-Bey <[email protected]>
[CSS Shapes] A few calc() test failures in the shape-image-threshold parsing tests
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (172757 => 172758)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-08-19 21:02:25 UTC (rev 172758)
@@ -185,7 +185,6 @@
ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME));
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
-ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
@@ -244,4 +243,4 @@
ENABLE_LLINT_C_LOOP = ;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (172757 => 172758)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-08-19 21:02:25 UTC (rev 172758)
@@ -569,11 +569,7 @@
template<> Length CSSPrimitiveValue::computeLength(const CSSToLengthConversionData& conversionData) const
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return Length(clampTo<float>(computeLengthDouble(conversionData), minValueForCssLength, maxValueForCssLength), Fixed);
-#else
- return Length(clampTo<float>(roundForImpreciseConversion<float>(computeLengthDouble(conversionData)), minValueForCssLength, maxValueForCssLength), Fixed);
-#endif
}
template<> short CSSPrimitiveValue::computeLength(const CSSToLengthConversionData& conversionData) const
Modified: trunk/Source/WebCore/dom/Element.cpp (172757 => 172758)
--- trunk/Source/WebCore/dom/Element.cpp 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-08-19 21:02:25 UTC (rev 172758)
@@ -646,14 +646,7 @@
zoomFactor = localZoomForRenderer(renderer);
if (zoomFactor == 1)
return value.toDouble();
-#if ENABLE(SUBPIXEL_LAYOUT)
return value.toDouble() / zoomFactor;
-#else
- // Needed because computeLengthInt truncates (rather than rounds) when scaling up.
- if (zoomFactor > 1)
- ++value;
- return value.toDouble() / zoomFactor;
-#endif
}
enum LegacyCSSOMElementMetricsRoundingStrategy { Round, Floor };
@@ -696,12 +689,8 @@
{
document().updateLayoutIgnorePendingStylesheets();
if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
-#if ENABLE(SUBPIXEL_LAYOUT)
LayoutUnit offsetWidth = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetWidth() : LayoutUnit(renderer->pixelSnappedOffsetWidth());
return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(offsetWidth, *renderer).toDouble(), renderer->document());
-#else
- return adjustForAbsoluteZoom(renderer->offsetWidth(), *renderer);
-#endif
}
return 0;
}
@@ -710,12 +699,8 @@
{
document().updateLayoutIgnorePendingStylesheets();
if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
-#if ENABLE(SUBPIXEL_LAYOUT)
LayoutUnit offsetHeight = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetHeight() : LayoutUnit(renderer->pixelSnappedOffsetHeight());
return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(offsetHeight, *renderer).toDouble(), renderer->document());
-#else
- return adjustForAbsoluteZoom(renderer->offsetHeight(), *renderer);
-#endif
}
return 0;
}
@@ -745,12 +730,8 @@
document().updateLayoutIgnorePendingStylesheets();
if (RenderBox* renderer = renderBox()) {
-#if ENABLE(SUBPIXEL_LAYOUT)
LayoutUnit clientLeft = subpixelMetricsEnabled(renderer->document()) ? renderer->clientLeft() : LayoutUnit(roundToInt(renderer->clientLeft()));
return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientLeft, *renderer).toDouble(), renderer->document());
-#else
- return adjustForAbsoluteZoom(renderer->clientLeft(), *renderer);
-#endif
}
return 0;
}
@@ -760,12 +741,8 @@
document().updateLayoutIgnorePendingStylesheets();
if (RenderBox* renderer = renderBox()) {
-#if ENABLE(SUBPIXEL_LAYOUT)
LayoutUnit clientTop = subpixelMetricsEnabled(renderer->document()) ? renderer->clientTop() : LayoutUnit(roundToInt(renderer->clientTop()));
return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientTop, *renderer).toDouble(), renderer->document());
-#else
- return adjustForAbsoluteZoom(renderer->clientTop(), *renderer);
-#endif
}
return 0;
}
@@ -785,12 +762,8 @@
return adjustForAbsoluteZoom(renderView.frameView().layoutWidth(), renderView);
if (RenderBox* renderer = renderBox()) {
-#if ENABLE(SUBPIXEL_LAYOUT)
LayoutUnit clientWidth = subpixelMetricsEnabled(renderer->document()) ? renderer->clientWidth() : LayoutUnit(renderer->pixelSnappedClientWidth());
return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientWidth, *renderer).toDouble(), renderer->document());
-#else
- return adjustForAbsoluteZoom(renderer->clientWidth(), *renderer);
-#endif
}
return 0;
}
@@ -810,12 +783,8 @@
return adjustForAbsoluteZoom(renderView.frameView().layoutHeight(), renderView);
if (RenderBox* renderer = renderBox()) {
-#if ENABLE(SUBPIXEL_LAYOUT)
LayoutUnit clientHeight = subpixelMetricsEnabled(renderer->document()) ? renderer->clientHeight() : LayoutUnit(renderer->pixelSnappedClientHeight());
return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientHeight, *renderer).toDouble(), renderer->document());
-#else
- return adjustForAbsoluteZoom(renderer->clientHeight(), *renderer);
-#endif
}
return 0;
}
Modified: trunk/Source/WebCore/platform/LayoutUnit.h (172757 => 172758)
--- trunk/Source/WebCore/platform/LayoutUnit.h 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/platform/LayoutUnit.h 2014-08-19 21:02:25 UTC (rev 172758)
@@ -56,19 +56,13 @@
#endif
static const int kFixedPointDenominator = 64;
-
-#if ENABLE(SUBPIXEL_LAYOUT)
static const int kEffectiveFixedPointDenominator = kFixedPointDenominator;
-#else
-static const int kEffectiveFixedPointDenominator = 1;
-#endif
const int intMaxForLayoutUnit = INT_MAX / kEffectiveFixedPointDenominator;
const int intMinForLayoutUnit = INT_MIN / kEffectiveFixedPointDenominator;
class LayoutUnit {
public:
LayoutUnit() : m_value(0) { }
-#if ENABLE(SUBPIXEL_LAYOUT)
LayoutUnit(int value) { setValue(value); }
LayoutUnit(unsigned short value) { setValue(value); }
LayoutUnit(unsigned value) { setValue(value); }
@@ -108,15 +102,6 @@
m_value = value * kEffectiveFixedPointDenominator;
#endif
}
-#else
- LayoutUnit(int value) { REPORT_OVERFLOW(isInBounds(value)); m_value = value; }
- LayoutUnit(unsigned short value) { REPORT_OVERFLOW(isInBounds(value)); m_value = value; }
- LayoutUnit(unsigned value) { REPORT_OVERFLOW(isInBounds(value)); m_value = clampTo<int>(value); }
- LayoutUnit(unsigned long long value) { REPORT_OVERFLOW(isInBounds(static_cast<unsigned>(value))); m_value = clampTo<int>(value); }
- LayoutUnit(unsigned long value) { REPORT_OVERFLOW(isInBounds(static_cast<unsigned>(value))); m_value = clampTo<int>(value); }
- LayoutUnit(float value) { REPORT_OVERFLOW(isInBounds(value)); m_value = clampTo<int>(value); }
- LayoutUnit(double value) { REPORT_OVERFLOW(isInBounds(value)); m_value = clampTo<int>(value); }
-#endif
static LayoutUnit fromPixel(int value)
{
@@ -163,7 +148,6 @@
#endif
}
-#if ENABLE(SUBPIXEL_LAYOUT)
int toInt() const { return m_value / kEffectiveFixedPointDenominator; }
float toFloat() const { return static_cast<float>(m_value) / kEffectiveFixedPointDenominator; }
double toDouble() const { return static_cast<double>(m_value) / kEffectiveFixedPointDenominator; }
@@ -176,12 +160,6 @@
return nextafterf(floatValue, std::numeric_limits<float>::max());
return nextafterf(floatValue, std::numeric_limits<float>::min());
}
-#else
- int toInt() const { return m_value; }
- float toFloat() const { return static_cast<float>(m_value); }
- double toDouble() const { return static_cast<double>(m_value); }
- float ceilToFloat() const { return toFloat(); }
-#endif
unsigned toUnsigned() const { REPORT_OVERFLOW(m_value >= 0); return toInt(); }
operator int() const { return toInt(); }
@@ -216,7 +194,6 @@
int ceil() const
#endif
{
-#if ENABLE(SUBPIXEL_LAYOUT)
#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
if (UNLIKELY(m_value >= INT_MAX - kEffectiveFixedPointDenominator + 1))
return intMaxForLayoutUnit;
@@ -224,28 +201,23 @@
if (m_value >= 0)
return (m_value + kEffectiveFixedPointDenominator - 1) / kEffectiveFixedPointDenominator;
return toInt();
-#else
- return m_value;
-#endif
}
+
int round() const
{
-#if ENABLE(SUBPIXEL_LAYOUT) && ENABLE(SATURATED_LAYOUT_ARITHMETIC)
+#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
if (m_value > 0)
return saturatedAddition(rawValue(), kEffectiveFixedPointDenominator / 2) / kEffectiveFixedPointDenominator;
return saturatedSubtraction(rawValue(), (kEffectiveFixedPointDenominator / 2) - 1) / kEffectiveFixedPointDenominator;
-#elif ENABLE(SUBPIXEL_LAYOUT)
+#else
if (m_value > 0)
return (m_value + (kEffectiveFixedPointDenominator / 2)) / kEffectiveFixedPointDenominator;
return (m_value - ((kEffectiveFixedPointDenominator / 2) - 1)) / kEffectiveFixedPointDenominator;
-#else
- return m_value;
#endif
}
int floor() const
{
-#if ENABLE(SUBPIXEL_LAYOUT)
#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
if (UNLIKELY(m_value <= INT_MIN + kEffectiveFixedPointDenominator - 1))
return intMinForLayoutUnit;
@@ -253,9 +225,6 @@
if (m_value >= 0)
return toInt();
return (m_value - kEffectiveFixedPointDenominator + 1) / kEffectiveFixedPointDenominator;
-#else
- return m_value;
-#endif
}
LayoutUnit fraction() const
@@ -267,7 +236,6 @@
return fraction;
}
-#if ENABLE(SUBPIXEL_LAYOUT)
bool mightBeSaturated() const
{
return rawValue() == std::numeric_limits<int>::max()
@@ -275,9 +243,7 @@
}
static float epsilon() { return 1.0f / kEffectiveFixedPointDenominator; }
-#else
- static int epsilon() { return 0; }
-#endif
+
static const LayoutUnit max()
{
LayoutUnit m;
@@ -517,7 +483,6 @@
// For multiplication that's prone to overflow, this bounds it to LayoutUnit::max() and ::min()
inline LayoutUnit boundedMultiply(const LayoutUnit& a, const LayoutUnit& b)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
int64_t result = static_cast<int64_t>(a.rawValue()) * static_cast<int64_t>(b.rawValue()) / kEffectiveFixedPointDenominator;
int32_t high = static_cast<int32_t>(result >> 32);
int32_t low = static_cast<int32_t>(result);
@@ -529,23 +494,17 @@
LayoutUnit returnVal;
returnVal.setRawValue(static_cast<int>(result));
return returnVal;
-#else
- // FIXME: Should be bounded even in the non-subpixel case.
- return a.rawValue() * b.rawValue();
-#endif
}
inline LayoutUnit operator*(const LayoutUnit& a, const LayoutUnit& b)
{
-#if ENABLE(SUBPIXEL_LAYOUT) && ENABLE(SATURATED_LAYOUT_ARITHMETIC)
+#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
return boundedMultiply(a, b);
-#elif ENABLE(SUBPIXEL_LAYOUT)
+#else
LayoutUnit returnVal;
long long rawVal = static_cast<long long>(a.rawValue()) * b.rawValue() / kEffectiveFixedPointDenominator;
returnVal.setRawValue(rawVal);
return returnVal;
-#else
- return a.rawValue() * b.rawValue();
#endif
}
@@ -621,7 +580,6 @@
inline LayoutUnit operator/(const LayoutUnit& a, const LayoutUnit& b)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
LayoutUnit returnVal;
long long rawVal = static_cast<long long>(kEffectiveFixedPointDenominator) * a.rawValue() / b.rawValue();
#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
@@ -630,10 +588,7 @@
returnVal.setRawValue(rawVal);
#endif
return returnVal;
-#else
- return a.rawValue() / b.rawValue();
-#endif
-}
+}
inline float operator/(const LayoutUnit& a, float b)
{
@@ -792,27 +747,19 @@
// For returning the remainder after a division with integer results.
inline LayoutUnit intMod(const LayoutUnit& a, const LayoutUnit& b)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
// This calculates the modulo so that: a = static_cast<int>(a / b) * b + intMod(a, b).
LayoutUnit returnVal;
returnVal.setRawValue(a.rawValue() % b.rawValue());
return returnVal;
-#else
- return a.rawValue() % b.rawValue();
-#endif
}
inline LayoutUnit operator%(const LayoutUnit& a, const LayoutUnit& b)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
// This calculates the modulo so that: a = (a / b) * b + a % b.
LayoutUnit returnVal;
long long rawVal = (static_cast<long long>(kEffectiveFixedPointDenominator) * a.rawValue()) % b.rawValue();
returnVal.setRawValue(rawVal / kEffectiveFixedPointDenominator);
return returnVal;
-#else
- return a.rawValue() % b.rawValue();
-#endif
}
inline LayoutUnit operator%(const LayoutUnit& a, int b)
@@ -967,20 +914,12 @@
inline LayoutUnit roundedLayoutUnit(float value)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return LayoutUnit::fromFloatRound(value);
-#else
- return static_cast<int>(lroundf(value));
-#endif
}
inline LayoutUnit ceiledLayoutUnit(float value)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return LayoutUnit::fromFloatCeil(value);
-#else
- return ceilf(value);
-#endif
}
inline LayoutUnit absoluteValue(const LayoutUnit& value)
Modified: trunk/Source/WebCore/platform/graphics/LayoutPoint.h (172757 => 172758)
--- trunk/Source/WebCore/platform/graphics/LayoutPoint.h 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/platform/graphics/LayoutPoint.h 2014-08-19 21:02:25 UTC (rev 172758)
@@ -186,43 +186,22 @@
inline FloatPoint roundedForPainting(const LayoutPoint& point, float pixelSnappingFactor, bool directionalRoundingToRight = true, bool directionalRoundingToBottom = true)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return FloatPoint(roundToDevicePixel(point.x(), pixelSnappingFactor, !directionalRoundingToRight), roundToDevicePixel(point.y(), pixelSnappingFactor, !directionalRoundingToBottom));
-#else
- UNUSED_PARAM(pixelSnappingFactor);
- UNUSED_PARAM(directionalRoundingToRight);
- UNUSED_PARAM(directionalRoundingToBottom);
- return FloatPoint(point);
-#endif
}
inline FloatPoint flooredForPainting(const LayoutPoint& point, float pixelSnappingFactor)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return FloatPoint(floorToDevicePixel(point.x(), pixelSnappingFactor), floorToDevicePixel(point.y(), pixelSnappingFactor));
-#else
- UNUSED_PARAM(pixelSnappingFactor);
- return FloatPoint(point);
-#endif
}
inline FloatPoint ceiledForPainting(const LayoutPoint& point, float pixelSnappingFactor)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return FloatPoint(ceilToDevicePixel(point.x(), pixelSnappingFactor), ceilToDevicePixel(point.y(), pixelSnappingFactor));
-#else
- UNUSED_PARAM(pixelSnappingFactor);
- return FloatPoint(point);
-#endif
}
inline LayoutPoint roundedLayoutPoint(const FloatPoint& p)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return LayoutPoint(p);
-#else
- return roundedIntPoint(p);
-#endif
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.cpp (172757 => 172758)
--- trunk/Source/WebCore/platform/graphics/LayoutRect.cpp 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/platform/graphics/LayoutRect.cpp 2014-08-19 21:02:25 UTC (rev 172758)
@@ -138,14 +138,10 @@
LayoutRect enclosingLayoutRect(const FloatRect& rect)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
LayoutPoint location = flooredLayoutPoint(rect.minXMinYCorner());
LayoutPoint maxPoint = ceiledLayoutPoint(rect.maxXMaxYCorner());
return LayoutRect(location, maxPoint - location);
-#else
- return enclosingIntRect(rect);
-#endif
}
FloatRect enclosingRectForPainting(const LayoutRect& rect, float pixelSnappingFactor)
Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.h (172757 => 172758)
--- trunk/Source/WebCore/platform/graphics/LayoutRect.h 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/platform/graphics/LayoutRect.h 2014-08-19 21:02:25 UTC (rev 172758)
@@ -203,13 +203,8 @@
inline IntRect pixelSnappedIntRect(const LayoutRect& rect)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
- return IntRect(roundedIntPoint(rect.location()), IntSize(snapSizeToPixel(rect.width(), rect.x()),
- snapSizeToPixel(rect.height(), rect.y())));
+ return IntRect(roundedIntPoint(rect.location()), IntSize(snapSizeToPixel(rect.width(), rect.x()), snapSizeToPixel(rect.height(), rect.y())));
-#else
- return IntRect(rect);
-#endif
}
IntRect enclosingIntRect(const LayoutRect&);
@@ -233,13 +228,8 @@
inline FloatRect pixelSnappedForPainting(const LayoutRect& rect, float pixelSnappingFactor)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return FloatRect(roundToDevicePixel(rect.x(), pixelSnappingFactor), roundToDevicePixel(rect.y(), pixelSnappingFactor),
snapSizeToDevicePixel(rect.width(), rect.x(), pixelSnappingFactor), snapSizeToDevicePixel(rect.height(), rect.y(), pixelSnappingFactor));
-#else
- UNUSED_PARAM(pixelSnappingFactor);
- return FloatRect(rect);
-#endif
}
inline FloatRect pixelSnappedForPainting(LayoutUnit x, LayoutUnit y, LayoutUnit width, LayoutUnit height, float pixelSnappingFactor)
Modified: trunk/Source/WebCore/platform/graphics/LayoutSize.h (172757 => 172758)
--- trunk/Source/WebCore/platform/graphics/LayoutSize.h 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/platform/graphics/LayoutSize.h 2014-08-19 21:02:25 UTC (rev 172758)
@@ -185,21 +185,12 @@
inline LayoutSize roundedLayoutSize(const FloatSize& s)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return LayoutSize(s);
-#else
- return roundedIntSize(s);
-#endif
}
inline FloatSize flooredForPainting(const LayoutSize& size, float pixelSnappingFactor)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return FloatSize(floorToDevicePixel(size.width(), pixelSnappingFactor), floorToDevicePixel(size.height(), pixelSnappingFactor));
-#else
- UNUSED_PARAM(pixelSnappingFactor);
- return FloatSize(size);
-#endif
}
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (172757 => 172758)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-08-19 21:02:25 UTC (rev 172758)
@@ -2914,11 +2914,7 @@
// width.
static inline LayoutUnit adjustFloatForSubPixelLayout(float value)
{
-#if ENABLE(SUBPIXEL_LAYOUT)
return ceiledLayoutUnit(value);
-#else
- return static_cast<int>(value);
-#endif
}
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (172757 => 172758)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-08-19 21:02:25 UTC (rev 172758)
@@ -681,14 +681,12 @@
bool markDescendantsWithFloats = false;
if (logicalTopEstimate != oldLogicalTop && !child.avoidsFloats() && childBlockFlow && childBlockFlow->containsFloats())
markDescendantsWithFloats = true;
-#if ENABLE(SUBPIXEL_LAYOUT)
else if (UNLIKELY(logicalTopEstimate.mightBeSaturated()))
// logicalTopEstimate, returned by estimateLogicalTopPosition, might be saturated for
// very large elements. If it does the comparison with oldLogicalTop might yield a
// false negative as adding and removing margins, borders etc from a saturated number
// might yield incorrect results. If this is the case always mark for layout.
markDescendantsWithFloats = true;
-#endif
else if (!child.avoidsFloats() || child.shrinkToAvoidFloats()) {
// If an element might be affected by the presence of floats, then always mark it for
// layout.
Modified: trunk/Source/WebCore/rendering/RenderElement.h (172757 => 172758)
--- trunk/Source/WebCore/rendering/RenderElement.h 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2014-08-19 21:02:25 UTC (rev 172758)
@@ -377,12 +377,10 @@
return adjustForAbsoluteZoom(value, renderer.style());
}
-#if ENABLE(SUBPIXEL_LAYOUT)
inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, const RenderElement& renderer)
{
return adjustLayoutUnitForAbsoluteZoom(value, renderer.style());
}
-#endif
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (172757 => 172758)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-08-19 21:02:25 UTC (rev 172758)
@@ -2118,12 +2118,10 @@
return value / style->effectiveZoom();
}
-#if ENABLE(SUBPIXEL_LAYOUT)
inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, const RenderStyle& style)
{
return value / style.effectiveZoom();
}
-#endif
inline bool RenderStyle::setZoom(float f)
{
Modified: trunk/Source/WebKit/mac/ChangeLog (172757 => 172758)
--- trunk/Source/WebKit/mac/ChangeLog 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-08-19 21:02:25 UTC (rev 172758)
@@ -1,3 +1,14 @@
+2014-08-19 Zalan Bujtas <[email protected]>
+
+ Remove ENABLE(SUBPIXEL_LAYOUT).
+ https://bugs.webkit.org/show_bug.cgi?id=136077
+
+ Reviewed by Simon Fraser.
+
+ Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-08-18 Maciej Stachowiak <[email protected]>
Use NSURLFileTypeMappings directly instead of depending on WebKitSystemInterface wrappers for it
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (172757 => 172758)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-08-19 21:02:25 UTC (rev 172758)
@@ -185,7 +185,6 @@
ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME));
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
-ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
@@ -244,4 +243,4 @@
ENABLE_LLINT_C_LOOP = ;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
Modified: trunk/Source/WebKit2/ChangeLog (172757 => 172758)
--- trunk/Source/WebKit2/ChangeLog 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-19 21:02:25 UTC (rev 172758)
@@ -1,3 +1,14 @@
+2014-08-19 Zalan Bujtas <[email protected]>
+
+ Remove ENABLE(SUBPIXEL_LAYOUT).
+ https://bugs.webkit.org/show_bug.cgi?id=136077
+
+ Reviewed by Simon Fraser.
+
+ Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-08-19 Peyton Randolph <[email protected]>
Extend injected bundle node snapshotting to support forced white and black text
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (172757 => 172758)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-08-19 21:02:25 UTC (rev 172758)
@@ -185,7 +185,6 @@
ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME));
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
-ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
@@ -244,4 +243,4 @@
ENABLE_LLINT_C_LOOP = ;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
Modified: trunk/Source/cmake/OptionsEfl.cmake (172757 => 172758)
--- trunk/Source/cmake/OptionsEfl.cmake 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-08-19 21:02:25 UTC (rev 172758)
@@ -95,7 +95,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_SLIDER ON)
Modified: trunk/Source/cmake/OptionsGTK.cmake (172757 => 172758)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-08-19 21:02:25 UTC (rev 172758)
@@ -144,7 +144,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
Modified: trunk/Source/cmake/OptionsMac.cmake (172757 => 172758)
--- trunk/Source/cmake/OptionsMac.cmake 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/cmake/OptionsMac.cmake 2014-08-19 21:02:25 UTC (rev 172758)
@@ -149,7 +149,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SQL_DATABASE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx_1080 OFF)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (172757 => 172758)
--- trunk/Source/cmake/WebKitFeatures.cmake 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-08-19 21:02:25 UTC (rev 172758)
@@ -126,7 +126,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SQL_DATABASE "Toggle SQL Database Support" ON)
- WEBKIT_OPTION_DEFINE(ENABLE_SUBPIXEL_LAYOUT "Toggle subpixel layout support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SUBTLE_CRYPTO "Toggle subtle crypto support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" ON)
WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" OFF)
Modified: trunk/Source/cmakeconfig.h.cmake (172757 => 172758)
--- trunk/Source/cmakeconfig.h.cmake 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/cmakeconfig.h.cmake 2014-08-19 21:02:25 UTC (rev 172758)
@@ -112,7 +112,6 @@
#cmakedefine01 ENABLE_SMOOTH_SCROLLING
#cmakedefine01 ENABLE_SPELLCHECK
#cmakedefine01 ENABLE_SQL_DATABASE
-#cmakedefine01 ENABLE_SUBPIXEL_LAYOUT
#cmakedefine01 ENABLE_SUBTLE_CRYPTO
#cmakedefine01 ENABLE_SVG_FONTS
#cmakedefine01 ENABLE_TELEPHONE_NUMBER_DETECTION
Modified: trunk/Tools/ChangeLog (172757 => 172758)
--- trunk/Tools/ChangeLog 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Tools/ChangeLog 2014-08-19 21:02:25 UTC (rev 172758)
@@ -1,3 +1,14 @@
+2014-08-19 Zalan Bujtas <[email protected]>
+
+ Remove ENABLE(SUBPIXEL_LAYOUT).
+ https://bugs.webkit.org/show_bug.cgi?id=136077
+
+ Reviewed by Simon Fraser.
+
+ Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
+
+ * TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp:
+
2014-08-19 Akos Kiss <[email protected]>
Let the caller define JSC_timeout for run-_javascript_core-tests
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp (172757 => 172758)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp 2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp 2014-08-19 21:02:25 UTC (rev 172758)
@@ -28,7 +28,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define ENABLE_SUBPIXEL_LAYOUT 1
#define ENABLE_SATURATED_LAYOUT_ARITHMETIC 1
#include "config.h"
