Changeset 211135 in webkit


Ignore:
Timestamp:
Jan 24, 2017 9:02:56 PM (7 years ago)
Author:
Alan Bujtas
Message:

Add simple line layout toggle to MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=167405

Reviewed by Andreas Kling.

Source/WebKit/mac:

  • WebView/WebPreferenceKeysPrivate.h:
  • WebView/WebPreferences.mm:

(+[WebPreferences initialize]):
(-[WebPreferences simpleLineLayoutEnabled]):
(-[WebPreferences setSimpleLineLayoutEnabled:]):

  • WebView/WebPreferencesPrivate.h:
  • WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Source/WebKit2:

  • UIProcess/API/Cocoa/WKPreferences.mm:

(-[WKPreferences _simpleLineLayoutEnabled]):
(-[WKPreferences _setSimpleLineLayoutEnabled:]):

  • UIProcess/API/Cocoa/WKPreferencesPrivate.h:

Tools:

  • MiniBrowser/mac/SettingsController.h:
  • MiniBrowser/mac/SettingsController.m:

(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController toggleSimpleLineLayoutEnabled:]):
(-[SettingsController simpleLineLayoutEnabled]):

  • MiniBrowser/mac/WK1BrowserWindowController.m:

(-[WK1BrowserWindowController didChangeSettings]):

  • MiniBrowser/mac/WK2BrowserWindowController.m:

