Changeset 172758 in webkit


Ignore:
Timestamp:
Aug 19, 2014 2:02:25 PM (10 years ago)
Author:
Alan Bujtas
Message:

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:

Source/JavaScriptCore:

  • Configurations/FeatureDefines.xcconfig:

Source/WebCore:

  • 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):

Source/WebKit/mac:

  • Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

  • Configurations/FeatureDefines.xcconfig:

Source/WTF:

  • wtf/FeatureDefines.h:

Tools:

  • TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp:
Location:
trunk
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r172698 r172758  
     12014-08-19  Zalan Bujtas  <zalan@apple.com>
     2
     3        Remove ENABLE(SUBPIXEL_LAYOUT).
     4        https://bugs.webkit.org/show_bug.cgi?id=136077
     5
     6        Reviewed by Simon Fraser.
     7
     8        Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
     9
     10        * Source/cmake/OptionsEfl.cmake:
     11        * Source/cmake/OptionsGTK.cmake:
     12        * Source/cmake/OptionsMac.cmake:
     13        * Source/cmake/WebKitFeatures.cmake:
     14        * Source/cmakeconfig.h.cmake:
     15
    1162014-08-17  Zan Dobersek  <zdobersek@igalia.com>
    217

  • trunk/Source/JavaScriptCore/ChangeLog

    r172756 r172758  
     12014-08-19  Zalan Bujtas  <zalan@apple.com>
     2
     3        Remove ENABLE(SUBPIXEL_LAYOUT).
     4        https://bugs.webkit.org/show_bug.cgi?id=136077
     5
     6        Reviewed by Simon Fraser.
     7
     8        Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
     9
     10        * Configurations/FeatureDefines.xcconfig:
     11
    1122014-08-19  Alex Christensen  <achristensen@webkit.org>
    213

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

    r172548 r172758  
    186186ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
    187187ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
    188 ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
    189188ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
    190189ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    … …  
    245244ENABLE_LLINT_C_LOOP = ;
    246245
    247 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));
     246FEATURE_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));

  • trunk/Source/WTF/ChangeLog

    r172749 r172758  
     12014-08-19  Zalan Bujtas  <zalan@apple.com>
     2
     3        Remove ENABLE(SUBPIXEL_LAYOUT).
     4        https://bugs.webkit.org/show_bug.cgi?id=136077
     5
     6        Reviewed by Simon Fraser.
     7
     8        Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
     9
     10        * wtf/FeatureDefines.h:
     11
    1122014-08-18  Maciej Stachowiak  <mjs@apple.com>
    213

  • trunk/Source/WTF/wtf/FeatureDefines.h

    r172316 r172758  
    301301#endif
    302302
    303 #if !defined(ENABLE_SUBPIXEL_LAYOUT)
    304 #define ENABLE_SUBPIXEL_LAYOUT 1
    305 #endif
    306 
    307303#endif /* PLATFORM(EFL) */
    308304
    … …  
    316312#endif
    317313
    318 #if !defined(ENABLE_SUBPIXEL_LAYOUT)
    319 #define ENABLE_SUBPIXEL_LAYOUT 1
    320 #endif
    321 
    322314#endif /* PLATFORM(GTK) */
    323315
    … …  
    693685#endif
    694686
    695 #if !defined(ENABLE_SUBPIXEL_LAYOUT)
    696 #define ENABLE_SUBPIXEL_LAYOUT 0
    697 #endif
    698 
    699687#if !defined(ENABLE_SVG_FONTS)
    700688#define ENABLE_SVG_FONTS 1
    … …  
    795783/* Asserts, invariants for macro definitions */
    796784
    797 #if ENABLE(SATURATED_LAYOUT_ARITHMETIC) && !ENABLE(SUBPIXEL_LAYOUT)
    798 #error "ENABLE(SATURATED_LAYOUT_ARITHMETIC) requires ENABLE(SUBPIXEL_LAYOUT)"
    799 #endif
    800 
    801785#if ENABLE(VIDEO_TRACK) && !ENABLE(VIDEO)
    802786#error "ENABLE(VIDEO_TRACK) requires ENABLE(VIDEO)"

  • trunk/Source/WebCore/ChangeLog

    r172757 r172758  
     12014-08-19  Zalan Bujtas  <zalan@apple.com>
     2
     3        Remove ENABLE(SUBPIXEL_LAYOUT).
     4        https://bugs.webkit.org/show_bug.cgi?id=136077
     5
     6        Reviewed by Simon Fraser.
     7
     8        Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
     9
     10        * Configurations/FeatureDefines.xcconfig:
     11        * css/CSSPrimitiveValue.cpp:
     12        (WebCore::CSSPrimitiveValue::computeLength):
     13        * dom/Element.cpp:
     14        (WebCore::adjustForLocalZoom):
     15        (WebCore::Element::offsetWidth):
     16        (WebCore::Element::offsetHeight):
     17        (WebCore::Element::clientLeft):
     18        (WebCore::Element::clientTop):
     19        (WebCore::Element::clientWidth):
     20        (WebCore::Element::clientHeight):
     21        * platform/LayoutUnit.h:
     22        (WebCore::LayoutUnit::LayoutUnit):
     23        (WebCore::LayoutUnit::ceilToFloat):
     24        (WebCore::LayoutUnit::ceil):
     25        (WebCore::LayoutUnit::round):
     26        (WebCore::LayoutUnit::floor):
     27        (WebCore::boundedMultiply):
     28        (WebCore::operator*):
     29        (WebCore::operator/):
     30        (WebCore::intMod):
     31        (WebCore::operator%):
     32        (WebCore::roundedLayoutUnit):
     33        (WebCore::ceiledLayoutUnit):
     34        (WebCore::LayoutUnit::toInt): Deleted.
     35        (WebCore::LayoutUnit::toFloat): Deleted.
     36        (WebCore::LayoutUnit::toDouble): Deleted.
     37        (WebCore::LayoutUnit::epsilon): Deleted.
     38        * platform/graphics/LayoutPoint.h:
     39        (WebCore::roundedForPainting):
     40        (WebCore::flooredForPainting):
     41        (WebCore::ceiledForPainting):
     42        (WebCore::roundedLayoutPoint):
     43        * platform/graphics/LayoutRect.cpp:
     44        (WebCore::enclosingLayoutRect):
     45        * platform/graphics/LayoutRect.h:
     46        (WebCore::pixelSnappedIntRect):
     47        (WebCore::pixelSnappedForPainting):
     48        * platform/graphics/LayoutSize.h:
     49        (WebCore::roundedLayoutSize):
     50        (WebCore::flooredForPainting):
     51        * rendering/RenderBlock.cpp:
     52        (WebCore::adjustFloatForSubPixelLayout):
     53        * rendering/RenderBlockFlow.cpp:
     54        (WebCore::RenderBlockFlow::layoutBlockChild):
     55        * rendering/RenderElement.h:
     56        (WebCore::adjustLayoutUnitForAbsoluteZoom):
     57        * rendering/style/RenderStyle.h:
     58        (WebCore::adjustLayoutUnitForAbsoluteZoom):
     59
    1602014-08-19  Bem Jones-Bey  <bjonesbe@adobe.com>
    261

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

    r172548 r172758  
    186186ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
    187187ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
    188 ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
    189188ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
    190189ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    … …  
    245244ENABLE_LLINT_C_LOOP = ;
    246245
    247 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));
     246FEATURE_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));

  • trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

    r172192 r172758  
    570570template<> Length CSSPrimitiveValue::computeLength(const CSSToLengthConversionData& conversionData) const
    571571{
    572 #if ENABLE(SUBPIXEL_LAYOUT)
    573572    return Length(clampTo<float>(computeLengthDouble(conversionData), minValueForCssLength, maxValueForCssLength), Fixed);
    574 #else
    575     return Length(clampTo<float>(roundForImpreciseConversion<float>(computeLengthDouble(conversionData)), minValueForCssLength, maxValueForCssLength), Fixed);
    576 #endif
    577573}
    578574

  • trunk/Source/WebCore/dom/Element.cpp

    r172721 r172758  
    647647    if (zoomFactor == 1)
    648648        return value.toDouble();
    649 #if ENABLE(SUBPIXEL_LAYOUT)
    650649    return value.toDouble() / zoomFactor;
    651 #else
    652     // Needed because computeLengthInt truncates (rather than rounds) when scaling up.
    653     if (zoomFactor > 1)
    654         ++value;
    655     return value.toDouble() / zoomFactor;
    656 #endif
    657650}
    658651
    … …  
    697690    document().updateLayoutIgnorePendingStylesheets();
    698691    if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
    699 #if ENABLE(SUBPIXEL_LAYOUT)
    700692        LayoutUnit offsetWidth = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetWidth() : LayoutUnit(renderer->pixelSnappedOffsetWidth());
    701693        return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(offsetWidth, *renderer).toDouble(), renderer->document());
    702 #else
    703         return adjustForAbsoluteZoom(renderer->offsetWidth(), *renderer);
    704 #endif
    705694    }
    706695    return 0;
    … …  
    711700    document().updateLayoutIgnorePendingStylesheets();
    712701    if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
    713 #if ENABLE(SUBPIXEL_LAYOUT)
    714702        LayoutUnit offsetHeight = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetHeight() : LayoutUnit(renderer->pixelSnappedOffsetHeight());
    715703        return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(offsetHeight, *renderer).toDouble(), renderer->document());
    716 #else
    717         return adjustForAbsoluteZoom(renderer->offsetHeight(), *renderer);
    718 #endif
    719704    }
    720705    return 0;
    … …  
    746731
    747732    if (RenderBox* renderer = renderBox()) {
    748 #if ENABLE(SUBPIXEL_LAYOUT)
    749733        LayoutUnit clientLeft = subpixelMetricsEnabled(renderer->document()) ? renderer->clientLeft() : LayoutUnit(roundToInt(renderer->clientLeft()));
    750734        return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientLeft, *renderer).toDouble(), renderer->document());
    751 #else
    752         return adjustForAbsoluteZoom(renderer->clientLeft(), *renderer);
    753 #endif
    754735    }
    755736    return 0;
    … …  
    761742
    762743    if (RenderBox* renderer = renderBox()) {
    763 #if ENABLE(SUBPIXEL_LAYOUT)
    764744        LayoutUnit clientTop = subpixelMetricsEnabled(renderer->document()) ? renderer->clientTop() : LayoutUnit(roundToInt(renderer->clientTop()));
    765745        return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientTop, *renderer).toDouble(), renderer->document());
    766 #else
    767         return adjustForAbsoluteZoom(renderer->clientTop(), *renderer);
    768 #endif
    769746    }
    770747    return 0;
    … …  
    786763   
    787764    if (RenderBox* renderer = renderBox()) {
    788 #if ENABLE(SUBPIXEL_LAYOUT)
    789765        LayoutUnit clientWidth = subpixelMetricsEnabled(renderer->document()) ? renderer->clientWidth() : LayoutUnit(renderer->pixelSnappedClientWidth());
    790766        return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientWidth, *renderer).toDouble(), renderer->document());
    791 #else
    792         return adjustForAbsoluteZoom(renderer->clientWidth(), *renderer);
    793 #endif
    794767    }
    795768    return 0;
    … …  
    811784
    812785    if (RenderBox* renderer = renderBox()) {
    813 #if ENABLE(SUBPIXEL_LAYOUT)
    814786        LayoutUnit clientHeight = subpixelMetricsEnabled(renderer->document()) ? renderer->clientHeight() : LayoutUnit(renderer->pixelSnappedClientHeight());
    815787        return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientHeight, *renderer).toDouble(), renderer->document());
    816 #else
    817         return adjustForAbsoluteZoom(renderer->clientHeight(), *renderer);
    818 #endif
    819788    }
    820789    return 0;

  • trunk/Source/WebCore/platform/LayoutUnit.h

    r169309 r172758  
    5757
    5858static const int kFixedPointDenominator = 64;
    59 
    60 #if ENABLE(SUBPIXEL_LAYOUT)
    6159static const int kEffectiveFixedPointDenominator = kFixedPointDenominator;
    62 #else
    63 static const int kEffectiveFixedPointDenominator = 1;
    64 #endif
    6560const int intMaxForLayoutUnit = INT_MAX / kEffectiveFixedPointDenominator;
    6661const int intMinForLayoutUnit = INT_MIN / kEffectiveFixedPointDenominator;
    … …  
    6964public:
    7065    LayoutUnit() : m_value(0) { }
    71 #if ENABLE(SUBPIXEL_LAYOUT)
    7266    LayoutUnit(int value) { setValue(value); }
    7367    LayoutUnit(unsigned short value) { setValue(value); }
    … …  
    109103#endif
    110104    }
    111 #else
    112     LayoutUnit(int value) { REPORT_OVERFLOW(isInBounds(value)); m_value = value; }
    113     LayoutUnit(unsigned short value) { REPORT_OVERFLOW(isInBounds(value)); m_value = value; }
    114     LayoutUnit(unsigned value) { REPORT_OVERFLOW(isInBounds(value)); m_value = clampTo<int>(value); }
    115     LayoutUnit(unsigned long long value) { REPORT_OVERFLOW(isInBounds(static_cast<unsigned>(value))); m_value = clampTo<int>(value); }
    116     LayoutUnit(unsigned long value) { REPORT_OVERFLOW(isInBounds(static_cast<unsigned>(value))); m_value = clampTo<int>(value); }
    117     LayoutUnit(float value) { REPORT_OVERFLOW(isInBounds(value)); m_value = clampTo<int>(value); }
    118     LayoutUnit(double value) { REPORT_OVERFLOW(isInBounds(value)); m_value = clampTo<int>(value); }
    119 #endif
    120105
    121106    static LayoutUnit fromPixel(int value)
    … …  
    164149    }
    165150
    166 #if ENABLE(SUBPIXEL_LAYOUT)
    167151    int toInt() const { return m_value / kEffectiveFixedPointDenominator; }
    168152    float toFloat() const { return static_cast<float>(m_value) / kEffectiveFixedPointDenominator; }
    … …  
    177161        return nextafterf(floatValue, std::numeric_limits<float>::min());
    178162    }
    179 #else
    180     int toInt() const { return m_value; }
    181     float toFloat() const { return static_cast<float>(m_value); }
    182     double toDouble() const { return static_cast<double>(m_value); }
    183     float ceilToFloat() const { return toFloat(); }
    184 #endif
    185163    unsigned toUnsigned() const { REPORT_OVERFLOW(m_value >= 0); return toInt(); }
    186164
    … …  
    217195#endif
    218196    {
    219 #if ENABLE(SUBPIXEL_LAYOUT)
    220197#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
    221198        if (UNLIKELY(m_value >= INT_MAX - kEffectiveFixedPointDenominator + 1))
    … …  
    225202            return (m_value + kEffectiveFixedPointDenominator - 1) / kEffectiveFixedPointDenominator;
    226203        return toInt();
    227 #else
    228         return m_value;
    229 #endif
    230     }
     204    }
     205
    231206    int round() const
    232207    {
    233 #if ENABLE(SUBPIXEL_LAYOUT) && ENABLE(SATURATED_LAYOUT_ARITHMETIC)
     208#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
    234209        if (m_value > 0)
    235210            return saturatedAddition(rawValue(), kEffectiveFixedPointDenominator / 2) / kEffectiveFixedPointDenominator;
    236211        return saturatedSubtraction(rawValue(), (kEffectiveFixedPointDenominator / 2) - 1) / kEffectiveFixedPointDenominator;
    237 #elif ENABLE(SUBPIXEL_LAYOUT)
     212#else
    238213        if (m_value > 0)
    239214            return (m_value + (kEffectiveFixedPointDenominator / 2)) / kEffectiveFixedPointDenominator;
    240215        return (m_value - ((kEffectiveFixedPointDenominator / 2) - 1)) / kEffectiveFixedPointDenominator;
    241 #else
    242         return m_value;
    243216#endif
    244217    }
    … …  
    246219    int floor() const
    247220    {
    248 #if ENABLE(SUBPIXEL_LAYOUT)
    249221#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
    250222        if (UNLIKELY(m_value <= INT_MIN + kEffectiveFixedPointDenominator - 1))
    … …  
    254226            return toInt();
    255227        return (m_value - kEffectiveFixedPointDenominator + 1) / kEffectiveFixedPointDenominator;
    256 #else
    257         return m_value;
    258 #endif
    259228    }
    260229
    … …  
    268237    }
    269238
    270 #if ENABLE(SUBPIXEL_LAYOUT)
    271239    bool mightBeSaturated() const
    272240    {
    … …  
    276244
    277245    static float epsilon() { return 1.0f / kEffectiveFixedPointDenominator; }
    278 #else
    279     static int epsilon() { return 0; }
    280 #endif
     246
    281247    static const LayoutUnit max()
    282248    {
    … …  
    518484inline LayoutUnit boundedMultiply(const LayoutUnit& a, const LayoutUnit& b)
    519485{
    520 #if ENABLE(SUBPIXEL_LAYOUT)
    521486    int64_t result = static_cast<int64_t>(a.rawValue()) * static_cast<int64_t>(b.rawValue()) / kEffectiveFixedPointDenominator;
    522487    int32_t high = static_cast<int32_t>(result >> 32);
    … …  
    530495    returnVal.setRawValue(static_cast<int>(result));
    531496    return returnVal;
    532 #else
    533     // FIXME: Should be bounded even in the non-subpixel case.
    534     return a.rawValue() * b.rawValue();
    535 #endif
    536497}
    537498
    538499inline LayoutUnit operator*(const LayoutUnit& a, const LayoutUnit& b)
    539500{
    540 #if ENABLE(SUBPIXEL_LAYOUT) && ENABLE(SATURATED_LAYOUT_ARITHMETIC)
     501#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
    541502    return boundedMultiply(a, b);
    542 #elif ENABLE(SUBPIXEL_LAYOUT)
     503#else
    543504    LayoutUnit returnVal;
    544505    long long rawVal = static_cast<long long>(a.rawValue()) * b.rawValue() / kEffectiveFixedPointDenominator;
    545506    returnVal.setRawValue(rawVal);
    546507    return returnVal;
    547 #else
    548     return a.rawValue() * b.rawValue();
    549508#endif
    550509}   
    … …  
    622581inline LayoutUnit operator/(const LayoutUnit& a, const LayoutUnit& b)
    623582{
    624 #if ENABLE(SUBPIXEL_LAYOUT)
    625583    LayoutUnit returnVal;
    626584    long long rawVal = static_cast<long long>(kEffectiveFixedPointDenominator) * a.rawValue() / b.rawValue();
    … …  
    631589#endif
    632590    return returnVal;
    633 #else
    634     return a.rawValue() / b.rawValue();
    635 #endif
    636 }   
     591}
    637592
    638593inline float operator/(const LayoutUnit& a, float b)
    … …  
    793748inline LayoutUnit intMod(const LayoutUnit& a, const LayoutUnit& b)
    794749{
    795 #if ENABLE(SUBPIXEL_LAYOUT)
    796750    // This calculates the modulo so that: a = static_cast<int>(a / b) * b + intMod(a, b).
    797751    LayoutUnit returnVal;
    798752    returnVal.setRawValue(a.rawValue() % b.rawValue());
    799753    return returnVal;
    800 #else
    801     return a.rawValue() % b.rawValue();
    802 #endif
    803754}
    804755
    805756inline LayoutUnit operator%(const LayoutUnit& a, const LayoutUnit& b)
    806757{
    807 #if ENABLE(SUBPIXEL_LAYOUT)
    808758    // This calculates the modulo so that: a = (a / b) * b + a % b.
    809759    LayoutUnit returnVal;
    … …  
    811761    returnVal.setRawValue(rawVal / kEffectiveFixedPointDenominator);
    812762    return returnVal;
    813 #else
    814     return a.rawValue() % b.rawValue();
    815 #endif
    816763}
    817764
    … …  
    968915inline LayoutUnit roundedLayoutUnit(float value)
    969916{
    970 #if ENABLE(SUBPIXEL_LAYOUT)
    971917    return LayoutUnit::fromFloatRound(value);
    972 #else
    973     return static_cast<int>(lroundf(value));
    974 #endif
    975918}
    976919
    977920inline LayoutUnit ceiledLayoutUnit(float value)
    978921{
    979 #if ENABLE(SUBPIXEL_LAYOUT)
    980922    return LayoutUnit::fromFloatCeil(value);
    981 #else
    982     return ceilf(value);
    983 #endif
    984923}
    985924

  • trunk/Source/WebCore/platform/graphics/LayoutPoint.h

    r168528 r172758  
    187187inline FloatPoint roundedForPainting(const LayoutPoint& point, float pixelSnappingFactor, bool directionalRoundingToRight = true, bool directionalRoundingToBottom = true)
    188188{
    189 #if ENABLE(SUBPIXEL_LAYOUT)
    190189    return FloatPoint(roundToDevicePixel(point.x(), pixelSnappingFactor, !directionalRoundingToRight), roundToDevicePixel(point.y(), pixelSnappingFactor, !directionalRoundingToBottom));
    191 #else
    192     UNUSED_PARAM(pixelSnappingFactor);
    193     UNUSED_PARAM(directionalRoundingToRight);
    194     UNUSED_PARAM(directionalRoundingToBottom);
    195     return FloatPoint(point);
    196 #endif
    197190}
    198191
    199192inline FloatPoint flooredForPainting(const LayoutPoint& point, float pixelSnappingFactor)
    200193{
    201 #if ENABLE(SUBPIXEL_LAYOUT)
    202194    return FloatPoint(floorToDevicePixel(point.x(), pixelSnappingFactor), floorToDevicePixel(point.y(), pixelSnappingFactor));
    203 #else
    204     UNUSED_PARAM(pixelSnappingFactor);
    205     return FloatPoint(point);
    206 #endif
    207195}
    208196
    209197inline FloatPoint ceiledForPainting(const LayoutPoint& point, float pixelSnappingFactor)
    210198{
    211 #if ENABLE(SUBPIXEL_LAYOUT)
    212199    return FloatPoint(ceilToDevicePixel(point.x(), pixelSnappingFactor), ceilToDevicePixel(point.y(), pixelSnappingFactor));
    213 #else
    214     UNUSED_PARAM(pixelSnappingFactor);
    215     return FloatPoint(point);
    216 #endif
    217200}
    218201
    219202inline LayoutPoint roundedLayoutPoint(const FloatPoint& p)
    220203{
    221 #if ENABLE(SUBPIXEL_LAYOUT)
    222204    return LayoutPoint(p);
    223 #else
    224     return roundedIntPoint(p);
    225 #endif
    226205}
    227206

  • trunk/Source/WebCore/platform/graphics/LayoutRect.cpp

    r168575 r172758  
    139139LayoutRect enclosingLayoutRect(const FloatRect& rect)
    140140{
    141 #if ENABLE(SUBPIXEL_LAYOUT)
    142141    LayoutPoint location = flooredLayoutPoint(rect.minXMinYCorner());
    143142    LayoutPoint maxPoint = ceiledLayoutPoint(rect.maxXMaxYCorner());
    144143
    145144    return LayoutRect(location, maxPoint - location);
    146 #else
    147     return enclosingIntRect(rect);
    148 #endif
    149145}
    150146

  • trunk/Source/WebCore/platform/graphics/LayoutRect.h

    r168528 r172758  
    204204inline IntRect pixelSnappedIntRect(const LayoutRect& rect)
    205205{
    206 #if ENABLE(SUBPIXEL_LAYOUT)
    207     return IntRect(roundedIntPoint(rect.location()), IntSize(snapSizeToPixel(rect.width(), rect.x()),
    208                                                              snapSizeToPixel(rect.height(), rect.y())));
    209 
    210 #else
    211     return IntRect(rect);
    212 #endif
     206    return IntRect(roundedIntPoint(rect.location()), IntSize(snapSizeToPixel(rect.width(), rect.x()), snapSizeToPixel(rect.height(), rect.y())));
     207
    213208}
    214209
    … …  
    234229inline FloatRect pixelSnappedForPainting(const LayoutRect& rect, float pixelSnappingFactor)
    235230{
    236 #if ENABLE(SUBPIXEL_LAYOUT)
    237231    return FloatRect(roundToDevicePixel(rect.x(), pixelSnappingFactor), roundToDevicePixel(rect.y(), pixelSnappingFactor),
    238232        snapSizeToDevicePixel(rect.width(), rect.x(), pixelSnappingFactor), snapSizeToDevicePixel(rect.height(), rect.y(), pixelSnappingFactor));
    239 #else
    240     UNUSED_PARAM(pixelSnappingFactor);
    241     return FloatRect(rect);
    242 #endif
    243233}
    244234

  • trunk/Source/WebCore/platform/graphics/LayoutSize.h

    r166647 r172758  
    186186inline LayoutSize roundedLayoutSize(const FloatSize& s)
    187187{
    188 #if ENABLE(SUBPIXEL_LAYOUT)
    189188    return LayoutSize(s);
    190 #else
    191     return roundedIntSize(s);
    192 #endif
    193189}
    194190
    195191inline FloatSize flooredForPainting(const LayoutSize& size, float pixelSnappingFactor)
    196192{
    197 #if ENABLE(SUBPIXEL_LAYOUT)
    198193    return FloatSize(floorToDevicePixel(size.width(), pixelSnappingFactor), floorToDevicePixel(size.height(), pixelSnappingFactor));
    199 #else
    200     UNUSED_PARAM(pixelSnappingFactor);
    201     return FloatSize(size);
    202 #endif
    203194}
    204195

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

    r172513 r172758  
    29152915static inline LayoutUnit adjustFloatForSubPixelLayout(float value)
    29162916{
    2917 #if ENABLE(SUBPIXEL_LAYOUT)
    29182917    return ceiledLayoutUnit(value);
    2919 #else
    2920     return static_cast<int>(value);
    2921 #endif
    29222918}
    29232919

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

    r171849 r172758  
    682682    if (logicalTopEstimate != oldLogicalTop && !child.avoidsFloats() && childBlockFlow && childBlockFlow->containsFloats())
    683683        markDescendantsWithFloats = true;
    684 #if ENABLE(SUBPIXEL_LAYOUT)
    685684    else if (UNLIKELY(logicalTopEstimate.mightBeSaturated()))
    686685        // logicalTopEstimate, returned by estimateLogicalTopPosition, might be saturated for
    … …  
    689688        // might yield incorrect results. If this is the case always mark for layout.
    690689        markDescendantsWithFloats = true;
    691 #endif
    692690    else if (!child.avoidsFloats() || child.shrinkToAvoidFloats()) {
    693691        // If an element might be affected by the presence of floats, then always mark it for

  • trunk/Source/WebCore/rendering/RenderElement.h

    r172730 r172758  
    378378}
    379379
    380 #if ENABLE(SUBPIXEL_LAYOUT)
    381380inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, const RenderElement& renderer)
    382381{
    383382    return adjustLayoutUnitForAbsoluteZoom(value, renderer.style());
    384383}
    385 #endif
    386384
    387385} // namespace WebCore

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r172711 r172758  
    21192119}
    21202120
    2121 #if ENABLE(SUBPIXEL_LAYOUT)
    21222121inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, const RenderStyle& style)
    21232122{
    21242123    return value / style.effectiveZoom();
    21252124}
    2126 #endif
    21272125
    21282126inline bool RenderStyle::setZoom(float f)

  • trunk/Source/WebKit/mac/ChangeLog

    r172749 r172758  
     12014-08-19  Zalan Bujtas  <zalan@apple.com>
     2
     3        Remove ENABLE(SUBPIXEL_LAYOUT).
     4        https://bugs.webkit.org/show_bug.cgi?id=136077
     5
     6        Reviewed by Simon Fraser.
     7
     8        Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
     9
     10        * Configurations/FeatureDefines.xcconfig:
     11
    1122014-08-18  Maciej Stachowiak  <mjs@apple.com>
    213

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

    r172548 r172758  
    186186ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
    187187ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
    188 ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
    189188ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
    190189ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    … …  
    245244ENABLE_LLINT_C_LOOP = ;
    246245
    247 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));
     246FEATURE_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));

  • trunk/Source/WebKit2/ChangeLog

    r172755 r172758  
     12014-08-19  Zalan Bujtas  <zalan@apple.com>
     2
     3        Remove ENABLE(SUBPIXEL_LAYOUT).
     4        https://bugs.webkit.org/show_bug.cgi?id=136077
     5
     6        Reviewed by Simon Fraser.
     7
     8        Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
     9
     10        * Configurations/FeatureDefines.xcconfig:
     11
    1122014-08-19  Peyton Randolph  <prandolph@apple.com>
    213

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

    r172548 r172758  
    186186ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
    187187ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
    188 ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
    189188ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
    190189ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    … …  
    245244ENABLE_LLINT_C_LOOP = ;
    246245
    247 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));
     246FEATURE_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));

  • trunk/Source/cmake/OptionsEfl.cmake

    r172698 r172758  
    9696WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS OFF)
    9797WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
    98 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
    9998WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
    10099WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)

  • trunk/Source/cmake/OptionsGTK.cmake

    r172698 r172758  
    145145WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
    146146WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
    147 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
    148147WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO OFF)
    149148WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)

  • trunk/Source/cmake/OptionsMac.cmake

    r172540 r172758  
    150150WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS ON)
    151151WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SQL_DATABASE ON)
    152 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
    153152WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO ON)
    154153WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx ON)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r172346 r172758  
    127127    WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" OFF)
    128128    WEBKIT_OPTION_DEFINE(ENABLE_SQL_DATABASE "Toggle SQL Database Support" ON)
    129     WEBKIT_OPTION_DEFINE(ENABLE_SUBPIXEL_LAYOUT "Toggle subpixel layout support" OFF)
    130129    WEBKIT_OPTION_DEFINE(ENABLE_SUBTLE_CRYPTO "Toggle subtle crypto support" OFF)
    131130    WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" ON)

  • trunk/Source/cmakeconfig.h.cmake

    r172346 r172758  
    113113#cmakedefine01 ENABLE_SPELLCHECK
    114114#cmakedefine01 ENABLE_SQL_DATABASE
    115 #cmakedefine01 ENABLE_SUBPIXEL_LAYOUT
    116115#cmakedefine01 ENABLE_SUBTLE_CRYPTO
    117116#cmakedefine01 ENABLE_SVG_FONTS

  • trunk/Tools/ChangeLog

    r172751 r172758  
     12014-08-19  Zalan Bujtas  <zalan@apple.com>
     2
     3        Remove ENABLE(SUBPIXEL_LAYOUT).
     4        https://bugs.webkit.org/show_bug.cgi?id=136077
     5
     6        Reviewed by Simon Fraser.
     7
     8        Remove compile time flag SUBPIXEL_LAYOUT. All ports have it enabled for a while now.
     9
     10        * TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp:
     11
    1122014-08-19  Akos Kiss  <akiss@inf.u-szeged.hu>
    213

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp

    r140205 r172758  
    2929 */
    3030
    31 #define ENABLE_SUBPIXEL_LAYOUT 1
    3231#define ENABLE_SATURATED_LAYOUT_ARITHMETIC 1
    3332#include "config.h"
Note: See TracChangeset for help on using the changeset viewer.