Remove "region-based columns" prefs
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 May 2014 21:16:29 +0000 (21:16 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 May 2014 21:16:29 +0000 (21:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=133006
<rdar://problem/16945824>

Reviewed by Dave Hyatt.

Remove "region-based columns" prefs and related code, since this is only
way to render columns now.

Source/WebCore:
* page/Settings.in:

Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences setRegionBasedColumnsEnabled:]): Deleted.
(-[WebPreferences regionBasedColumnsEnabled]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Source/WebKit2:
* Shared/WebPreferencesStore.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetRegionBasedColumnsEnabled): Deleted.
(WKPreferencesGetRegionBasedColumnsEnabled): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168978 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
Source/WebCore/ChangeLog
Source/WebCore/page/Settings.in
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
Source/WebKit/mac/WebView/WebPreferences.mm
Source/WebKit/mac/WebView/WebPreferencesPrivate.h
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebPreferencesStore.h
Source/WebKit2/UIProcess/API/C/WKPreferences.cpp
Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h
Source/WebKit2/WebProcess/WebPage/WebPage.cpp

index 911d5ec..15b9532 100644 (file)
@@ -1,3 +1,16 @@
+2014-05-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove "region-based columns" prefs
+        https://bugs.webkit.org/show_bug.cgi?id=133006
+        <rdar://problem/16945824>
+
+        Reviewed by Dave Hyatt.
+
+        Remove "region-based columns" prefs and related code, since this is only
+        way to render columns now.
+
+        * page/Settings.in:
+
 2014-05-16  Antti Koivisto  <antti@apple.com>
 
         Link search area for touch events is too large in some cases
index e3c79b2..cfa0e74 100644 (file)
@@ -84,7 +84,6 @@ allowScriptsToCloseWindows initial=false
 canvasUsesAcceleratedDrawing initial=false
 acceleratedDrawingEnabled initial=false
 acceleratedFiltersEnabled initial=false
-regionBasedColumnsEnabled initial=true
 useLegacyTextAlignPositionedElementBehavior initial=false
 
 # FIXME: This should really be disabled by default as it makes platforms that don't support the feature download files
index 7cc9393..82c38e6 100644 (file)
@@ -1,3 +1,23 @@
+2014-05-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove "region-based columns" prefs
+        https://bugs.webkit.org/show_bug.cgi?id=133006
+        <rdar://problem/16945824>
+
+        Reviewed by Dave Hyatt.
+
+        Remove "region-based columns" prefs and related code, since this is only
+        way to render columns now.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences setRegionBasedColumnsEnabled:]): Deleted.
+        (-[WebPreferences regionBasedColumnsEnabled]): Deleted.
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
 2014-05-15  Brady Eidson  <beidson@apple.com>
 
         Crash in [WebSharingServicePickerController clear]
index cf871a9..559a5f7 100644 (file)
 #define WebKitAudioSessionCategoryOverride @"WebKitAudioSessionCategoryOverride"
 #define WebKitAVKitEnabled @"WebKitAVKitEnabled"
 #endif
-#define WebKitRegionBasedColumnsEnabledKey @"WebKitRegionBasedColumnsEnabled"
 #define WebKitShouldRespectImageOrientationKey @"WebKitShouldRespectImageOrientation"
 #define WebKitRequestAnimationFrameEnabledPreferenceKey @"WebKitRequestAnimationFrameEnabled"
 #define WebKitDiagnosticLoggingEnabledKey @"WebKitDiagnosticLoggingEnabled"
index 67e8829..c993f49 100644 (file)
@@ -507,7 +507,6 @@ public:
         [NSNumber numberWithBool:YES],  WebKitHyperlinkAuditingEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitUsePreHTML5ParserQuirksKey,
         [NSNumber numberWithBool:YES],  WebKitAVFoundationEnabledKey,
-        [NSNumber numberWithBool:YES],  WebKitRegionBasedColumnsEnabledKey,
 #if !PLATFORM(IOS)
         [NSNumber numberWithBool:NO],   WebKitMediaPlaybackRequiresUserGesturePreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitMediaPlaybackAllowsInlinePreferenceKey,
@@ -2378,16 +2377,6 @@ static NSString *classIBCreatorID = nil;
     return [self _boolValueForKey:WebKitNotificationsEnabledKey];
 }
 
