Diff
Modified: trunk/Source/WebCore/ChangeLog (197381 => 197382)
--- trunk/Source/WebCore/ChangeLog 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/ChangeLog 2016-03-01 03:42:41 UTC (rev 197382)
@@ -1,3 +1,38 @@
+2016-02-29 Simon Fraser <simon.fra...@apple.com>
+
+ Remove the experimental feature of antialiased font dilation
+ https://bugs.webkit.org/show_bug.cgi?id=154843
+
+ Reviewed by Zalan Bujtas.
+
+ Remove the "antialiased font dilation" code path, and related prefs.
+
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings): Deleted.
+ (WebCore::Settings::setAntialiasedFontDilationEnabled): Deleted.
+ * page/Settings.h:
+ (WebCore::Settings::antialiasedFontDilationEnabled): Deleted.
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::setAntialiasedFontDilationEnabled): Deleted.
+ (WebCore::FontCascade::antialiasedFontDilationEnabled): Deleted.
+ * platform/graphics/FontCascade.h:
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContextStateChange::changesFromState): Deleted.
+ (WebCore::GraphicsContextStateChange::accumulate): Deleted.
+ (WebCore::GraphicsContextStateChange::apply): Deleted.
+ (WebCore::GraphicsContextStateChange::dump): Deleted.
+ (WebCore::GraphicsContext::setAntialiasedFontDilationEnabled): Deleted.
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::GraphicsContextState::GraphicsContextState): Deleted.
+ (WebCore::GraphicsContext::antialiasedFontDilationEnabled): Deleted.
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+ (PlatformCALayer::drawLayerContents): Deleted.
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::dilationSizeForTextColor): Deleted.
+ (WebCore::FontCascade::drawGlyphs): Deleted.
+ * platform/graphics/displaylists/DisplayList.cpp:
+ (WebCore::DisplayList::DisplayList::shouldDumpForFlags): Deleted.
+
2016-02-29 Jer Noble <jer.no...@apple.com>
Refactor CoreVideo API access into their own classes so code can be re-used.
Modified: trunk/Source/WebCore/page/Settings.cpp (197381 => 197382)
--- trunk/Source/WebCore/page/Settings.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-03-01 03:42:41 UTC (rev 197382)
@@ -199,7 +199,6 @@
, m_needsAdobeFrameReloadingQuirk(false)
, m_usesPageCache(false)
, m_fontRenderingMode(0)
- , m_antialiasedFontDilationEnabled(false)
, m_showTiledScrollingIndicator(false)
, m_backgroundShouldExtendBeyondPage(false)
, m_dnsPrefetchingEnabled(false)
@@ -360,12 +359,6 @@
#endif
-void Settings::setAntialiasedFontDilationEnabled(bool enabled)
-{
- // FIXME: It's wrong for a setting to toggle a global, but this code is temporary.
- FontCascade::setAntialiasedFontDilationEnabled(enabled);
-}
-
void Settings::setMediaTypeOverride(const String& mediaTypeOverride)
{
if (m_mediaTypeOverride == mediaTypeOverride)
Modified: trunk/Source/WebCore/page/Settings.h (197381 => 197382)
--- trunk/Source/WebCore/page/Settings.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/page/Settings.h 2016-03-01 03:42:41 UTC (rev 197382)
@@ -113,9 +113,6 @@
const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutosizingWindowSizeOverride; }
#endif
- WEBCORE_EXPORT void setAntialiasedFontDilationEnabled(bool);
- bool antialiasedFontDilationEnabled() const { return m_antialiasedFontDilationEnabled; }
-
// Only set by Layout Tests.
WEBCORE_EXPORT void setMediaTypeOverride(const String&);
const String& mediaTypeOverride() const { return m_mediaTypeOverride; }
@@ -322,7 +319,6 @@
bool m_needsAdobeFrameReloadingQuirk : 1;
bool m_usesPageCache : 1;
unsigned m_fontRenderingMode : 1;
- bool m_antialiasedFontDilationEnabled : 1;
bool m_showTiledScrollingIndicator : 1;
bool m_backgroundShouldExtendBeyondPage : 1;
bool m_dnsPrefetchingEnabled : 1;
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (197381 => 197382)
--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-03-01 03:42:41 UTC (rev 197382)
@@ -567,18 +567,6 @@
return shouldUseFontSmoothing;
}
-static bool antialiasedFontDilationIsEnabled = false;
-
-void FontCascade::setAntialiasedFontDilationEnabled(bool enabled)
-{
- antialiasedFontDilationIsEnabled = enabled;
-}
-
-bool FontCascade::antialiasedFontDilationEnabled()
-{
- return antialiasedFontDilationIsEnabled;
-}
-
void FontCascade::setCodePath(CodePath p)
{
s_codePath = p;
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (197381 => 197382)
--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2016-03-01 03:42:41 UTC (rev 197382)
@@ -204,9 +204,6 @@
static bool leadingExpansionOpportunity(const StringView&, TextDirection);
static bool trailingExpansionOpportunity(const StringView&, TextDirection);
- WEBCORE_EXPORT static void setAntialiasedFontDilationEnabled(bool);
- WEBCORE_EXPORT static bool antialiasedFontDilationEnabled();
-
WEBCORE_EXPORT static void setShouldUseSmoothing(bool);
WEBCORE_EXPORT static bool shouldUseSmoothing();
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (197381 => 197382)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2016-03-01 03:42:41 UTC (rev 197382)
@@ -110,7 +110,6 @@
CHECK_FOR_CHANGED_PROPERTY(ShouldAntialiasChange, shouldAntialias);
CHECK_FOR_CHANGED_PROPERTY(ShouldSmoothFontsChange, shouldSmoothFonts);
- CHECK_FOR_CHANGED_PROPERTY(AntialiasedFontDilationEnabledChange, antialiasedFontDilationEnabled);
CHECK_FOR_CHANGED_PROPERTY(ShouldSubpixelQuantizeFontsChange, shouldSubpixelQuantizeFonts);
CHECK_FOR_CHANGED_PROPERTY(ShadowsIgnoreTransformsChange, shadowsIgnoreTransforms);
CHECK_FOR_CHANGED_PROPERTY(DrawLuminanceMaskChange, drawLuminanceMask);
@@ -173,9 +172,6 @@
if (flags & GraphicsContextState::ShouldSmoothFontsChange)
m_state.shouldSmoothFonts = state.shouldSmoothFonts;
- if (flags & GraphicsContextState::AntialiasedFontDilationEnabledChange)
- m_state.antialiasedFontDilationEnabled = state.antialiasedFontDilationEnabled;
-
if (flags & GraphicsContextState::ShouldSubpixelQuantizeFontsChange)
m_state.shouldSubpixelQuantizeFonts = state.shouldSubpixelQuantizeFonts;
@@ -244,9 +240,6 @@
if (m_changeFlags & GraphicsContextState::ShouldSmoothFontsChange)
context.setShouldSmoothFonts(m_state.shouldSmoothFonts);
- if (m_changeFlags & GraphicsContextState::AntialiasedFontDilationEnabledChange)
- context.setAntialiasedFontDilationEnabled(m_state.antialiasedFontDilationEnabled);
-
if (m_changeFlags & GraphicsContextState::ShouldSubpixelQuantizeFontsChange)
context.setShouldSubpixelQuantizeFonts(m_state.shouldSubpixelQuantizeFonts);
@@ -317,9 +310,6 @@
if (m_changeFlags & GraphicsContextState::ShouldSmoothFontsChange)
ts.dumpProperty("should-smooth-fonts", m_state.shouldSmoothFonts);
- if (m_changeFlags & GraphicsContextState::AntialiasedFontDilationEnabledChange)
- ts.dumpProperty("antialiased-font-dilation-enabled", m_state.antialiasedFontDilationEnabled);
-
if (m_changeFlags & GraphicsContextState::ShouldSubpixelQuantizeFontsChange)
ts.dumpProperty("should-subpixel-quantize-fonts", m_state.shouldSubpixelQuantizeFonts);
@@ -586,13 +576,6 @@
setPlatformImageInterpolationQuality(imageInterpolationQuality);
}
-void GraphicsContext::setAntialiasedFontDilationEnabled(bool antialiasedFontDilationEnabled)
-{
- m_state.antialiasedFontDilationEnabled = antialiasedFontDilationEnabled;
- if (isRecording())
- m_displayListRecorder->updateState(m_state, GraphicsContextState::AntialiasedFontDilationEnabledChange);
-}
-
void GraphicsContext::setStrokePattern(Ref<Pattern>&& pattern)
{
m_state.strokeGradient = nullptr;
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (197381 => 197382)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-03-01 03:42:41 UTC (rev 197382)
@@ -110,7 +110,6 @@
GraphicsContextState()
: shouldAntialias(true)
, shouldSmoothFonts(true)
- , antialiasedFontDilationEnabled(true)
, shouldSubpixelQuantizeFonts(true)
, shadowsIgnoreTransforms(false)
#if USE(CG)
@@ -142,10 +141,9 @@
TextDrawingModeChange = 1 << 16,
ShouldAntialiasChange = 1 << 17,
ShouldSmoothFontsChange = 1 << 18,
- AntialiasedFontDilationEnabledChange = 1 << 19,
- ShouldSubpixelQuantizeFontsChange = 1 << 20,
- DrawLuminanceMaskChange = 1 << 21,
- ImageInterpolationQualityChange = 1 << 22,
+ ShouldSubpixelQuantizeFontsChange = 1 << 19,
+ DrawLuminanceMaskChange = 1 << 20,
+ ImageInterpolationQualityChange = 1 << 21,
};
typedef uint32_t StateChangeFlags;
@@ -176,7 +174,6 @@
bool shouldAntialias : 1;
bool shouldSmoothFonts : 1;
- bool antialiasedFontDilationEnabled : 1;
bool shouldSubpixelQuantizeFonts : 1;
bool shadowsIgnoreTransforms : 1;
#if USE(CG)
@@ -294,9 +291,6 @@
WEBCORE_EXPORT void setShouldAntialias(bool);
bool shouldAntialias() const { return m_state.shouldAntialias; }
- WEBCORE_EXPORT void setAntialiasedFontDilationEnabled(bool);
- bool antialiasedFontDilationEnabled() const { return m_state.antialiasedFontDilationEnabled; }
-
WEBCORE_EXPORT void setShouldSmoothFonts(bool);
bool shouldSmoothFonts() const { return m_state.shouldSmoothFonts; }
Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (197381 => 197382)
--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2016-03-01 03:42:41 UTC (rev 197382)
@@ -1059,7 +1059,6 @@
if (!layerContents->platformCALayerContentsOpaque()) {
// Turn off font smoothing to improve the appearance of text rendered onto a transparent background.
graphicsContext.setShouldSmoothFonts(false);
- graphicsContext.setAntialiasedFontDilationEnabled(true);
}
#if PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (197381 => 197382)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-03-01 03:42:41 UTC (rev 197382)
@@ -220,26 +220,6 @@
CGContextSetShouldSubpixelQuantizeFonts(cgContext, doSubpixelQuantization);
}
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
-static CGSize dilationSizeForTextColor(const Color& color)
-{
- double hue;
- double saturation;
- double lightness;
- color.getHSL(hue, saturation, lightness);
-
- // These values were derived empirically, and are only experimental.
- if (lightness < 0.3333) // Dark
- return CGSizeMake(0.007, 0.019);
-
- if (lightness < 0.6667) // Medium
- return CGSizeMake(0.032, 0.032);
-
- // Light
- return CGSizeMake(0.0475, 0.039);
-}
-#endif
-
void FontCascade::drawGlyphs(GraphicsContext& context, const Font& font, const GlyphBuffer& glyphBuffer, int from, int numGlyphs, const FloatPoint& anchorPoint, FontSmoothingMode smoothingMode)
{
const FontPlatformData& platformData = font.platformData();
@@ -250,34 +230,29 @@
bool shouldSmoothFonts;
bool changeFontSmoothing;
- bool matchAntialiasedAndSmoothedFonts = context.antialiasedFontDilationEnabled();
switch (smoothingMode) {
case Antialiased: {
context.setShouldAntialias(true);
shouldSmoothFonts = false;
changeFontSmoothing = true;
- matchAntialiasedAndSmoothedFonts = false; // CSS has opted into strictly antialiased fonts.
break;
}
case SubpixelAntialiased: {
context.setShouldAntialias(true);
shouldSmoothFonts = true;
changeFontSmoothing = true;
- matchAntialiasedAndSmoothedFonts = true;
break;
}
case NoSmoothing: {
context.setShouldAntialias(false);
shouldSmoothFonts = false;
changeFontSmoothing = true;
- matchAntialiasedAndSmoothedFonts = false;
break;
}
case AutoSmoothing: {
shouldSmoothFonts = true;
changeFontSmoothing = false;
- matchAntialiasedAndSmoothedFonts = true;
break;
}
}
@@ -285,7 +260,6 @@
if (!shouldUseSmoothing()) {
shouldSmoothFonts = false;
changeFontSmoothing = true;
- matchAntialiasedAndSmoothedFonts = true;
}
#if !PLATFORM(IOS)
@@ -294,18 +268,7 @@
originalShouldUseFontSmoothing = CGContextGetShouldSmoothFonts(cgContext);
CGContextSetShouldSmoothFonts(cgContext, shouldSmoothFonts);
}
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
- CGFontAntialiasingStyle oldAntialiasingStyle;
- bool resetAntialiasingStyle = false;
- if (antialiasedFontDilationEnabled() && !CGContextGetShouldSmoothFonts(cgContext) && matchAntialiasedAndSmoothedFonts) {
- resetAntialiasingStyle = true;
- oldAntialiasingStyle = CGContextGetFontAntialiasingStyle(cgContext);
- CGContextSetFontAntialiasingStyle(cgContext, kCGFontAntialiasingStyleUnfilteredCustomDilation);
- CGContextSetFontDilation(cgContext, dilationSizeForTextColor(context.fillColor()));
- }
#endif
-#endif
CGContextSetFont(cgContext, platformData.cgFont());
@@ -371,11 +334,6 @@
context.setShadow(shadowOffset, shadowBlur, shadowColor);
#if !PLATFORM(IOS)
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
- if (resetAntialiasingStyle)
- CGContextSetFontAntialiasingStyle(cgContext, oldAntialiasingStyle);
-#endif
-
if (changeFontSmoothing)
CGContextSetShouldSmoothFonts(cgContext, originalShouldUseFontSmoothing);
#endif
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp (197381 => 197382)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp 2016-03-01 03:42:41 UTC (rev 197382)
@@ -68,9 +68,6 @@
if (stateItem.state().m_changeFlags == GraphicsContextState::ShouldSubpixelQuantizeFontsChange)
return false;
- if (stateItem.state().m_changeFlags == GraphicsContextState::AntialiasedFontDilationEnabledChange)
- return false;
-
if (stateItem.state().m_changeFlags == GraphicsContextState::ShouldSubpixelQuantizeFontsChange)
return false;
}
Modified: trunk/Source/WebKit/mac/ChangeLog (197381 => 197382)
--- trunk/Source/WebKit/mac/ChangeLog 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-01 03:42:41 UTC (rev 197382)
@@ -1,3 +1,21 @@
+2016-02-29 Simon Fraser <simon.fra...@apple.com>
+
+ Remove the experimental feature of antialiased font dilation
+ https://bugs.webkit.org/show_bug.cgi?id=154843
+
+ Reviewed by Zalan Bujtas.
+
+ Remove the "antialiased font dilation" code path, and related prefs.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Deleted.
+ (-[WebPreferences setAntialiasedFontDilationEnabled:]): Deleted.
+ (-[WebPreferences antialiasedFontDilationEnabled]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Deleted.
+
2016-02-26 Dan Bernstein <m...@apple.com>
Build fix for when WK_OVERRIDE_FRAMEWORKS_DIR contains spaces.
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (197381 => 197382)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-03-01 03:42:41 UTC (rev 197382)
@@ -178,7 +178,6 @@
#define WebKitWantsBalancedSetDefersLoadingBehaviorKey @"WebKitWantsBalancedSetDefersLoadingBehavior"
#define WebKitDebugFullPageZoomPreferenceKey @"WebKitDebugFullPageZoomPreferenceKey"
#define WebKitMinimumZoomFontSizePreferenceKey @"WebKitMinimumZoomFontSizePreferenceKey"
-#define WebKitAntialiasedFontDilationEnabledKey @"AntialiasedFontDilationEnabled"
#define WebKitHTTPEquivEnabledPreferenceKey @"WebKitHTTPEquivEnabled"
#if TARGET_OS_IPHONE
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (197381 => 197382)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-01 03:42:41 UTC (rev 197382)
@@ -418,7 +418,6 @@
@"0", WebKitMinimumFontSizePreferenceKey,
@"9", WebKitMinimumLogicalFontSizePreferenceKey,
@"16", WebKitDefaultFontSizePreferenceKey,
- @(NO), WebKitAntialiasedFontDilationEnabledKey,
@"13", WebKitDefaultFixedFontSizePreferenceKey,
@"ISO-8859-1", WebKitDefaultTextEncodingNamePreferenceKey,
[NSNumber numberWithBool:NO], WebKitUsesEncodingDetectorPreferenceKey,
@@ -2590,16 +2589,6 @@
[self _setStringValue:directory forKey:WebKitMediaKeysStorageDirectoryKey];
}
-- (void)setAntialiasedFontDilationEnabled:(BOOL)enabled
-{
- [self _setBoolValue:enabled forKey:WebKitAntialiasedFontDilationEnabledKey];
-}
-
-- (BOOL)antialiasedFontDilationEnabled
-{
- return [self _boolValueForKey:WebKitAntialiasedFontDilationEnabledKey];
-}
-
- (void)setMetaRefreshEnabled:(BOOL)enabled
{
[self setHTTPEquivEnabled:enabled];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (197381 => 197382)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-03-01 03:42:41 UTC (rev 197382)
@@ -458,9 +458,6 @@
- (void)setMediaKeysStorageDirectory:(NSString *)directory;
- (NSString *)mediaKeysStorageDirectory;
-- (void)setAntialiasedFontDilationEnabled:(BOOL)flag;
-- (BOOL)antialiasedFontDilationEnabled;
-
- (void)setMetaRefreshEnabled:(BOOL)flag;
- (BOOL)metaRefreshEnabled;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (197381 => 197382)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-01 03:42:41 UTC (rev 197382)
@@ -2257,7 +2257,6 @@
settings.setUsesEncodingDetector([preferences usesEncodingDetector]);
settings.setFantasyFontFamily([preferences fantasyFontFamily]);
settings.setFixedFontFamily([preferences fixedFontFamily]);
- settings.setAntialiasedFontDilationEnabled([preferences antialiasedFontDilationEnabled]);
settings.setForceFTPDirectoryListings([preferences _forceFTPDirectoryListings]);
settings.setFTPDirectoryTemplatePath([preferences _ftpDirectoryTemplatePath]);
settings.setLocalStorageDatabasePath([preferences _localStorageDatabasePath]);
Modified: trunk/Source/WebKit2/ChangeLog (197381 => 197382)
--- trunk/Source/WebKit2/ChangeLog 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-01 03:42:41 UTC (rev 197382)
@@ -1,3 +1,24 @@
+2016-02-29 Simon Fraser <simon.fra...@apple.com>
+
+ Remove the experimental feature of antialiased font dilation
+ https://bugs.webkit.org/show_bug.cgi?id=154843
+
+ Reviewed by Zalan Bujtas.
+
+ Remove the "antialiased font dilation" code path, and related prefs.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetAntialiasedFontDilationEnabled):
+ (WKPreferencesGetAntialiasedFontDilationEnabled):
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _antialiasedFontDilationEnabled]): Deleted.
+ (-[WKPreferences _setAntialiasedFontDilationEnabled:]): Deleted.
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Deleted.
+
2016-02-29 Brady Eidson <beid...@apple.com>
Modern IDB: WebKit 2 IPC layer easily confused about multiple web processes being connected.
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (197381 => 197382)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-03-01 03:42:41 UTC (rev 197382)
@@ -222,7 +222,6 @@
macro(ServiceControlsEnabled, serviceControlsEnabled, Bool, bool, false) \
macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, false) \
macro(NewBlockInsideInlineModelEnabled, newBlockInsideInlineModelEnabled, Bool, bool, false) \
- macro(AntialiasedFontDilationEnabled, antialiasedFontDilationEnabled, Bool, bool, false) \
macro(HTTPEquivEnabled, httpEquivEnabled, Bool, bool, true) \
macro(MockCaptureDevicesEnabled, mockCaptureDevicesEnabled, Bool, bool, false) \
FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro) \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (197381 => 197382)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-03-01 03:42:41 UTC (rev 197382)
@@ -1387,14 +1387,14 @@
return toImpl(preferencesRef)->minimumZoomFontSize();
}
-void WKPreferencesSetAntialiasedFontDilationEnabled(WKPreferencesRef preferencesRef, bool enabled)
+void WKPreferencesSetAntialiasedFontDilationEnabled(WKPreferencesRef, bool)
{
- toImpl(preferencesRef)->setAntialiasedFontDilationEnabled(enabled);
+ // Feature removed.
}
-bool WKPreferencesGetAntialiasedFontDilationEnabled(WKPreferencesRef preferencesRef)
+bool WKPreferencesGetAntialiasedFontDilationEnabled(WKPreferencesRef)
{
- return toImpl(preferencesRef)->antialiasedFontDilationEnabled();
+ return false; // Feature removed.
}
void WKPreferencesSetVisibleDebugOverlayRegions(WKPreferencesRef preferencesRef, WKDebugOverlayRegions visibleRegions)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (197381 => 197382)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-03-01 03:42:41 UTC (rev 197382)
@@ -379,7 +379,7 @@
WK_EXPORT void WKPreferencesSetScreenFontSubstitutionEnabled(WKPreferencesRef preferences, bool enabled);
WK_EXPORT bool WKPreferencesGetScreenFontSubstitutionEnabled(WKPreferencesRef preferences);
-// Defaults to false.
+// Not implemented, should be deleted once Safari no longer uses this function.
WK_EXPORT void WKPreferencesSetAntialiasedFontDilationEnabled(WKPreferencesRef preferences, bool enabled);
WK_EXPORT bool WKPreferencesGetAntialiasedFontDilationEnabled(WKPreferencesRef preferences);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (197381 => 197382)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-03-01 03:42:41 UTC (rev 197382)
@@ -389,16 +389,6 @@
_preferences->setDiagnosticLoggingEnabled(diagnosticLoggingEnabled);
}
-- (BOOL)_antialiasedFontDilationEnabled
-{
- return _preferences->antialiasedFontDilationEnabled();
-}
-
-- (void)_setAntialiasedFontDilationEnabled:(BOOL)antialiasedFontDilationEnabled
-{
- _preferences->setAntialiasedFontDilationEnabled(antialiasedFontDilationEnabled);
-}
-
- (NSUInteger)_defaultFontSize
{
return _preferences->defaultFontSize();
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (197381 => 197382)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-03-01 03:42:41 UTC (rev 197382)
@@ -76,8 +76,6 @@
@property (nonatomic, setter=_setDiagnosticLoggingEnabled:) BOOL _diagnosticLoggingEnabled WK_AVAILABLE(10_11, 9_0);
-@property (nonatomic, setter=_setAntialiasedFontDilationEnabled:) BOOL _antialiasedFontDilationEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-
@property (nonatomic, setter=_setDefaultFontSize:) NSUInteger _defaultFontSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@property (nonatomic, setter=_setDefaultFixedPitchFontSize:) NSUInteger _defaultFixedPitchFontSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@property (nonatomic, copy, setter=_setFixedPitchFontFamily:) NSString *_fixedPitchFontFamily WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (197381 => 197382)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-01 03:42:41 UTC (rev 197382)
@@ -2987,7 +2987,6 @@
settings.setSimpleLineLayoutDebugBordersEnabled(store.getBoolValueForKey(WebPreferencesKey::simpleLineLayoutDebugBordersEnabledKey()));
settings.setNewBlockInsideInlineModelEnabled(store.getBoolValueForKey(WebPreferencesKey::newBlockInsideInlineModelEnabledKey()));
- settings.setAntialiasedFontDilationEnabled(store.getBoolValueForKey(WebPreferencesKey::antialiasedFontDilationEnabledKey()));
settings.setSubpixelCSSOMElementMetricsEnabled(store.getBoolValueForKey(WebPreferencesKey::subpixelCSSOMElementMetricsEnabledKey()));
Modified: trunk/Tools/ChangeLog (197381 => 197382)
--- trunk/Tools/ChangeLog 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Tools/ChangeLog 2016-03-01 03:42:41 UTC (rev 197382)
@@ -1,3 +1,17 @@
+2016-02-29 Simon Fraser <simon.fra...@apple.com>
+
+ Remove the experimental feature of antialiased font dilation
+ https://bugs.webkit.org/show_bug.cgi?id=154843
+
+ Reviewed by Zalan Bujtas.
+
+ Remove the "antialiased font dilation" code path, and related prefs.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues): Deleted.
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues): Deleted.
+
2016-02-29 Brady Eidson <beid...@apple.com>
Fix timing flakiness in test I added in http://trac.webkit.org/changeset/197372
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (197381 => 197382)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-03-01 03:42:41 UTC (rev 197382)
@@ -899,7 +899,6 @@
[preferences setPictographFontFamily:@"Apple Color Emoji"];
[preferences setDefaultFontSize:16];
[preferences setDefaultFixedFontSize:13];
- [preferences setAntialiasedFontDilationEnabled:NO];
[preferences setMinimumFontSize:0];
[preferences setDefaultTextEncodingName:@"ISO-8859-1"];
[preferences setJavaEnabled:NO];
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (197381 => 197382)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-03-01 03:42:41 UTC (rev 197382)
@@ -630,7 +630,6 @@
WKPreferencesSetPageVisibilityBasedProcessSuppressionEnabled(preferences, false);
WKPreferencesSetOfflineWebApplicationCacheEnabled(preferences, true);
WKPreferencesSetFontSmoothingLevel(preferences, kWKFontSmoothingLevelNoSubpixelAntiAliasing);
- WKPreferencesSetAntialiasedFontDilationEnabled(preferences, false);
WKPreferencesSetXSSAuditorEnabled(preferences, false);
WKPreferencesSetWebAudioEnabled(preferences, true);
WKPreferencesSetMediaStreamEnabled(preferences, true);
