<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172758] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172758">172758</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 14:02:25 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLayoutUnith">trunk/Source/WebCore/platform/LayoutUnit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutPointh">trunk/Source/WebCore/platform/graphics/LayoutPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutRectcpp">trunk/Source/WebCore/platform/graphics/LayoutRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutRecth">trunk/Source/WebCore/platform/graphics/LayoutRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutSizeh">trunk/Source/WebCore/platform/graphics/LayoutSize.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreLayoutUnitcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/ChangeLog        2014-08-19 21:02:25 UTC (rev 172758)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-19 Zalan Bujtas <zalan@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-08-17 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Optimization-disabling compiler flags should be appended to CMAKE_C(XX)_FLAGS_RELEASE
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-08-19 21:02:25 UTC (rev 172758)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-19 Zalan Bujtas <zalan@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-08-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CMake] Generate LLInt assembly correctly on Windows.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig        2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig        2014-08-19 21:02:25 UTC (rev 172758)
</span><span class="lines">@@ -185,7 +185,6 @@
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><span class="cx"> ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
</span><del>-ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
</del><span class="cx"> ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
</span><span class="lines">@@ -244,4 +243,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-19 Zalan Bujtas <zalan@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-08-18 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Use NSURLFileTypeMappings directly instead of depending on WebKitSystemInterface wrappers for it
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -300,10 +300,6 @@
</span><span class="cx"> #define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_SUBPIXEL_LAYOUT)
-#define ENABLE_SUBPIXEL_LAYOUT 1
-#endif
-
</del><span class="cx"> #endif /* PLATFORM(EFL) */
</span><span class="cx">
</span><span class="cx"> /* --------- Gtk port (Unix, Windows, Mac) --------- */
</span><span class="lines">@@ -315,10 +311,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_SUBPIXEL_LAYOUT)
-#define ENABLE_SUBPIXEL_LAYOUT 1
-#endif
-
</del><span class="cx"> #endif /* PLATFORM(GTK) */
</span><span class="cx">
</span><span class="cx"> /* ENABLE macro defaults for WebCore */
</span><span class="lines">@@ -692,10 +684,6 @@
</span><span class="cx"> #define ENABLE_SQL_DATABASE 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_SUBPIXEL_LAYOUT)
-#define ENABLE_SUBPIXEL_LAYOUT 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_SVG_FONTS)
</span><span class="cx"> #define ENABLE_SVG_FONTS 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -794,10 +782,6 @@
</span><span class="cx">
</span><span class="cx"> /* Asserts, invariants for macro definitions */
</span><span class="cx">
</span><del>-#if ENABLE(SATURATED_LAYOUT_ARITHMETIC) && !ENABLE(SUBPIXEL_LAYOUT)
-#error "ENABLE(SATURATED_LAYOUT_ARITHMETIC) requires ENABLE(SUBPIXEL_LAYOUT)"
-#endif
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK) && !ENABLE(VIDEO)
</span><span class="cx"> #error "ENABLE(VIDEO_TRACK) requires ENABLE(VIDEO)"
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2014-08-19 Zalan Bujtas <zalan@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2014-08-19 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] A few calc() test failures in the shape-image-threshold parsing tests
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -185,7 +185,6 @@
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><span class="cx"> ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
</span><del>-ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
</del><span class="cx"> ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
</span><span class="lines">@@ -244,4 +243,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -569,11 +569,7 @@
</span><span class="cx">
</span><span class="cx"> template<> Length CSSPrimitiveValue::computeLength(const CSSToLengthConversionData& conversionData) const
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return Length(clampTo<float>(computeLengthDouble(conversionData), minValueForCssLength, maxValueForCssLength), Fixed);
</span><del>-#else
- return Length(clampTo<float>(roundForImpreciseConversion<float>(computeLengthDouble(conversionData)), minValueForCssLength, maxValueForCssLength), Fixed);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> short CSSPrimitiveValue::computeLength(const CSSToLengthConversionData& conversionData) const
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -646,14 +646,7 @@
</span><span class="cx"> zoomFactor = localZoomForRenderer(renderer);
</span><span class="cx"> if (zoomFactor == 1)
</span><span class="cx"> return value.toDouble();
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return value.toDouble() / zoomFactor;
</span><del>-#else
- // Needed because computeLengthInt truncates (rather than rounds) when scaling up.
- if (zoomFactor > 1)
- ++value;
- return value.toDouble() / zoomFactor;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> enum LegacyCSSOMElementMetricsRoundingStrategy { Round, Floor };
</span><span class="lines">@@ -696,12 +689,8 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx"> if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> LayoutUnit offsetWidth = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetWidth() : LayoutUnit(renderer->pixelSnappedOffsetWidth());
</span><span class="cx"> return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(offsetWidth, *renderer).toDouble(), renderer->document());
</span><del>-#else
- return adjustForAbsoluteZoom(renderer->offsetWidth(), *renderer);
-#endif
</del><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -710,12 +699,8 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx"> if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> LayoutUnit offsetHeight = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetHeight() : LayoutUnit(renderer->pixelSnappedOffsetHeight());
</span><span class="cx"> return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(offsetHeight, *renderer).toDouble(), renderer->document());
</span><del>-#else
- return adjustForAbsoluteZoom(renderer->offsetHeight(), *renderer);
-#endif
</del><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -745,12 +730,8 @@
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><span class="cx"> if (RenderBox* renderer = renderBox()) {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> LayoutUnit clientLeft = subpixelMetricsEnabled(renderer->document()) ? renderer->clientLeft() : LayoutUnit(roundToInt(renderer->clientLeft()));
</span><span class="cx"> return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientLeft, *renderer).toDouble(), renderer->document());
</span><del>-#else
- return adjustForAbsoluteZoom(renderer->clientLeft(), *renderer);
-#endif
</del><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -760,12 +741,8 @@
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><span class="cx"> if (RenderBox* renderer = renderBox()) {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> LayoutUnit clientTop = subpixelMetricsEnabled(renderer->document()) ? renderer->clientTop() : LayoutUnit(roundToInt(renderer->clientTop()));
</span><span class="cx"> return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientTop, *renderer).toDouble(), renderer->document());
</span><del>-#else
- return adjustForAbsoluteZoom(renderer->clientTop(), *renderer);
-#endif
</del><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -785,12 +762,8 @@
</span><span class="cx"> return adjustForAbsoluteZoom(renderView.frameView().layoutWidth(), renderView);
</span><span class="cx">
</span><span class="cx"> if (RenderBox* renderer = renderBox()) {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> LayoutUnit clientWidth = subpixelMetricsEnabled(renderer->document()) ? renderer->clientWidth() : LayoutUnit(renderer->pixelSnappedClientWidth());
</span><span class="cx"> return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientWidth, *renderer).toDouble(), renderer->document());
</span><del>-#else
- return adjustForAbsoluteZoom(renderer->clientWidth(), *renderer);
-#endif
</del><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -810,12 +783,8 @@
</span><span class="cx"> return adjustForAbsoluteZoom(renderView.frameView().layoutHeight(), renderView);
</span><span class="cx">
</span><span class="cx"> if (RenderBox* renderer = renderBox()) {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> LayoutUnit clientHeight = subpixelMetricsEnabled(renderer->document()) ? renderer->clientHeight() : LayoutUnit(renderer->pixelSnappedClientHeight());
</span><span class="cx"> return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientHeight, *renderer).toDouble(), renderer->document());
</span><del>-#else
- return adjustForAbsoluteZoom(renderer->clientHeight(), *renderer);
-#endif
</del><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLayoutUnith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LayoutUnit.h (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,19 +56,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static const int kFixedPointDenominator = 64;
</span><del>-
-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> static const int kEffectiveFixedPointDenominator = kFixedPointDenominator;
</span><del>-#else
-static const int kEffectiveFixedPointDenominator = 1;
-#endif
</del><span class="cx"> const int intMaxForLayoutUnit = INT_MAX / kEffectiveFixedPointDenominator;
</span><span class="cx"> const int intMinForLayoutUnit = INT_MIN / kEffectiveFixedPointDenominator;
</span><span class="cx">
</span><span class="cx"> class LayoutUnit {
</span><span class="cx"> public:
</span><span class="cx"> LayoutUnit() : m_value(0) { }
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> LayoutUnit(int value) { setValue(value); }
</span><span class="cx"> LayoutUnit(unsigned short value) { setValue(value); }
</span><span class="cx"> LayoutUnit(unsigned value) { setValue(value); }
</span><span class="lines">@@ -108,15 +102,6 @@
</span><span class="cx"> m_value = value * kEffectiveFixedPointDenominator;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#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
</del><span class="cx">
</span><span class="cx"> static LayoutUnit fromPixel(int value)
</span><span class="cx"> {
</span><span class="lines">@@ -163,7 +148,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> int toInt() const { return m_value / kEffectiveFixedPointDenominator; }
</span><span class="cx"> float toFloat() const { return static_cast<float>(m_value) / kEffectiveFixedPointDenominator; }
</span><span class="cx"> double toDouble() const { return static_cast<double>(m_value) / kEffectiveFixedPointDenominator; }
</span><span class="lines">@@ -176,12 +160,6 @@
</span><span class="cx"> return nextafterf(floatValue, std::numeric_limits<float>::max());
</span><span class="cx"> return nextafterf(floatValue, std::numeric_limits<float>::min());
</span><span class="cx"> }
</span><del>-#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
</del><span class="cx"> unsigned toUnsigned() const { REPORT_OVERFLOW(m_value >= 0); return toInt(); }
</span><span class="cx">
</span><span class="cx"> operator int() const { return toInt(); }
</span><span class="lines">@@ -216,7 +194,6 @@
</span><span class="cx"> int ceil() const
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><span class="cx"> if (UNLIKELY(m_value >= INT_MAX - kEffectiveFixedPointDenominator + 1))
</span><span class="cx"> return intMaxForLayoutUnit;
</span><span class="lines">@@ -224,28 +201,23 @@
</span><span class="cx"> if (m_value >= 0)
</span><span class="cx"> return (m_value + kEffectiveFixedPointDenominator - 1) / kEffectiveFixedPointDenominator;
</span><span class="cx"> return toInt();
</span><del>-#else
- return m_value;
-#endif
</del><span class="cx"> }
</span><ins>+
</ins><span class="cx"> int round() const
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT) && ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</del><ins>+#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</ins><span class="cx"> if (m_value > 0)
</span><span class="cx"> return saturatedAddition(rawValue(), kEffectiveFixedPointDenominator / 2) / kEffectiveFixedPointDenominator;
</span><span class="cx"> return saturatedSubtraction(rawValue(), (kEffectiveFixedPointDenominator / 2) - 1) / kEffectiveFixedPointDenominator;
</span><del>-#elif ENABLE(SUBPIXEL_LAYOUT)
</del><ins>+#else
</ins><span class="cx"> if (m_value > 0)
</span><span class="cx"> return (m_value + (kEffectiveFixedPointDenominator / 2)) / kEffectiveFixedPointDenominator;
</span><span class="cx"> return (m_value - ((kEffectiveFixedPointDenominator / 2) - 1)) / kEffectiveFixedPointDenominator;
</span><del>-#else
- return m_value;
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int floor() const
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><span class="cx"> if (UNLIKELY(m_value <= INT_MIN + kEffectiveFixedPointDenominator - 1))
</span><span class="cx"> return intMinForLayoutUnit;
</span><span class="lines">@@ -253,9 +225,6 @@
</span><span class="cx"> if (m_value >= 0)
</span><span class="cx"> return toInt();
</span><span class="cx"> return (m_value - kEffectiveFixedPointDenominator + 1) / kEffectiveFixedPointDenominator;
</span><del>-#else
- return m_value;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit fraction() const
</span><span class="lines">@@ -267,7 +236,6 @@
</span><span class="cx"> return fraction;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> bool mightBeSaturated() const
</span><span class="cx"> {
</span><span class="cx"> return rawValue() == std::numeric_limits<int>::max()
</span><span class="lines">@@ -275,9 +243,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static float epsilon() { return 1.0f / kEffectiveFixedPointDenominator; }
</span><del>-#else
- static int epsilon() { return 0; }
-#endif
</del><ins>+
</ins><span class="cx"> static const LayoutUnit max()
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit m;
</span><span class="lines">@@ -517,7 +483,6 @@
</span><span class="cx"> // For multiplication that's prone to overflow, this bounds it to LayoutUnit::max() and ::min()
</span><span class="cx"> inline LayoutUnit boundedMultiply(const LayoutUnit& a, const LayoutUnit& b)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> int64_t result = static_cast<int64_t>(a.rawValue()) * static_cast<int64_t>(b.rawValue()) / kEffectiveFixedPointDenominator;
</span><span class="cx"> int32_t high = static_cast<int32_t>(result >> 32);
</span><span class="cx"> int32_t low = static_cast<int32_t>(result);
</span><span class="lines">@@ -529,23 +494,17 @@
</span><span class="cx"> LayoutUnit returnVal;
</span><span class="cx"> returnVal.setRawValue(static_cast<int>(result));
</span><span class="cx"> return returnVal;
</span><del>-#else
- // FIXME: Should be bounded even in the non-subpixel case.
- return a.rawValue() * b.rawValue();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline LayoutUnit operator*(const LayoutUnit& a, const LayoutUnit& b)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT) && ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</del><ins>+#if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</ins><span class="cx"> return boundedMultiply(a, b);
</span><del>-#elif ENABLE(SUBPIXEL_LAYOUT)
</del><ins>+#else
</ins><span class="cx"> LayoutUnit returnVal;
</span><span class="cx"> long long rawVal = static_cast<long long>(a.rawValue()) * b.rawValue() / kEffectiveFixedPointDenominator;
</span><span class="cx"> returnVal.setRawValue(rawVal);
</span><span class="cx"> return returnVal;
</span><del>-#else
- return a.rawValue() * b.rawValue();
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -621,7 +580,6 @@
</span><span class="cx">
</span><span class="cx"> inline LayoutUnit operator/(const LayoutUnit& a, const LayoutUnit& b)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> LayoutUnit returnVal;
</span><span class="cx"> long long rawVal = static_cast<long long>(kEffectiveFixedPointDenominator) * a.rawValue() / b.rawValue();
</span><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><span class="lines">@@ -630,10 +588,7 @@
</span><span class="cx"> returnVal.setRawValue(rawVal);
</span><span class="cx"> #endif
</span><span class="cx"> return returnVal;
</span><del>-#else
- return a.rawValue() / b.rawValue();
-#endif
-}
</del><ins>+}
</ins><span class="cx">
</span><span class="cx"> inline float operator/(const LayoutUnit& a, float b)
</span><span class="cx"> {
</span><span class="lines">@@ -792,27 +747,19 @@
</span><span class="cx"> // For returning the remainder after a division with integer results.
</span><span class="cx"> inline LayoutUnit intMod(const LayoutUnit& a, const LayoutUnit& b)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> // This calculates the modulo so that: a = static_cast<int>(a / b) * b + intMod(a, b).
</span><span class="cx"> LayoutUnit returnVal;
</span><span class="cx"> returnVal.setRawValue(a.rawValue() % b.rawValue());
</span><span class="cx"> return returnVal;
</span><del>-#else
- return a.rawValue() % b.rawValue();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline LayoutUnit operator%(const LayoutUnit& a, const LayoutUnit& b)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> // This calculates the modulo so that: a = (a / b) * b + a % b.
</span><span class="cx"> LayoutUnit returnVal;
</span><span class="cx"> long long rawVal = (static_cast<long long>(kEffectiveFixedPointDenominator) * a.rawValue()) % b.rawValue();
</span><span class="cx"> returnVal.setRawValue(rawVal / kEffectiveFixedPointDenominator);
</span><span class="cx"> return returnVal;
</span><del>-#else
- return a.rawValue() % b.rawValue();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline LayoutUnit operator%(const LayoutUnit& a, int b)
</span><span class="lines">@@ -967,20 +914,12 @@
</span><span class="cx">
</span><span class="cx"> inline LayoutUnit roundedLayoutUnit(float value)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return LayoutUnit::fromFloatRound(value);
</span><del>-#else
- return static_cast<int>(lroundf(value));
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline LayoutUnit ceiledLayoutUnit(float value)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return LayoutUnit::fromFloatCeil(value);
</span><del>-#else
- return ceilf(value);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline LayoutUnit absoluteValue(const LayoutUnit& value)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutPoint.h (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -186,43 +186,22 @@
</span><span class="cx">
</span><span class="cx"> inline FloatPoint roundedForPainting(const LayoutPoint& point, float pixelSnappingFactor, bool directionalRoundingToRight = true, bool directionalRoundingToBottom = true)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return FloatPoint(roundToDevicePixel(point.x(), pixelSnappingFactor, !directionalRoundingToRight), roundToDevicePixel(point.y(), pixelSnappingFactor, !directionalRoundingToBottom));
</span><del>-#else
- UNUSED_PARAM(pixelSnappingFactor);
- UNUSED_PARAM(directionalRoundingToRight);
- UNUSED_PARAM(directionalRoundingToBottom);
- return FloatPoint(point);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline FloatPoint flooredForPainting(const LayoutPoint& point, float pixelSnappingFactor)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return FloatPoint(floorToDevicePixel(point.x(), pixelSnappingFactor), floorToDevicePixel(point.y(), pixelSnappingFactor));
</span><del>-#else
- UNUSED_PARAM(pixelSnappingFactor);
- return FloatPoint(point);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline FloatPoint ceiledForPainting(const LayoutPoint& point, float pixelSnappingFactor)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return FloatPoint(ceilToDevicePixel(point.x(), pixelSnappingFactor), ceilToDevicePixel(point.y(), pixelSnappingFactor));
</span><del>-#else
- UNUSED_PARAM(pixelSnappingFactor);
- return FloatPoint(point);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline LayoutPoint roundedLayoutPoint(const FloatPoint& p)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return LayoutPoint(p);
</span><del>-#else
- return roundedIntPoint(p);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.cpp (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -138,14 +138,10 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect enclosingLayoutRect(const FloatRect& rect)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> LayoutPoint location = flooredLayoutPoint(rect.minXMinYCorner());
</span><span class="cx"> LayoutPoint maxPoint = ceiledLayoutPoint(rect.maxXMaxYCorner());
</span><span class="cx">
</span><span class="cx"> return LayoutRect(location, maxPoint - location);
</span><del>-#else
- return enclosingIntRect(rect);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect enclosingRectForPainting(const LayoutRect& rect, float pixelSnappingFactor)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.h (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -203,13 +203,8 @@
</span><span class="cx">
</span><span class="cx"> inline IntRect pixelSnappedIntRect(const LayoutRect& rect)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
- return IntRect(roundedIntPoint(rect.location()), IntSize(snapSizeToPixel(rect.width(), rect.x()),
- snapSizeToPixel(rect.height(), rect.y())));
</del><ins>+ return IntRect(roundedIntPoint(rect.location()), IntSize(snapSizeToPixel(rect.width(), rect.x()), snapSizeToPixel(rect.height(), rect.y())));
</ins><span class="cx">
</span><del>-#else
- return IntRect(rect);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect enclosingIntRect(const LayoutRect&);
</span><span class="lines">@@ -233,13 +228,8 @@
</span><span class="cx">
</span><span class="cx"> inline FloatRect pixelSnappedForPainting(const LayoutRect& rect, float pixelSnappingFactor)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return FloatRect(roundToDevicePixel(rect.x(), pixelSnappingFactor), roundToDevicePixel(rect.y(), pixelSnappingFactor),
</span><span class="cx"> snapSizeToDevicePixel(rect.width(), rect.x(), pixelSnappingFactor), snapSizeToDevicePixel(rect.height(), rect.y(), pixelSnappingFactor));
</span><del>-#else
- UNUSED_PARAM(pixelSnappingFactor);
- return FloatRect(rect);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline FloatRect pixelSnappedForPainting(LayoutUnit x, LayoutUnit y, LayoutUnit width, LayoutUnit height, float pixelSnappingFactor)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutSize.h (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -185,21 +185,12 @@
</span><span class="cx">
</span><span class="cx"> inline LayoutSize roundedLayoutSize(const FloatSize& s)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return LayoutSize(s);
</span><del>-#else
- return roundedIntSize(s);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline FloatSize flooredForPainting(const LayoutSize& size, float pixelSnappingFactor)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return FloatSize(floorToDevicePixel(size.width(), pixelSnappingFactor), floorToDevicePixel(size.height(), pixelSnappingFactor));
</span><del>-#else
- UNUSED_PARAM(pixelSnappingFactor);
- return FloatSize(size);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2914,11 +2914,7 @@
</span><span class="cx"> // width.
</span><span class="cx"> static inline LayoutUnit adjustFloatForSubPixelLayout(float value)
</span><span class="cx"> {
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> return ceiledLayoutUnit(value);
</span><del>-#else
- return static_cast<int>(value);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -681,14 +681,12 @@
</span><span class="cx"> bool markDescendantsWithFloats = false;
</span><span class="cx"> if (logicalTopEstimate != oldLogicalTop && !child.avoidsFloats() && childBlockFlow && childBlockFlow->containsFloats())
</span><span class="cx"> markDescendantsWithFloats = true;
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> else if (UNLIKELY(logicalTopEstimate.mightBeSaturated()))
</span><span class="cx"> // logicalTopEstimate, returned by estimateLogicalTopPosition, might be saturated for
</span><span class="cx"> // very large elements. If it does the comparison with oldLogicalTop might yield a
</span><span class="cx"> // false negative as adding and removing margins, borders etc from a saturated number
</span><span class="cx"> // might yield incorrect results. If this is the case always mark for layout.
</span><span class="cx"> markDescendantsWithFloats = true;
</span><del>-#endif
</del><span class="cx"> else if (!child.avoidsFloats() || child.shrinkToAvoidFloats()) {
</span><span class="cx"> // If an element might be affected by the presence of floats, then always mark it for
</span><span class="cx"> // layout.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -377,12 +377,10 @@
</span><span class="cx"> return adjustForAbsoluteZoom(value, renderer.style());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, const RenderElement& renderer)
</span><span class="cx"> {
</span><span class="cx"> return adjustLayoutUnitForAbsoluteZoom(value, renderer.style());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2118,12 +2118,10 @@
</span><span class="cx"> return value / style->effectiveZoom();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SUBPIXEL_LAYOUT)
</del><span class="cx"> inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, const RenderStyle& style)
</span><span class="cx"> {
</span><span class="cx"> return value / style.effectiveZoom();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> inline bool RenderStyle::setZoom(float f)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-19 Zalan Bujtas <zalan@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-08-18 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Use NSURLFileTypeMappings directly instead of depending on WebKitSystemInterface wrappers for it
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -185,7 +185,6 @@
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><span class="cx"> ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
</span><del>-ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
</del><span class="cx"> ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
</span><span class="lines">@@ -244,4 +243,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-19 Zalan Bujtas <zalan@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-08-19 Peyton Randolph <prandolph@apple.com>
</span><span class="cx">
</span><span class="cx"> Extend injected bundle node snapshotting to support forced white and black text
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -185,7 +185,6 @@
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><span class="cx"> ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
</span><del>-ENABLE_SUBPIXEL_LAYOUT = ENABLE_SUBPIXEL_LAYOUT;
</del><span class="cx"> ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
</span><span class="lines">@@ -244,4 +243,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -95,7 +95,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_SLIDER ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -144,7 +144,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -149,7 +149,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SQL_DATABASE ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx_1080 OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -126,7 +126,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SQL_DATABASE "Toggle SQL Database Support" ON)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_SUBPIXEL_LAYOUT "Toggle subpixel layout support" OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SUBTLE_CRYPTO "Toggle subtle crypto support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -112,7 +112,6 @@
</span><span class="cx"> #cmakedefine01 ENABLE_SMOOTH_SCROLLING
</span><span class="cx"> #cmakedefine01 ENABLE_SPELLCHECK
</span><span class="cx"> #cmakedefine01 ENABLE_SQL_DATABASE
</span><del>-#cmakedefine01 ENABLE_SUBPIXEL_LAYOUT
</del><span class="cx"> #cmakedefine01 ENABLE_SUBTLE_CRYPTO
</span><span class="cx"> #cmakedefine01 ENABLE_SVG_FONTS
</span><span class="cx"> #cmakedefine01 ENABLE_TELEPHONE_NUMBER_DETECTION
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-08-19 20:41:08 UTC (rev 172757)
+++ trunk/Tools/ChangeLog        2014-08-19 21:02:25 UTC (rev 172758)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-19 Zalan Bujtas <zalan@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-08-19 Akos Kiss <akiss@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Let the caller define JSC_timeout for run-javascriptcore-tests
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreLayoutUnitcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp (172757 => 172758)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#define ENABLE_SUBPIXEL_LAYOUT 1
</del><span class="cx"> #define ENABLE_SATURATED_LAYOUT_ARITHMETIC 1
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>