Changeset 269605 in webkit


Ignore:
Timestamp:
Nov 9, 2020 2:54:02 PM (3 years ago)
Author:
Alan Bujtas
Message:

Unreviewed, reverting r269603.

Needs Safari patch

Reverted changeset:

"Show legacy line layout visual coverage instead of "simple
line" layout."
https://bugs.webkit.org/show_bug.cgi?id=218695
https://trac.webkit.org/changeset/269603

Location:
trunk
Files:
1 added
1 deleted
39 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r269604 r269605  
     12020-11-09  Alan Bujtas  <zalan@apple.com>
     2
     3        Unreviewed, reverting r269603.
     4
     5        Needs Safari patch
     6
     7        Reverted changeset:
     8
     9        "Show legacy line layout visual coverage instead of "simple
     10        line" layout."
     11        https://bugs.webkit.org/show_bug.cgi?id=218695
     12        https://trac.webkit.org/changeset/269603
     13
    1142020-11-09  Truitt Savell  <tsavell@apple.com>
    215
  • trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content.html

    r269603 r269605  
    1111<script>
    1212  if (window.internals)
    13     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
     13    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    1414</script>
    1515</head>
  • trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range-expected.html

    r269603 r269605  
    1212<script>
    1313if (window.internals) {
    14     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
     14    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    1515    internals.settings.setSimpleLineLayoutEnabled(false);
    1616}
     
    1818</head>
    1919<body>
    20 <p style="font-family: Monaco;">THIS SHOULD HAVE legacy line layout coverage indicator.</p>
     20<p style="font-family: Monaco;">THIS SHOULD NOT HAVE GREEN simple line layout borders.</p>
    2121</body>
    2222</html>
  • trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range.html

    r269603 r269605  
    1212<script>
    1313if (window.internals) {
    14     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
     14    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    1515    internals.settings.setSimpleLineLayoutEnabled(true);
    1616}
     
    1818</head>
    1919<body>
    20 <p style="font-family: Monaco;">THIS SHOULD HAVE legacy line layout coverage indicator.</p>
     20<p style="font-family: Monaco;">THIS SHOULD NOT HAVE GREEN simple line layout borders.</p>
    2121</body>
    2222</html>
  • trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs-expected.html

    r269603 r269605  
    1010</style>
    1111<script>
    12   if (window.internals) {
    13     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
    14     internals.settings.setSimpleLineLayoutEnabled(false);
    15  }
     12  if (window.internals)
     13    internals.settings.setSimpleLineLayoutDebugBordersEnabled(false);
    1614</script>
    1715</head>
  • trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs.html

    r269603 r269605  
    1010</style>
    1111<script>
    12   if (window.internals) {
    13     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
    14     internals.settings.setSimpleLineLayoutEnabled(true);
    15  }
     12  if (window.internals)
     13    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    1614</script>
    1715</head>
  • trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html

    r269603 r269605  
    22<html>
    33<head>
    4 <meta charset="utf-8">
    54<title>This tests that we don't use simple line layout for surrogate pairs.</title>
    6 <style>
    7 div {
    8     color: white;
    9     font-family: Arial;
    10 }
    11 </style>
    12 <script>
    13 if (window.internals) {
    14     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
    15     internals.settings.setSimpleLineLayoutEnabled(false);
    16 }
    17 </script>
    185</head>
    19 <body>
    20 <div>&#xd800;</div>
    21 <div>&#x1D306;</div>
    22 <div>&#xdb7f;</div>
    23 </body>
     6<body></body>
    247</html>
  • trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html

    r269603 r269605  
    1212<script>
    1313if (window.internals) {
     14    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    1415    internals.settings.setSimpleLineLayoutEnabled(true);
    15     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
    1616}
    1717</script>
  • trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path-expected.html

    r269603 r269605  
    33<head>
    44<title>This tests that we don't try to use simple line layout for simple text but complex font path related properties.</title>
    5 <style>
    6 div {
    7     color: white;
    8 }
    9 .common-ligatures-disabled {
    10     font-variant-ligatures: no-common-ligatures;
    11 }
    12 
    13 .common-ligatures-enabled {
    14     font-variant-ligatures: common-ligatures;
    15 }
    16 </style>
    17 <script>
    18 if (window.internals) {
    19     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
    20     internals.settings.setSimpleLineLayoutEnabled(false);
    21 }
    22 </script>
    235</head>
    24 <body>
    25     <div>
    26         <div class="common-ligatures-disabled">file</div>
    27         <div class="common-ligatures-enabled">file</div>
    28     </div>
    29     <div style="text-rendering: optimizelegibility">
    30         <div class="common-ligatures-disabled">file</div>
    31         <div class="common-ligatures-enabled">file</div>
    32     </div>
    33 </body>
     6<body></body>
    347</html>
  • trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path.html

    r269603 r269605  
    1717<script>
    1818if (window.internals) {
    19     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
     19    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    2020    internals.settings.setSimpleLineLayoutEnabled(true);
    2121}
  • trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html

    r269603 r269605  
    33<head>
    44<title>This tests that simple line layout is disabled for text-underline-position: under</title>
    5 <style>
    6 div {
    7     color: white;
    8 }
    9 
    10 .first {
    11     overflow: hidden;
    12 }
    13 .second, .first {
    14         text-underline-position: under;
    15 }
    16 </style>
    17 <script>
    18 if (window.internals) {
    19     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
    20     internals.settings.setSimpleLineLayoutEnabled(false);
    21 }
    22 </script>
    235</head>
    24 <body>
    25 <div class=first>Pass if after selecting these 2 lines</div>
    26 <div class=second>this line is still visible</div>
    27 </body>
     6<body></body>
    287</html>
  • trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html

    r269603 r269605  
    1717<script>
    1818if (window.internals) {
    19     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
     19    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    2020    internals.settings.setSimpleLineLayoutEnabled(true);
    2121}
  • trunk/LayoutTests/fast/text/simple-lines-float-expected.html

    r269603 r269605  
    22<script>
    33if (window.internals)
    4     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
     4    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    55</script>
    66<div style="position:relative">
  • trunk/LayoutTests/fast/text/simple-lines-float.html

    r269603 r269605  
    22<script>
    33if (window.internals)
    4     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
     4    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    55</script>
    66<div style="float:left; border:1px solid blue; width:50px; height:200px"></div>
  • trunk/LayoutTests/fast/text/simple-lines-hover-expected.html

    r269603 r269605  
    33    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    44</script>
    5 <div>This text should not have legacy line layout visual indicator.</div>
     5<div id="target">This text should have border around it indicating it is in simple line layout mode</div>
  • trunk/LayoutTests/fast/text/simple-lines-hover.html

    r269603 r269605  
    22function test() {
    33    if (window.internals)
    4         internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
     4        internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    55    var target = document.getElementById("target");
    66    eventSender.mouseMoveTo(target.offsetLeft + 5, target.offsetTop + 5);
     
    88</script>
    99<body onload="test()">
    10 <div id="target">This text should not have legacy line layout visual indicator.</div>
     10<div id="target">This text should have border around it indicating it is in simple line layout mode</div>
  • trunk/LayoutTests/fast/text/simple-lines-multiple-renderers-expected.html

    r269603 r269605  
    55<script>
    66  if (window.internals)
    7     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
     7    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    88</script>
    99</head>
  • trunk/LayoutTests/fast/text/simple-lines-multiple-renderers.html

    r269603 r269605  
    55<script>
    66  if (window.internals)
    7     internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
     7    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
    88</script>
    99</head>
  • trunk/Source/WTF/ChangeLog

    r269603 r269605  
     12020-11-09  Alan Bujtas  <zalan@apple.com>
     2
     3        Unreviewed, reverting r269603.
     4
     5        Needs Safari patch
     6
     7        Reverted changeset:
     8
     9        "Show legacy line layout visual coverage instead of "simple
     10        line" layout."
     11        https://bugs.webkit.org/show_bug.cgi?id=218695
     12        https://trac.webkit.org/changeset/269603
     13
    1142020-11-09  Zalan Bujtas  <zalan@apple.com>
    215
  • trunk/Source/WTF/Scripts/Preferences/WebPreferencesDebug.yaml

    r269603 r269605  
    106106      default: false
    107107
    108 LegacyLineLayoutVisualCoverageEnabled:
    109   type: bool
    110   webcoreOnChange: setNeedsRecalcStyleInAllFrames
    111   defaultValue:
    112     WebKitLegacy:
    113       default: false
    114     WebKit:
    115       default: false
    116     WebCore:
    117       default: false
    118 
    119108LogsPageMessagesToSystemConsoleEnabled:
    120109  type: bool
     
    145134  condition: ENABLE(RESOURCE_USAGE)
    146135  webcoreOnChange: resourceUsageOverlayVisibleChanged
     136  defaultValue:
     137    WebKitLegacy:
     138      default: false
     139    WebKit:
     140      default: false
     141    WebCore:
     142      default: false
     143
     144SimpleLineLayoutDebugBordersEnabled:
     145  type: bool
     146  webcoreOnChange: setNeedsRecalcStyleInAllFrames
    147147  defaultValue:
    148148    WebKitLegacy:
  • trunk/Source/WebCore/ChangeLog

    r269603 r269605  
     12020-11-09  Alan Bujtas  <zalan@apple.com>
     2
     3        Unreviewed, reverting r269603.
     4
     5        Needs Safari patch
     6
     7        Reverted changeset:
     8
     9        "Show legacy line layout visual coverage instead of "simple
     10        line" layout."
     11        https://bugs.webkit.org/show_bug.cgi?id=218695
     12        https://trac.webkit.org/changeset/269603
     13
    1142020-11-09  Zalan Bujtas  <zalan@apple.com>
    215
  • trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp

    r269603 r269605  
    404404        textPainter.setFont(style.fontCascade());
    405405        textPainter.setStyle(computeTextPaintStyle(flow().frame(), style, paintInfo));
     406        if (auto* debugShadow = debugTextShadow())
     407            textPainter.setShadow(debugShadow);
    406408
    407409        textPainter.setGlyphDisplayListIfNeeded(run, paintInfo, style.fontCascade(), paintInfo.context(), textRun);
     
    465467}
    466468
     469ShadowData* LineLayout::debugTextShadow()
     470{
     471    if (!flow().settings().simpleLineLayoutDebugBordersEnabled())
     472        return nullptr;
     473
     474    static NeverDestroyed<ShadowData> debugTextShadow(IntPoint(0, 0), 10, 20, ShadowStyle::Normal, true, SRGBA<uint8_t> { 0, 0, 150, 150 });
     475    return &debugTextShadow.get();
     476}
     477
    467478void LineLayout::releaseCaches(RenderView& view)
    468479{
  • trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h

    r269603 r269605  
    107107    const Layout::ContainerBox& rootLayoutBox() const;
    108108    Layout::ContainerBox& rootLayoutBox();
     109    ShadowData* debugTextShadow();
    109110    void releaseInlineItemCache();
    110111
  • trunk/Source/WebCore/rendering/InlineTextBox.cpp

    r269603 r269605  
    11641164    }
    11651165    textPainter.setEmphasisMark(emphasisMark, emphasisMarkOffset, combinedText());
    1166     if (auto* debugShadow = debugTextShadow())
    1167         textPainter.setShadow(debugShadow);
    11681166
    11691167    TextRun textRun = createTextRun();
     
    14321430}
    14331431
    1434 ShadowData* InlineTextBox::debugTextShadow()
    1435 {
    1436     if (!renderer().settings().legacyLineLayoutVisualCoverageEnabled())
    1437         return nullptr;
    1438 
    1439     static NeverDestroyed<ShadowData> debugTextShadow(IntPoint(0, 0), 10, 20, ShadowStyle::Normal, true, SRGBA<uint8_t> { 150, 0, 0, 190 });
    1440     return &debugTextShadow.get();
    1441 }
    1442 
    14431432ExpansionBehavior InlineTextBox::expansionBehavior() const
    14441433{
  • trunk/Source/WebCore/rendering/InlineTextBox.h

    r269603 r269605  
    200200    const FontCascade& lineFont() const;
    201201
    202     ShadowData* debugTextShadow();
    203 
    204202    String text(bool ignoreCombinedText = false, bool ignoreHyphen = false) const; // The effective text for the run.
    205203    TextRun createTextRun(bool ignoreCombinedText = false, bool ignoreHyphen = false) const;
  • trunk/Source/WebKit/ChangeLog

    r269603 r269605  
     12020-11-09  Alan Bujtas  <zalan@apple.com>
     2
     3        Unreviewed, reverting r269603.
     4
     5        Needs Safari patch
     6
     7        Reverted changeset:
     8
     9        "Show legacy line layout visual coverage instead of "simple
     10        line" layout."
     11        https://bugs.webkit.org/show_bug.cgi?id=218695
     12        https://trac.webkit.org/changeset/269603
     13
    1142020-11-09  Zalan Bujtas  <zalan@apple.com>
    215
  • trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp

    r269603 r269605  
    12801280}
    12811281
    1282 void WKPreferencesSetLegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef preferencesRef, bool flag)
    1283 {
    1284     toImpl(preferencesRef)->setLegacyLineLayoutVisualCoverageEnabled(flag);
    1285 }
    1286 
    1287 bool WKPreferencesGetLegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef preferencesRef)
    1288 {
    1289     return toImpl(preferencesRef)->legacyLineLayoutVisualCoverageEnabled();
     1282void WKPreferencesSetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef preferencesRef, bool flag)
     1283{
     1284    toImpl(preferencesRef)->setSimpleLineLayoutDebugBordersEnabled(flag);
     1285}
     1286
     1287bool WKPreferencesGetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef preferencesRef)
     1288{
     1289    return toImpl(preferencesRef)->simpleLineLayoutDebugBordersEnabled();
    12901290}
    12911291
  • trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h

    r269603 r269605  
    318318
    319319// Defaults to false.
    320 WK_EXPORT void WKPreferencesSetLegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef, bool);
    321 WK_EXPORT bool WKPreferencesGetLegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef);
     320WK_EXPORT void WKPreferencesSetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef, bool);
     321WK_EXPORT bool WKPreferencesGetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef);
    322322
    323323WK_EXPORT void WKPreferencesSetContentChangeObserverEnabled(WKPreferencesRef, bool);
  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm

    r269603 r269605  
    306306}
    307307
    308 - (BOOL)_legacyLineLayoutVisualCoverageEnabled
    309 {
    310     return _preferences->legacyLineLayoutVisualCoverageEnabled();
    311 }
    312 
    313 - (void)_setLegacyLineLayoutVisualCoverageEnabled:(BOOL)legacyLineLayoutVisualCoverageEnabled
    314 {
    315     _preferences->setLegacyLineLayoutVisualCoverageEnabled(legacyLineLayoutVisualCoverageEnabled);
     308- (BOOL)_simpleLineLayoutDebugBordersEnabled
     309{
     310    return _preferences->simpleLineLayoutDebugBordersEnabled();
     311}
     312
     313- (void)_setSimpleLineLayoutDebugBordersEnabled:(BOOL)simpleLineLayoutDebugBordersEnabled
     314{
     315    _preferences->setSimpleLineLayoutDebugBordersEnabled(simpleLineLayoutDebugBordersEnabled);
    316316}
    317317
  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

    r269603 r269605  
    7070@property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions WK_API_AVAILABLE(macos(10.11), ios(9.0));
    7171@property (nonatomic, setter=_setSimpleLineLayoutEnabled:) BOOL _simpleLineLayoutEnabled WK_API_AVAILABLE(macos(10.12), ios(10.0));
    72 @property (nonatomic, setter=_setLegacyLineLayoutVisualCoverageEnabled:) BOOL _legacyLineLayoutVisualCoverageEnabled WK_API_AVAILABLE(macos(10.11), ios(9.0));
     72@property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_API_AVAILABLE(macos(10.11), ios(9.0));
    7373@property (nonatomic, setter=_setContentChangeObserverEnabled:) BOOL _contentChangeObserverEnabled WK_API_AVAILABLE(macos(10.15), ios(13.0));
    7474@property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macos(10.12), ios(10.0));
  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r269603 r269605  
     12020-11-09  Alan Bujtas  <zalan@apple.com>
     2
     3        Unreviewed, reverting r269603.
     4
     5        Needs Safari patch
     6
     7        Reverted changeset:
     8
     9        "Show legacy line layout visual coverage instead of "simple
     10        line" layout."
     11        https://bugs.webkit.org/show_bug.cgi?id=218695
     12        https://trac.webkit.org/changeset/269603
     13
    1142020-11-09  Zalan Bujtas  <zalan@apple.com>
    215
  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h

    r269603 r269605  
    110110#define WebKitSubpixelAntialiasedLayerTextEnabledPreferenceKey @"WebKitSubpixelAntialiasedLayerTextEnabled"
    111111#define WebKitSimpleLineLayoutEnabledPreferenceKey @"WebKitSimpleLineLayoutEnabled"
    112 #define WebKitLegacyLineLayoutVisualCoverageEnabledPreferenceKey @"WebKitLegacyLineLayoutVisualCoverageEnabled"
     112#define WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey @"WebKitSimpleLineLayoutDebugBordersEnabled"
    113113#define WebKitContentChangeObserverEnabledPreferenceKey @"WebKitContentChangeObserverEnabled"
    114114#define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter"
  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm

    r269603 r269605  
    18101810}
    18111811
    1812 - (BOOL)legacyLineLayoutVisualCoverageEnabled
    1813 {
    1814     return [self _boolValueForKey:WebKitLegacyLineLayoutVisualCoverageEnabledPreferenceKey];
    1815 }
    1816 
    1817 - (void)setLegacyLineLayoutVisualCoverageEnabled:(BOOL)enabled
    1818 {
    1819     [self _setBoolValue:enabled forKey:WebKitLegacyLineLayoutVisualCoverageEnabledPreferenceKey];
     1812- (BOOL)simpleLineLayoutDebugBordersEnabled
     1813{
     1814    return [self _boolValueForKey:WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey];
     1815}
     1816
     1817- (void)setSimpleLineLayoutDebugBordersEnabled:(BOOL)enabled
     1818{
     1819    [self _setBoolValue:enabled forKey:WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey];
    18201820}
    18211821
  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h

    r269603 r269605  
    153153@property (nonatomic) BOOL showDebugBorders;
    154154@property (nonatomic) BOOL simpleLineLayoutEnabled;
    155 @property (nonatomic) BOOL legacyLineLayoutVisualCoverageEnabled;
     155@property (nonatomic) BOOL simpleLineLayoutDebugBordersEnabled;
    156156@property (nonatomic) BOOL showRepaintCounter;
    157157@property (nonatomic) BOOL webAudioEnabled;
  • trunk/Tools/ChangeLog

    r269603 r269605  
     12020-11-09  Alan Bujtas  <zalan@apple.com>
     2
     3        Unreviewed, reverting r269603.
     4
     5        Needs Safari patch
     6
     7        Reverted changeset:
     8
     9        "Show legacy line layout visual coverage instead of "simple
     10        line" layout."
     11        https://bugs.webkit.org/show_bug.cgi?id=218695
     12        https://trac.webkit.org/changeset/269603
     13
    1142020-11-09  Zalan Bujtas  <zalan@apple.com>
    215
  • trunk/Tools/MiniBrowser/mac/SettingsController.h

    r269603 r269605  
    3838@property (nonatomic, readonly) BOOL layerBordersVisible;
    3939@property (nonatomic, readonly) BOOL simpleLineLayoutEnabled;
    40 @property (nonatomic, readonly) BOOL legacyLineLayoutVisualCoverageEnabled;
     40@property (nonatomic, readonly) BOOL simpleLineLayoutDebugBordersEnabled;
    4141@property (nonatomic, readonly) BOOL incrementalRenderingSuppressed;
    4242@property (nonatomic, readonly) BOOL tiledScrollingIndicatorVisible;
  • trunk/Tools/MiniBrowser/mac/SettingsController.m

    r269603 r269605  
    4343static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
    4444static NSString * const SimpleLineLayoutEnabledPreferenceKey = @"SimpleLineLayoutEnabled";
    45 static NSString * const LegacyLineLayoutVisualCoverageEnabledPreferenceKey = @"LegacyLineLayoutVisualCoverageEnabled";
     45static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
    4646static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
    4747static NSString * const ReserveSpaceForBannersPreferenceKey = @"ReserveSpaceForBanners";
     
    162162    [self _addItemWithTitle:@"Show Layer Borders" action:@selector(toggleShowLayerBorders:) indented:NO];
    163163    [self _addItemWithTitle:@"Disable Simple Line Layout" action:@selector(toggleSimpleLineLayoutEnabled:) indented:NO];
    164     [self _addItemWithTitle:@"Enable Legacy Line Layout Visual Coverage" action:@selector(toggleLegacyLineLayoutVisualCoverageEnabled:) indented:NO];
     164    [self _addItemWithTitle:@"Show Simple Line Layout Borders" action:@selector(toggleSimpleLineLayoutDebugBordersEnabled:) indented:NO];
    165165    [self _addItemWithTitle:@"Suppress Incremental Rendering in New Windows" action:@selector(toggleIncrementalRenderingSuppressed:) indented:NO];
    166166    [self _addItemWithTitle:@"Enable Accelerated Drawing" action:@selector(toggleAcceleratedDrawingEnabled:) indented:NO];
     
    347347    else if (action == @selector(toggleSimpleLineLayoutEnabled:))
    348348        [menuItem setState:[self simpleLineLayoutEnabled] ? NSControlStateValueOff : NSControlStateValueOn];
    349     else if (action == @selector(toggleLegacyLineLayoutVisualCoverageEnabled:))
    350         [menuItem setState:[self legacyLineLayoutVisualCoverageEnabled] ? NSControlStateValueOn : NSControlStateValueOff];
     349    else if (action == @selector(toggleSimpleLineLayoutDebugBordersEnabled:))
     350        [menuItem setState:[self simpleLineLayoutDebugBordersEnabled] ? NSControlStateValueOn : NSControlStateValueOff];
    351351    else if (action == @selector(toggleIncrementalRenderingSuppressed:))
    352352        [menuItem setState:[self incrementalRenderingSuppressed] ? NSControlStateValueOn : NSControlStateValueOff];
     
    524524}
    525525
    526 - (void)toggleLegacyLineLayoutVisualCoverageEnabled:(id)sender
    527 {
    528     [self _toggleBooleanDefault:LegacyLineLayoutVisualCoverageEnabledPreferenceKey];
    529 }
    530 
    531 - (BOOL)legacyLineLayoutVisualCoverageEnabled
    532 {
    533     return [[NSUserDefaults standardUserDefaults] boolForKey:LegacyLineLayoutVisualCoverageEnabledPreferenceKey];
     526- (void)toggleSimpleLineLayoutDebugBordersEnabled:(id)sender
     527{
     528    [self _toggleBooleanDefault:SimpleLineLayoutDebugBordersEnabledPreferenceKey];
     529}
     530
     531- (BOOL)simpleLineLayoutDebugBordersEnabled
     532{
     533    return [[NSUserDefaults standardUserDefaults] boolForKey:SimpleLineLayoutDebugBordersEnabledPreferenceKey];
    534534}
    535535
  • trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m

    r269603 r269605  
    327327    [[WebPreferences standardPreferences] setShowDebugBorders:settings.layerBordersVisible];
    328328    [[WebPreferences standardPreferences] setSimpleLineLayoutEnabled:settings.simpleLineLayoutEnabled];
    329     [[WebPreferences standardPreferences] setLegacyLineLayoutVisualCoverageEnabled:settings.legacyLineLayoutVisualCoverageEnabled];
     329    [[WebPreferences standardPreferences] setSimpleLineLayoutDebugBordersEnabled:settings.simpleLineLayoutDebugBordersEnabled];
    330330    [[WebPreferences standardPreferences] setShowRepaintCounter:settings.layerBordersVisible];
    331331    [[WebPreferences standardPreferences] setSuppressesIncrementalRendering:settings.incrementalRenderingSuppressed];
  • trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

    r269603 r269605  
    473473    preferences._compositingRepaintCountersVisible = settings.layerBordersVisible;
    474474    preferences._simpleLineLayoutEnabled = settings.simpleLineLayoutEnabled;
    475     preferences._legacyLineLayoutVisualCoverageEnabled = settings.legacyLineLayoutVisualCoverageEnabled;
     475    preferences._simpleLineLayoutDebugBordersEnabled = settings.simpleLineLayoutDebugBordersEnabled;
    476476    preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled;
    477477    preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
Note: See TracChangeset for help on using the changeset viewer.