Diff
Modified: trunk/Source/WebCore/ChangeLog (181958 => 181959)
--- trunk/Source/WebCore/ChangeLog 2015-03-25 13:51:29 UTC (rev 181958)
+++ trunk/Source/WebCore/ChangeLog 2015-03-25 16:28:28 UTC (rev 181959)
@@ -1,3 +1,12 @@
+2015-03-25 David Hyatt <[email protected]>
+
+ Add a pref to enable the new block-inside-inline model
+ https://bugs.webkit.org/show_bug.cgi?id=143050
+
+ Reviewed by Sam Weinig.
+
+ * page/Settings.in:
+
2015-03-25 Dan Bernstein <[email protected]>
iOS Simulator build fix.
Modified: trunk/Source/WebCore/page/Settings.in (181958 => 181959)
--- trunk/Source/WebCore/page/Settings.in 2015-03-25 13:51:29 UTC (rev 181958)
+++ trunk/Source/WebCore/page/Settings.in 2015-03-25 16:28:28 UTC (rev 181959)
@@ -237,3 +237,6 @@
appleMailPaginationQuirkEnabled initial=false
attachmentElementEnabled initial=true, conditional=ATTACHMENT_ELEMENT
+
+newBlockInsideInlineModelEnabled initial=false, setNeedsStyleRecalcInAllFrames=1
+
Modified: trunk/Source/WebKit2/ChangeLog (181958 => 181959)
--- trunk/Source/WebKit2/ChangeLog 2015-03-25 13:51:29 UTC (rev 181958)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-25 16:28:28 UTC (rev 181959)
@@ -1,3 +1,18 @@
+2015-03-25 David Hyatt <[email protected]>
+
+ Add a pref to enable the new block-inside-inline model
+ https://bugs.webkit.org/show_bug.cgi?id=143050
+
+ Reviewed by Sam Weinig.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetNewBlockInsideInlineModelEnabled):
+ (WKPreferencesGetNewBlockInsideInlineModelEnabled):
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2015-03-25 Zan Dobersek <[email protected]>
[WK2] WebUserMediaClient::pageDestroyed() virtual method should be marked as override
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (181958 => 181959)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-03-25 13:51:29 UTC (rev 181958)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-03-25 16:28:28 UTC (rev 181959)
@@ -194,6 +194,7 @@
macro(ServiceControlsEnabled, serviceControlsEnabled, Bool, bool, false) \
macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, false) \
macro(LongMousePressEnabled, longMousePressEnabled, Bool, bool, false) \
+ macro(NewBlockInsideInlineModelEnabled, newBlockInsideInlineModelEnabled, Bool, bool, false) \
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
macro(IncrementalRenderingSuppressionTimeout, incrementalRenderingSuppressionTimeout, Double, double, 5) \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (181958 => 181959)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-03-25 13:51:29 UTC (rev 181958)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-03-25 16:28:28 UTC (rev 181959)
@@ -1187,6 +1187,16 @@
return toImpl(preferencesRef)->simpleLineLayoutDebugBordersEnabled();
}
+void WKPreferencesSetNewBlockInsideInlineModelEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setNewBlockInsideInlineModelEnabled(flag);
+}
+
+bool WKPreferencesGetNewBlockInsideInlineModelEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->newBlockInsideInlineModelEnabled();
+}
+
void WKPreferencesSetSubpixelCSSOMElementMetricsEnabled(WKPreferencesRef preferencesRef, bool flag)
{
toImpl(preferencesRef)->setSubpixelCSSOMElementMetricsEnabled(flag);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (181958 => 181959)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-03-25 13:51:29 UTC (rev 181958)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-03-25 16:28:28 UTC (rev 181959)
@@ -304,6 +304,10 @@
WK_EXPORT bool WKPreferencesGetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef);
// Defaults to false.
+WK_EXPORT void WKPreferencesSetNewBlockInsideInlineModelEnabled(WKPreferencesRef, bool);
+WK_EXPORT bool WKPreferencesGetNewBlockInsideInlineModelEnabled(WKPreferencesRef);
+
+// Defaults to false.
WK_EXPORT void WKPreferencesSetSubpixelCSSOMElementMetricsEnabled(WKPreferencesRef, bool);
WK_EXPORT bool WKPreferencesGetSubpixelCSSOMElementMetricsEnabled(WKPreferencesRef);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (181958 => 181959)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-03-25 13:51:29 UTC (rev 181958)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-03-25 16:28:28 UTC (rev 181959)
@@ -2812,7 +2812,9 @@
settings.setLowPowerVideoAudioBufferSizeEnabled(store.getBoolValueForKey(WebPreferencesKey::lowPowerVideoAudioBufferSizeEnabledKey()));
settings.setSimpleLineLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::simpleLineLayoutEnabledKey()));
settings.setSimpleLineLayoutDebugBordersEnabled(store.getBoolValueForKey(WebPreferencesKey::simpleLineLayoutDebugBordersEnabledKey()));
-
+
+ settings.setNewBlockInsideInlineModelEnabled(store.getBoolValueForKey(WebPreferencesKey::newBlockInsideInlineModelEnabledKey()));
+
settings.setSubpixelCSSOMElementMetricsEnabled(store.getBoolValueForKey(WebPreferencesKey::subpixelCSSOMElementMetricsEnabledKey()));
settings.setUseLegacyTextAlignPositionedElementBehavior(store.getBoolValueForKey(WebPreferencesKey::useLegacyTextAlignPositionedElementBehaviorKey()));
