Diff
Modified: trunk/Source/WebCore/ChangeLog (177497 => 177498)
--- trunk/Source/WebCore/ChangeLog 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebCore/ChangeLog 2014-12-18 16:33:56 UTC (rev 177498)
@@ -1,3 +1,18 @@
+2014-12-18 Antti Koivisto <[email protected]>
+
+ Remove alwaysUseBaselineOfPrimaryFont setting
+ https://bugs.webkit.org/show_bug.cgi?id=139770
+
+ Reviewed by Anders Carlsson.
+
+ "FIXME: This is unneeded and should be removed."
+
+ This iOS-only setting has no clients anymore.
+
+ * page/Settings.in:
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::ascentAndDescentForBox):
+
2014-12-18 Radu Stavila <[email protected]>
[SVG Masking] Enable the use of <mask> elements for -webkit-mask-image
Modified: trunk/Source/WebCore/page/Settings.in (177497 => 177498)
--- trunk/Source/WebCore/page/Settings.in 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebCore/page/Settings.in 2014-12-18 16:33:56 UTC (rev 177498)
@@ -220,9 +220,6 @@
alwaysUseAcceleratedOverflowScroll initial=false
imageControlsEnabled initial=false, conditional=SERVICE_CONTROLS
-# FIXME: This is unneeded and should be removed.
-alwaysUseBaselineOfPrimaryFont initial=false
-
enableInheritURIQueryComponent initial=false
aggressiveTileRetentionEnabled initial=false
Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (177497 => 177498)
--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2014-12-18 16:33:56 UTC (rev 177498)
@@ -900,11 +900,7 @@
bool setUsedFontWithLeading = false;
const RenderStyle& boxLineStyle = box.lineStyle();
-#if PLATFORM(IOS)
- if (usedFonts && !usedFonts->isEmpty() && (includeFont || (boxLineStyle.lineHeight().isNegative() && includeLeading)) && !box.renderer().document().settings()->alwaysUseBaselineOfPrimaryFont()) {
-#else
if (usedFonts && !usedFonts->isEmpty() && (includeFont || (boxLineStyle.lineHeight().isNegative() && includeLeading))) {
-#endif
usedFonts->append(boxLineStyle.font().primaryFont());
for (size_t i = 0; i < usedFonts->size(); ++i) {
const FontMetrics& fontMetrics = usedFonts->at(i)->fontMetrics();
Modified: trunk/Source/WebKit/mac/ChangeLog (177497 => 177498)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-18 16:33:56 UTC (rev 177498)
@@ -1,3 +1,19 @@
+2014-12-18 Antti Koivisto <[email protected]>
+
+ Remove alwaysUseBaselineOfPrimaryFont setting
+ https://bugs.webkit.org/show_bug.cgi?id=139770
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences _setAlwaysUseBaselineOfPrimaryFont:]): Deleted.
+ (-[WebPreferences _alwaysUseBaselineOfPrimaryFont]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+ (-[WebView _preferencesChanged:]):
+
2014-12-17 Andreas Kling <[email protected]>
Ref-ify Range::create().
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (177497 => 177498)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-12-18 16:33:56 UTC (rev 177498)
@@ -177,7 +177,6 @@
#if TARGET_OS_IPHONE
#define WebKitStandalonePreferenceKey @"WebKitStandalonePreferenceKey"
#define WebKitTelephoneParsingEnabledPreferenceKey @"WebKitTelephoneParsingEnabledPreferenceKey"
-#define WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey @"WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey"
#define WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey @"WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey"
#define WebKitAlwaysRequestGeolocationPermissionPreferenceKey @"WebKitAlwaysRequestGeolocationPermission"
#define WebKitLayoutIntervalPreferenceKey @"WebKitLayoutIntervalPreferenceKey"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (177497 => 177498)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-12-18 16:33:56 UTC (rev 177498)
@@ -1458,16 +1458,6 @@
return [self _floatValueForKey:WebKitMaxParseDurationPreferenceKey];
}
-- (void)_setAlwaysUseBaselineOfPrimaryFont:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey];
-}
-
-- (BOOL)_alwaysUseBaselineOfPrimaryFont
-{
- return [self _boolValueForKey:WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey];
-}
-
- (void)_setAllowMultiElementImplicitFormSubmission:(BOOL)flag
{
[self _setBoolValue:flag forKey:WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (177497 => 177498)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-12-18 16:33:56 UTC (rev 177498)
@@ -293,8 +293,6 @@
- (void)_setStandalone:(BOOL)flag;
- (void)_setTelephoneNumberParsingEnabled:(BOOL)flag;
- (BOOL)_telephoneNumberParsingEnabled;
-- (void)_setAlwaysUseBaselineOfPrimaryFont:(BOOL)flag;
-- (BOOL)_alwaysUseBaselineOfPrimaryFont;
- (void)_setAllowMultiElementImplicitFormSubmission:(BOOL)flag;
- (BOOL)_allowMultiElementImplicitFormSubmission;
- (void)_setAlwaysRequestGeolocationPermission:(BOOL)flag;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177497 => 177498)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-18 16:33:56 UTC (rev 177498)
@@ -1220,9 +1220,6 @@
_private->page->settings().setAcceleratedDrawingEnabled([preferences acceleratedDrawingEnabled]);
_private->page->settings().setScreenFontSubstitutionEnabled(false);
- // FIXME: <rdar://problem/7394370> Always use primary font baseline in text field base line calculation, ignore fallback fonts.
- _private->page->settings().setAlwaysUseBaselineOfPrimaryFont([preferences _alwaysUseBaselineOfPrimaryFont]);
-
_private->page->settings().setFontFallbackPrefersPictographs(true);
_private->page->settings().setPictographFontFamily("AppleColorEmoji");
@@ -2348,7 +2345,6 @@
#if PLATFORM(IOS)
settings.setStandalone([preferences _standalone]);
settings.setTelephoneNumberParsingEnabled([preferences _telephoneNumberParsingEnabled]);
- settings.setAlwaysUseBaselineOfPrimaryFont([preferences _alwaysUseBaselineOfPrimaryFont]);
settings.setAllowMultiElementImplicitSubmission([preferences _allowMultiElementImplicitFormSubmission]);
settings.setLayoutInterval(std::chrono::milliseconds([preferences _layoutInterval]));
settings.setMaxParseDuration([preferences _maxParseDuration]);
Modified: trunk/Source/WebKit2/ChangeLog (177497 => 177498)
--- trunk/Source/WebKit2/ChangeLog 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-18 16:33:56 UTC (rev 177498)
@@ -1,3 +1,14 @@
+2014-12-18 Antti Koivisto <[email protected]>
+
+ Remove alwaysUseBaselineOfPrimaryFont setting
+ https://bugs.webkit.org/show_bug.cgi?id=139770
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2014-12-18 Adrian Perez de Castro <[email protected]>
[GTK] Implement webkit_web_view_is_playing_audio()
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (177497 => 177498)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-12-18 16:33:56 UTC (rev 177498)
@@ -197,7 +197,6 @@
macro(ShouldConvertPositionStyleOnCopy, shouldConvertPositionStyleOnCopy, Bool, bool, false) \
macro(Standalone, standalone, Bool, bool, false) \
macro(TelephoneNumberParsingEnabled, telephoneNumberParsingEnabled, Bool, bool, false) \
- macro(AlwaysUseBaselineOfPrimaryFont, alwaysUseBaselineOfPrimaryFont, Bool, bool, false) \
macro(AllowMultiElementImplicitSubmission, allowMultiElementImplicitSubmission, Bool, bool, false) \
macro(AlwaysUseAcceleratedOverflowScroll, alwaysUseAcceleratedOverflowScroll, Bool, bool, false) \
macro(PasswordEchoEnabled, passwordEchoEnabled, Bool, bool, DEFAULT_PASSWORD_ECHO_ENABLED) \
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (177497 => 177498)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-12-18 15:30:00 UTC (rev 177497)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-12-18 16:33:56 UTC (rev 177498)
@@ -2874,7 +2874,6 @@
settings.setStandalone(store.getBoolValueForKey(WebPreferencesKey::standaloneKey()));
settings.setTelephoneNumberParsingEnabled(store.getBoolValueForKey(WebPreferencesKey::telephoneNumberParsingEnabledKey()));
- settings.setAlwaysUseBaselineOfPrimaryFont(store.getBoolValueForKey(WebPreferencesKey::alwaysUseBaselineOfPrimaryFontKey()));
settings.setAllowMultiElementImplicitSubmission(store.getBoolValueForKey(WebPreferencesKey::allowMultiElementImplicitSubmissionKey()));
settings.setAlwaysUseAcceleratedOverflowScroll(store.getBoolValueForKey(WebPreferencesKey::alwaysUseAcceleratedOverflowScrollKey()));
