Title: [275110] trunk/Tools
- Revision
- 275110
- Author
- [email protected]
- Date
- 2021-03-26 13:07:12 -0700 (Fri, 26 Mar 2021)
Log Message
[MiniBrowser] Remove redundant "Disable Simple Line Layout" menu item
https://bugs.webkit.org/show_bug.cgi?id=223812
Reviewed by Simon Fraser.
SLL was replaced by IFC integration a while ago.
* MiniBrowser/mac/SettingsController.h:
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController initWithMenu:]):
(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController toggleSimpleLineLayoutEnabled:]): Deleted.
(-[SettingsController simpleLineLayoutEnabled]): Deleted.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController didChangeSettings]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController didChangeSettings]):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (275109 => 275110)
--- trunk/Tools/ChangeLog 2021-03-26 20:05:48 UTC (rev 275109)
+++ trunk/Tools/ChangeLog 2021-03-26 20:07:12 UTC (rev 275110)
@@ -1,3 +1,24 @@
+2021-03-26 Zalan Bujtas <[email protected]>
+
+ [MiniBrowser] Remove redundant "Disable Simple Line Layout" menu item
+ https://bugs.webkit.org/show_bug.cgi?id=223812
+
+ Reviewed by Simon Fraser.
+
+ SLL was replaced by IFC integration a while ago.
+
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController initWithMenu:]):
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+ (-[SettingsController toggleSimpleLineLayoutEnabled:]): Deleted.
+ (-[SettingsController simpleLineLayoutEnabled]): Deleted.
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController didChangeSettings]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController didChangeSettings]):
+
2021-03-26 Kate Cheney <[email protected]>
Implement PCM SQLite changes based on spec review
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (275109 => 275110)
--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2021-03-26 20:05:48 UTC (rev 275109)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2021-03-26 20:07:12 UTC (rev 275110)
@@ -36,7 +36,6 @@
@property (nonatomic, readonly) BOOL useTransparentWindows;
@property (nonatomic, readonly) BOOL usePaginatedMode;
@property (nonatomic, readonly) BOOL layerBordersVisible;
-@property (nonatomic, readonly) BOOL simpleLineLayoutEnabled;
@property (nonatomic, readonly) BOOL legacyLineLayoutVisualCoverageEnabled;
@property (nonatomic, readonly) BOOL incrementalRenderingSuppressed;
@property (nonatomic, readonly) BOOL tiledScrollingIndicatorVisible;
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (275109 => 275110)
--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2021-03-26 20:05:48 UTC (rev 275109)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2021-03-26 20:07:12 UTC (rev 275110)
@@ -41,7 +41,6 @@
static NSString * const UseWebKit2ByDefaultPreferenceKey = @"UseWebKit2ByDefault";
static NSString * const CreateEditorByDefaultPreferenceKey = @"CreateEditorByDefault";
static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
-static NSString * const SimpleLineLayoutEnabledPreferenceKey = @"SimpleLineLayoutEnabled";
static NSString * const LegacyLineLayoutVisualCoverageEnabledPreferenceKey = @"LegacyLineLayoutVisualCoverageEnabled";
static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
static NSString * const ReserveSpaceForBannersPreferenceKey = @"ReserveSpaceForBanners";
@@ -99,7 +98,6 @@
NSArray *_onByDefaultPrefs_ = @[
UseWebKit2ByDefaultPreferenceKey,
AcceleratedDrawingEnabledPreferenceKey,
- SimpleLineLayoutEnabledPreferenceKey,
SubpixelAntialiasedLayerTextEnabledPreferenceKey,
LargeImageAsyncDecodingEnabledPreferenceKey,
AnimatedImageAsyncDecodingEnabledPreferenceKey,
@@ -161,7 +159,6 @@
[self _addItemWithTitle:@"Use Transparent Windows" action:@selector(toggleUseTransparentWindows:) indented:NO];
[self _addItemWithTitle:@"Use Paginated Mode" action:@selector(toggleUsePaginatedMode:) indented:NO];
[self _addItemWithTitle:@"Show Layer Borders" action:@selector(toggleShowLayerBorders:) indented:NO];
- [self _addItemWithTitle:@"Disable Simple Line Layout" action:@selector(toggleSimpleLineLayoutEnabled:) indented:NO];
[self _addItemWithTitle:@"Enable Legacy Line Layout Visual Coverage" action:@selector(toggleLegacyLineLayoutVisualCoverageEnabled:) indented:NO];
[self _addItemWithTitle:@"Suppress Incremental Rendering in New Windows" action:@selector(toggleIncrementalRenderingSuppressed:) indented:NO];
[self _addItemWithTitle:@"Enable Accelerated Drawing" action:@selector(toggleAcceleratedDrawingEnabled:) indented:NO];
@@ -357,8 +354,6 @@
[menuItem setState:[self usePaginatedMode] ? NSControlStateValueOn : NSControlStateValueOff];
else if (action == @selector(toggleShowLayerBorders:))
[menuItem setState:[self layerBordersVisible] ? NSControlStateValueOn : NSControlStateValueOff];
- else if (action == @selector(toggleSimpleLineLayoutEnabled:))
- [menuItem setState:[self simpleLineLayoutEnabled] ? NSControlStateValueOff : NSControlStateValueOn];
else if (action == @selector(toggleLegacyLineLayoutVisualCoverageEnabled:))
[menuItem setState:[self legacyLineLayoutVisualCoverageEnabled] ? NSControlStateValueOn : NSControlStateValueOff];
else if (action == @selector(toggleIncrementalRenderingSuppressed:))
@@ -526,16 +521,6 @@
return [[NSUserDefaults standardUserDefaults] boolForKey:LayerBordersVisiblePreferenceKey];
}
-- (void)toggleSimpleLineLayoutEnabled:(id)sender
-{
- [self _toggleBooleanDefault:SimpleLineLayoutEnabledPreferenceKey];
-}
-
-- (BOOL)simpleLineLayoutEnabled
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:SimpleLineLayoutEnabledPreferenceKey];
-}
-
- (void)toggleLegacyLineLayoutVisualCoverageEnabled:(id)sender
{
[self _toggleBooleanDefault:LegacyLineLayoutVisualCoverageEnabledPreferenceKey];
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (275109 => 275110)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2021-03-26 20:05:48 UTC (rev 275109)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2021-03-26 20:07:12 UTC (rev 275110)
@@ -325,7 +325,6 @@
SettingsController *settings = [[NSApplication sharedApplication] browserAppDelegate].settingsController;
[[WebPreferences standardPreferences] setShowDebugBorders:settings.layerBordersVisible];
- [[WebPreferences standardPreferences] setSimpleLineLayoutEnabled:settings.simpleLineLayoutEnabled];
[[WebPreferences standardPreferences] setLegacyLineLayoutVisualCoverageEnabled:settings.legacyLineLayoutVisualCoverageEnabled];
[[WebPreferences standardPreferences] setShowRepaintCounter:settings.layerBordersVisible];
[[WebPreferences standardPreferences] setSuppressesIncrementalRendering:settings.incrementalRenderingSuppressed];
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (275109 => 275110)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2021-03-26 20:05:48 UTC (rev 275109)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2021-03-26 20:07:12 UTC (rev 275110)
@@ -471,7 +471,6 @@
preferences._tiledScrollingIndicatorVisible = settings.tiledScrollingIndicatorVisible;
preferences._compositingBordersVisible = settings.layerBordersVisible;
preferences._compositingRepaintCountersVisible = settings.layerBordersVisible;
- preferences._simpleLineLayoutEnabled = settings.simpleLineLayoutEnabled;
preferences._legacyLineLayoutVisualCoverageEnabled = settings.legacyLineLayoutVisualCoverageEnabled;
preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled;
preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