-- (void)setRegionBasedColumnsEnabled:(BOOL)flag
-{
-    [self _setBoolValue:flag forKey:WebKitRegionBasedColumnsEnabledKey];
-}
-
-- (BOOL)regionBasedColumnsEnabled
-{
-    return [self _boolValueForKey:WebKitRegionBasedColumnsEnabledKey];
-}
-
 - (void)setShouldRespectImageOrientation:(BOOL)flag
 {
     [self _setBoolValue:flag forKey:WebKitShouldRespectImageOrientationKey];
index 3eb7ddf..f50c1fd 100644 (file)
@@ -368,9 +368,6 @@ extern NSString *WebPreferencesCacheModelChangedInternalNotification;
 - (void)setHixie76WebSocketProtocolEnabled:(BOOL)flag;
 - (BOOL)isHixie76WebSocketProtocolEnabled;
 
-- (void)setRegionBasedColumnsEnabled:(BOOL)flag;
-- (BOOL)regionBasedColumnsEnabled;
-
 #if TARGET_OS_IPHONE
 - (void)_invalidateCachedPreferences;
 - (void)_synchronizeWebStoragePolicyWithCookiePolicy;
index e5e08c4..cb84a69 100644 (file)
@@ -2290,7 +2290,6 @@ static bool needsSelfRetainWhileLoadingQuirk()
     settings.setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
     settings.setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
     settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
-    settings.setRegionBasedColumnsEnabled([preferences regionBasedColumnsEnabled]);
     settings.setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
     settings.setWantsBalancedSetDefersLoadingBehavior([preferences wantsBalancedSetDefersLoadingBehavior]);
     settings.setMockScrollbarsEnabled([preferences mockScrollbarsEnabled]);
index 24df6c1..afdf388 100644 (file)
@@ -1,3 +1,22 @@
+2014-05-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove "region-based columns" prefs
+        https://bugs.webkit.org/show_bug.cgi?id=133006
+        <rdar://problem/16945824>
+
+        Reviewed by Dave Hyatt.
+
+        Remove "region-based columns" prefs and related code, since this is only
+        way to render columns now.
+
+        * Shared/WebPreferencesStore.h:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetRegionBasedColumnsEnabled): Deleted.
+        (WKPreferencesGetRegionBasedColumnsEnabled): Deleted.
+        * UIProcess/API/C/WKPreferencesRefPrivate.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
 2014-05-16  Brent Fulgham  <bfulgham@apple.com>
 
         Work around bug in Silverlight
index fa08b00..e30c265 100644 (file)
@@ -133,7 +133,6 @@ namespace WebKit {
     macro(Accelerated2dCanvasEnabled, accelerated2dCanvasEnabled, Bool, bool, false) \
     macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, true) \
     macro(CSSCompositingEnabled, cssCompositingEnabled, Bool, bool, true) \
-    macro(RegionBasedColumnsEnabled, regionBasedColumnsEnabled, Bool, bool, true) \
     macro(ForceFTPDirectoryListings, forceFTPDirectoryListings, Bool, bool, false) \
     macro(TabsToLinks, tabsToLinks, Bool, bool, DEFAULT_WEBKIT_TABSTOLINKS_ENABLED) \
     macro(DNSPrefetchingEnabled, dnsPrefetchingEnabled, Bool, bool, false) \
index 152a9e4..98f6e04 100644 (file)
@@ -509,16 +509,6 @@ bool WKPreferencesGetCSSRegionsEnabled(WKPreferencesRef preferencesRef)
     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);
index 8ac6902..5ff3ddb 100644 (file)
@@ -108,10 +108,6 @@ WK_EXPORT bool WKPreferencesGetAccelerated2DCanvasEnabled(WKPreferencesRef);
 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);
index 81073eb..04a03d7 100644 (file)
@@ -2579,7 +2579,6 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     settings.setTemporaryTileCohortRetentionEnabled(store.getBoolValueForKey(WebPreferencesKey::temporaryTileCohortRetentionEnabledKey()));
     RuntimeEnabledFeatures::sharedFeatures().setCSSRegionsEnabled(store.getBoolValueForKey(WebPreferencesKey::cssRegionsEnabledKey()));
     RuntimeEnabledFeatures::sharedFeatures().setCSSCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::cssCompositingEnabledKey()));
-    settings.setRegionBasedColumnsEnabled(store.getBoolValueForKey(WebPreferencesKey::regionBasedColumnsEnabledKey()));
     settings.setWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::webGLEnabledKey()));
     settings.setMultithreadedWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::multithreadedWebGLEnabledKey()));
     settings.setForceSoftwareWebGLRendering(store.getBoolValueForKey(WebPreferencesKey::forceSoftwareWebGLRenderingKey()));