Diff
Modified: trunk/Source/WebCore/ChangeLog (110886 => 110887)
--- trunk/Source/WebCore/ChangeLog 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebCore/ChangeLog 2012-03-15 21:30:18 UTC (rev 110887)
@@ -1,3 +1,18 @@
+2012-03-15 David Hyatt <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=81258
+
+ Add a preference for enabling the new multi-column layout code that will be based on regions.
+
+ Reviewed by Beth Dakin.
+
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/Settings.h:
+ (WebCore::Settings::setRegionBasedColumnsEnabled):
+ (WebCore::Settings::regionBasedColumnsEnabled):
+ (Settings):
+
2012-03-15 Andreas Kling <[email protected]>
RenderStyle: Return Color objects by value instead of as const references.
Modified: trunk/Source/WebCore/page/Settings.cpp (110886 => 110887)
--- trunk/Source/WebCore/page/Settings.cpp 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-03-15 21:30:18 UTC (rev 110887)
@@ -175,6 +175,7 @@
, m_acceleratedFiltersEnabled(false)
, m_isCSSCustomFilterEnabled(false)
, m_cssRegionsEnabled(false)
+ , m_regionBasedColumnsEnabled(false)
// FIXME: This should really be disabled by default as it makes platforms that don't support the feature download files
// they can't use by. Leaving enabled for now to not change existing behavior.
, m_downloadableBinaryFontsEnabled(true)
Modified: trunk/Source/WebCore/page/Settings.h (110886 => 110887)
--- trunk/Source/WebCore/page/Settings.h 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebCore/page/Settings.h 2012-03-15 21:30:18 UTC (rev 110887)
@@ -319,6 +319,9 @@
void setCSSRegionsEnabled(bool enabled) { m_cssRegionsEnabled = enabled; }
bool cssRegionsEnabled() const { return m_cssRegionsEnabled; }
+ void setRegionBasedColumnsEnabled(bool enabled) { m_regionBasedColumnsEnabled = enabled; }
+ bool regionBasedColumnsEnabled() const { return m_regionBasedColumnsEnabled; }
+
void setAcceleratedCompositingEnabled(bool);
bool acceleratedCompositingEnabled() const { return m_acceleratedCompositingEnabled; }
@@ -625,6 +628,7 @@
bool m_acceleratedFiltersEnabled : 1;
bool m_isCSSCustomFilterEnabled : 1;
bool m_cssRegionsEnabled : 1;
+ bool m_regionBasedColumnsEnabled : 1;
bool m_downloadableBinaryFontsEnabled : 1;
bool m_xssAuditorEnabled : 1;
bool m_acceleratedCompositingEnabled : 1;
Modified: trunk/Source/WebKit/mac/ChangeLog (110886 => 110887)
--- trunk/Source/WebKit/mac/ChangeLog 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-03-15 21:30:18 UTC (rev 110887)
@@ -1,3 +1,20 @@
+2012-03-15 David Hyatt <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=81258
+
+ Add a preference for enabling the new multi-column layout code that will be based on regions.
+
+ Reviewed by Beth Dakin.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences setRegionBasedColumnsEnabled:]):
+ (-[WebPreferences regionBasedColumnsEnabled]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2012-03-15 Brady Eidson <[email protected]>
<rdar://problem/11036900> and https://bugs.webkit.org/show_bug.cgi?id=81079
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (110886 => 110887)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2012-03-15 21:30:18 UTC (rev 110887)
@@ -119,6 +119,7 @@
#define WebKitShouldDisplayTextDescriptionsPreferenceKey @"WebKitShouldDisplayTextDescriptions"
#define WebKitNotificationsEnabledKey @"WebKitNotificationsEnabled"
#define WebKitSuppressesIncrementalRenderingKey @"WebKitSuppressesIncrementalRendering"
+#define WebKitRegionBasedColumnsEnabledKey @"WebKitRegionBasedColumnsEnabled"
// These are private both because callers should be using the cover methods and because the
// cover methods themselves are private.
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (110886 => 110887)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2012-03-15 21:30:18 UTC (rev 110887)
@@ -390,6 +390,7 @@
[NSNumber numberWithBool:YES], WebKitMediaPlaybackAllowsInlinePreferenceKey,
[NSNumber numberWithBool:NO], WebKitWebAudioEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitSuppressesIncrementalRenderingKey,
+ [NSNumber numberWithBool:NO], WebKitRegionBasedColumnsEnabledKey,
[NSNumber numberWithBool:YES], WebKitBackspaceKeyNavigationEnabledKey,
[NSNumber numberWithBool:NO], WebKitShouldDisplaySubtitlesPreferenceKey,
[NSNumber numberWithBool:NO], WebKitShouldDisplayCaptionsPreferenceKey,
@@ -1664,6 +1665,16 @@
return [self _boolValueForKey:WebKitNotificationsEnabledKey];
}
+- (void)setRegionBasedColumnsEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitRegionBasedColumnsEnabledKey];
+}
+
+- (BOOL)regionBasedColumnsEnabled
+{
+ return [self _boolValueForKey:WebKitRegionBasedColumnsEnabledKey];
+}
+
@end
@implementation WebPreferences (WebInternal)
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (110886 => 110887)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2012-03-15 21:30:18 UTC (rev 110887)
@@ -274,6 +274,9 @@
- (void)setHixie76WebSocketProtocolEnabled:(BOOL)flag;
- (BOOL)isHixie76WebSocketProtocolEnabled;
+- (void)setRegionBasedColumnsEnabled:(BOOL)flag;
+- (BOOL)regionBasedColumnsEnabled;
+
// Deprecated. You should use [setS|s]uppressesIncrementalRendering in WebPreferences.h instead.
- (void)setSuppressIncrementalRendering:(BOOL)flag;
- (BOOL)suppressIncrementalRendering;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (110886 => 110887)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2012-03-15 21:30:18 UTC (rev 110887)
@@ -1505,6 +1505,7 @@
settings->setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
settings->setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
settings->setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
+ settings->setRegionBasedColumnsEnabled([preferences regionBasedColumnsEnabled]);
settings->setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
settings->setMockScrollbarsEnabled([preferences mockScrollbarsEnabled]);
Modified: trunk/Source/WebKit2/ChangeLog (110886 => 110887)
--- trunk/Source/WebKit2/ChangeLog 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-15 21:30:18 UTC (rev 110887)
@@ -1,3 +1,20 @@
+2012-03-15 David Hyatt <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=81258
+
+ Add a preference for enabling the new multi-column layout code that will be based on regions.
+
+ Reviewed by Beth Dakin.
+
+ * Shared/WebPreferencesStore.h:
+ (WebKit):
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetRegionBasedColumnsEnabled):
+ (WKPreferencesGetRegionBasedColumnsEnabled):
+ * UIProcess/API/C/WKPreferencesPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2012-03-14 Anders Carlsson <[email protected]>
Can't swipe to go back/forward when the current page is a PDF document
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (110886 => 110887)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2012-03-15 21:30:18 UTC (rev 110887)
@@ -74,6 +74,7 @@
macro(CSSCustomFilterEnabled, cssCustomFilterEnabled, Bool, bool, true) \
macro(WebGLEnabled, webGLEnabled, Bool, bool, false) \
macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, true) \
+ macro(RegionBasedColumnsEnabled, regionBasedColumnsEnabled, Bool, bool, false) \
macro(ForceFTPDirectoryListings, forceFTPDirectoryListings, Bool, bool, false) \
macro(TabsToLinks, tabsToLinks, Bool, bool, DEFAULT_WEBKIT_TABSTOLINKS_ENABLED) \
macro(DNSPrefetchingEnabled, dnsPrefetchingEnabled, Bool, bool, false) \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (110886 => 110887)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2012-03-15 21:30:18 UTC (rev 110887)
@@ -418,6 +418,16 @@
return toImpl(preferencesRef)->cssRegionsEnabled();
}
+void WKPreferencesSetRegionBasedColumnsEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setRegionBasedColumnsEnabled(flag);
+}
+
+bool WKPreferencesGetRegionBasedColumnsEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->regionBasedColumnsEnabled();
+}
+
void WKPreferencesSetNeedsSiteSpecificQuirks(WKPreferencesRef preferencesRef, bool flag)
{
toImpl(preferencesRef)->setNeedsSiteSpecificQuirks(flag);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (110886 => 110887)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2012-03-15 21:30:18 UTC (rev 110887)
@@ -95,6 +95,10 @@
WK_EXPORT void WKPreferencesSetCSSRegionsEnabled(WKPreferencesRef, bool flag);
WK_EXPORT bool WKPreferencesGetCSSRegionsEnabled(WKPreferencesRef);
+// Defaults to false
+WK_EXPORT void WKPreferencesSetRegionBasedColumnsEnabled(WKPreferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetRegionBasedColumnsEnabled(WKPreferencesRef);
+
// Defaults to false.
WK_EXPORT void WKPreferencesSetNeedsSiteSpecificQuirks(WKPreferencesRef, bool);
WK_EXPORT bool WKPreferencesGetNeedsSiteSpecificQuirks(WKPreferencesRef);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (110886 => 110887)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-03-15 21:24:32 UTC (rev 110886)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-03-15 21:30:18 UTC (rev 110887)
@@ -1904,6 +1904,7 @@
settings->setShowRepaintCounter(store.getBoolValueForKey(WebPreferencesKey::compositingRepaintCountersVisibleKey()));
settings->setCSSCustomFilterEnabled(store.getBoolValueForKey(WebPreferencesKey::cssCustomFilterEnabledKey()));
settings->setCSSRegionsEnabled(store.getBoolValueForKey(WebPreferencesKey::cssRegionsEnabledKey()));
+ settings->setRegionBasedColumnsEnabled(store.getBoolValueForKey(WebPreferencesKey::regionBasedColumnsEnabledKey()));
settings->setWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::webGLEnabledKey()));
settings->setMediaPlaybackRequiresUserGesture(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackRequiresUserGestureKey()));
settings->setMediaPlaybackAllowsInline(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsInlineKey()));