(-[WK2BrowserWindowController didChangeSettings]):

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/mac/ChangeLog

    r211133 r211135  
     12017-01-24  Zalan Bujtas  <zalan@apple.com>
     2
     3        Add simple line layout toggle to MiniBrowser
     4        https://bugs.webkit.org/show_bug.cgi?id=167405
     5
     6        Reviewed by Andreas Kling.
     7
     8        * WebView/WebPreferenceKeysPrivate.h:
     9        * WebView/WebPreferences.mm:
     10        (+[WebPreferences initialize]):
     11        (-[WebPreferences simpleLineLayoutEnabled]):
     12        (-[WebPreferences setSimpleLineLayoutEnabled:]):
     13        * WebView/WebPreferencesPrivate.h:
     14        * WebView/WebView.mm:
     15        (-[WebView _preferencesChanged:]):
     16
    1172017-01-24  Joseph Pecoraro  <pecoraro@apple.com>
    218
  • trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

    r210949 r211135  
    106106#define WebKitAcceleratedCompositingEnabledPreferenceKey @"WebKitAcceleratedCompositingEnabled"
    107107#define WebKitShowDebugBordersPreferenceKey @"WebKitShowDebugBorders"
     108#define WebKitSimpleLineLayoutEnabledPreferenceKey @"WebKitSimpleLineLayoutEnabled"
    108109#define WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey @"WebKitSimpleLineLayoutDebugBordersEnabled"
    109110#define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter"
  • trunk/Source/WebKit/mac/WebView/WebPreferences.mm

    r210959 r211135  
    501501#endif
    502502        [NSNumber numberWithBool:NO],   WebKitShowDebugBordersPreferenceKey,
     503        [NSNumber numberWithBool:YES],  WebKitSimpleLineLayoutEnabledPreferenceKey,
    503504        [NSNumber numberWithBool:NO],   WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey,
    504505        [NSNumber numberWithBool:NO],   WebKitShowRepaintCounterPreferenceKey,
     
    19611962}
    19621963
     1964- (BOOL)simpleLineLayoutEnabled
     1965{
     1966    return [self _boolValueForKey:WebKitSimpleLineLayoutEnabledPreferenceKey];
     1967}
     1968
     1969- (void)setSimpleLineLayoutEnabled:(BOOL)enabled
     1970{
     1971    [self _setBoolValue:enabled forKey:WebKitSimpleLineLayoutEnabledPreferenceKey];
     1972}
     1973
    19631974- (BOOL)simpleLineLayoutDebugBordersEnabled
    19641975{
  • trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

    r210949 r211135  
    228228- (void)setShowDebugBorders:(BOOL)show;
    229229
     230- (BOOL)simpleLineLayoutEnabled;
     231- (void)setSimpleLineLayoutEnabled:(BOOL)enabled;
     232
    230233- (BOOL)simpleLineLayoutDebugBordersEnabled;
    231234- (void)setSimpleLineLayoutDebugBordersEnabled:(BOOL)enabled;
  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r211036 r211135  
    26822682    settings.setCanvasUsesAcceleratedDrawing([preferences canvasUsesAcceleratedDrawing]);
    26832683    settings.setShowDebugBorders([preferences showDebugBorders]);
     2684    settings.setSimpleLineLayoutEnabled([preferences simpleLineLayoutEnabled]);
    26842685    settings.setSimpleLineLayoutDebugBordersEnabled([preferences simpleLineLayoutDebugBordersEnabled]);
    26852686    settings.setShowRepaintCounter([preferences showRepaintCounter]);
  • trunk/Source/WebKit2/ChangeLog

    r211133 r211135  
     12017-01-24  Zalan Bujtas  <zalan@apple.com>
     2
     3        Add simple line layout toggle to MiniBrowser
     4        https://bugs.webkit.org/show_bug.cgi?id=167405
     5
     6        Reviewed by Andreas Kling.
     7
     8        * UIProcess/API/Cocoa/WKPreferences.mm:
     9        (-[WKPreferences _simpleLineLayoutEnabled]):
     10        (-[WKPreferences _setSimpleLineLayoutEnabled:]):
     11        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
     12
    1132017-01-24  Joseph Pecoraro  <pecoraro@apple.com>
    214
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm

    r210103 r211135  
    286286}
    287287
     288- (BOOL)_simpleLineLayoutEnabled
     289{
     290    return _preferences->simpleLineLayoutEnabled();
     291}
     292
     293- (void)_setSimpleLineLayoutEnabled:(BOOL)simpleLineLayoutEnabled
     294{
     295    _preferences->setSimpleLineLayoutEnabled(simpleLineLayoutEnabled);
     296}
     297
    288298- (BOOL)_simpleLineLayoutDebugBordersEnabled
    289299{
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h

    r210103 r211135  
    6060@property (nonatomic, setter=_setResourceUsageOverlayVisible:) BOOL _resourceUsageOverlayVisible WK_API_AVAILABLE(macosx(10.12), ios(10.0));
    6161@property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     62@property (nonatomic, setter=_setSimpleLineLayoutEnabled:) BOOL _simpleLineLayoutEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
    6263@property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    6364@property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
  • trunk/Tools/ChangeLog

    r211134 r211135  
     12017-01-24  Zalan Bujtas  <zalan@apple.com>
     2
     3        Add simple line layout toggle to MiniBrowser
     4        https://bugs.webkit.org/show_bug.cgi?id=167405
     5
     6        Reviewed by Andreas Kling.
     7
     8        * MiniBrowser/mac/SettingsController.h:
     9        * MiniBrowser/mac/SettingsController.m:
     10        (-[SettingsController _populateMenu]):
     11        (-[SettingsController validateMenuItem:]):
     12        (-[SettingsController toggleSimpleLineLayoutEnabled:]):
     13        (-[SettingsController simpleLineLayoutEnabled]):
     14        * MiniBrowser/mac/WK1BrowserWindowController.m:
     15        (-[WK1BrowserWindowController didChangeSettings]):
     16        * MiniBrowser/mac/WK2BrowserWindowController.m:
     17        (-[WK2BrowserWindowController didChangeSettings]):
     18
    1192017-01-24  Joseph Pecoraro  <pecoraro@apple.com>
    220
  • trunk/Tools/MiniBrowser/mac/SettingsController.h

    r210494 r211135  
    3939@property (nonatomic, readonly) BOOL usePaginatedMode;
    4040@property (nonatomic, readonly) BOOL layerBordersVisible;
     41@property (nonatomic, readonly) BOOL simpleLineLayoutEnabled;
    4142@property (nonatomic, readonly) BOOL simpleLineLayoutDebugBordersEnabled;
    4243@property (nonatomic, readonly) BOOL incrementalRenderingSuppressed;
  • trunk/Tools/MiniBrowser/mac/SettingsController.m

    r210966 r211135  
    4040static NSString * const CreateEditorByDefaultPreferenceKey = @"CreateEditorByDefault";
    4141static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
     42static NSString * const SimpleLineLayoutEnabledPreferenceKey = @"SimpleLineLayoutEnabled";
    4243static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
    4344static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
     
    129130    [self _addItemWithTitle:@"Use Paginated Mode" action:@selector(toggleUsePaginatedMode:) indented:NO];
    130131    [self _addItemWithTitle:@"Show Layer Borders" action:@selector(toggleShowLayerBorders:) indented:NO];
     132    [self _addItemWithTitle:@"Disable Simple Line Layout" action:@selector(toggleSimpleLineLayoutEnabled:) indented:NO];
    131133    [self _addItemWithTitle:@"Show Simple Line Layout Borders" action:@selector(toggleSimpleLineLayoutDebugBordersEnabled:) indented:NO];
    132134    [self _addItemWithTitle:@"Suppress Incremental Rendering in New Windows" action:@selector(toggleIncrementalRenderingSuppressed:) indented:NO];
     
    206208    else if (action == @selector(toggleShowLayerBorders:))
    207209        [menuItem setState:[self layerBordersVisible] ? NSOnState : NSOffState];
     210    else if (action == @selector(toggleSimpleLineLayoutEnabled:))
     211        [menuItem setState:[self simpleLineLayoutEnabled] ? NSOffState : NSOnState];
    208212    else if (action == @selector(toggleSimpleLineLayoutDebugBordersEnabled:))
    209213        [menuItem setState:[self simpleLineLayoutDebugBordersEnabled] ? NSOnState : NSOffState];
     
    351355}
    352356
     357- (void)toggleSimpleLineLayoutEnabled:(id)sender
     358{
     359    [self _toggleBooleanDefault:SimpleLineLayoutEnabledPreferenceKey];
     360}
     361
     362- (BOOL)simpleLineLayoutEnabled
     363{
     364    return [[NSUserDefaults standardUserDefaults] boolForKey:SimpleLineLayoutEnabledPreferenceKey];
     365}
     366
    353367- (void)toggleSimpleLineLayoutDebugBordersEnabled:(id)sender
    354368{
  • trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m

    r210484 r211135  
    265265    [[WebPreferences standardPreferences] setSubpixelCSSOMElementMetricsEnabled:settings.subPixelCSSOMMetricsEnabled];
    266266    [[WebPreferences standardPreferences] setShowDebugBorders:settings.layerBordersVisible];
     267    [[WebPreferences standardPreferences] setSimpleLineLayoutEnabled:settings.simpleLineLayoutEnabled];
    267268    [[WebPreferences standardPreferences] setSimpleLineLayoutDebugBordersEnabled:settings.simpleLineLayoutDebugBordersEnabled];
    268269    [[WebPreferences standardPreferences] setShowRepaintCounter:settings.layerBordersVisible];
  • trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

    r210484 r211135  
    371371    preferences._compositingBordersVisible = settings.layerBordersVisible;
    372372    preferences._compositingRepaintCountersVisible = settings.layerBordersVisible;
     373    preferences._simpleLineLayoutEnabled = settings.simpleLineLayoutEnabled;
    373374    preferences._simpleLineLayoutDebugBordersEnabled = settings.simpleLineLayoutDebugBordersEnabled;
    374375    preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled;
Note: See TracChangeset for help on using the changeset viewer.