Changeset 269605 in webkit
- Timestamp:
- Nov 9, 2020 2:54:02 PM (3 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 1 deleted
- 39 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r269604 r269605 1 2020-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 1 14 2020-11-09 Truitt Savell <tsavell@apple.com> 2 15 -
trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content.html
r269603 r269605 11 11 <script> 12 12 if (window.internals) 13 internals.settings.set LegacyLineLayoutVisualCoverageEnabled(true);13 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 14 14 </script> 15 15 </head> -
trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range-expected.html
r269603 r269605 12 12 <script> 13 13 if (window.internals) { 14 internals.settings.set LegacyLineLayoutVisualCoverageEnabled(true);14 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 15 15 internals.settings.setSimpleLineLayoutEnabled(false); 16 16 } … … 18 18 </head> 19 19 <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> 21 21 </body> 22 22 </html> -
trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range.html
r269603 r269605 12 12 <script> 13 13 if (window.internals) { 14 internals.settings.set LegacyLineLayoutVisualCoverageEnabled(true);14 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 15 15 internals.settings.setSimpleLineLayoutEnabled(true); 16 16 } … … 18 18 </head> 19 19 <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> 21 21 </body> 22 22 </html> -
trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs-expected.html
r269603 r269605 10 10 </style> 11 11 <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); 16 14 </script> 17 15 </head> -
trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs.html
r269603 r269605 10 10 </style> 11 11 <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); 16 14 </script> 17 15 </head> -
trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html
r269603 r269605 2 2 <html> 3 3 <head> 4 <meta charset="utf-8">5 4 <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>18 5 </head> 19 <body> 20 <div>�</div> 21 <div>𝌆</div> 22 <div>�</div> 23 </body> 6 <body></body> 24 7 </html> -
trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html
r269603 r269605 12 12 <script> 13 13 if (window.internals) { 14 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 14 15 internals.settings.setSimpleLineLayoutEnabled(true); 15 internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);16 16 } 17 17 </script> -
trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path-expected.html
r269603 r269605 3 3 <head> 4 4 <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>23 5 </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> 34 7 </html> -
trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path.html
r269603 r269605 17 17 <script> 18 18 if (window.internals) { 19 internals.settings.set LegacyLineLayoutVisualCoverageEnabled(true);19 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 20 20 internals.settings.setSimpleLineLayoutEnabled(true); 21 21 } -
trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html
r269603 r269605 3 3 <head> 4 4 <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>23 5 </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> 28 7 </html> -
trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html
r269603 r269605 17 17 <script> 18 18 if (window.internals) { 19 internals.settings.set LegacyLineLayoutVisualCoverageEnabled(true);19 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 20 20 internals.settings.setSimpleLineLayoutEnabled(true); 21 21 } -
trunk/LayoutTests/fast/text/simple-lines-float-expected.html
r269603 r269605 2 2 <script> 3 3 if (window.internals) 4 internals.settings.set LegacyLineLayoutVisualCoverageEnabled(true);4 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 5 5 </script> 6 6 <div style="position:relative"> -
trunk/LayoutTests/fast/text/simple-lines-float.html
r269603 r269605 2 2 <script> 3 3 if (window.internals) 4 internals.settings.set LegacyLineLayoutVisualCoverageEnabled(true);4 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 5 5 </script> 6 6 <div style="float:left; border:1px solid blue; width:50px; height:200px"></div> -
trunk/LayoutTests/fast/text/simple-lines-hover-expected.html
r269603 r269605 3 3 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 4 4 </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 2 2 function test() { 3 3 if (window.internals) 4 internals.settings.set LegacyLineLayoutVisualCoverageEnabled(true);4 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 5 5 var target = document.getElementById("target"); 6 6 eventSender.mouseMoveTo(target.offsetLeft + 5, target.offsetTop + 5); … … 8 8 </script> 9 9 <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 5 5 <script> 6 6 if (window.internals) 7 internals.settings.set LegacyLineLayoutVisualCoverageEnabled(true);7 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 8 8 </script> 9 9 </head> -
trunk/LayoutTests/fast/text/simple-lines-multiple-renderers.html
r269603 r269605 5 5 <script> 6 6 if (window.internals) 7 internals.settings.set LegacyLineLayoutVisualCoverageEnabled(true);7 internals.settings.setSimpleLineLayoutDebugBordersEnabled(true); 8 8 </script> 9 9 </head> -
trunk/Source/WTF/ChangeLog
r269603 r269605 1 2020-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 1 14 2020-11-09 Zalan Bujtas <zalan@apple.com> 2 15 -
trunk/Source/WTF/Scripts/Preferences/WebPreferencesDebug.yaml
r269603 r269605 106 106 default: false 107 107 108 LegacyLineLayoutVisualCoverageEnabled:109 type: bool110 webcoreOnChange: setNeedsRecalcStyleInAllFrames111 defaultValue:112 WebKitLegacy:113 default: false114 WebKit:115 default: false116 WebCore:117 default: false118 119 108 LogsPageMessagesToSystemConsoleEnabled: 120 109 type: bool … … 145 134 condition: ENABLE(RESOURCE_USAGE) 146 135 webcoreOnChange: resourceUsageOverlayVisibleChanged 136 defaultValue: 137 WebKitLegacy: 138 default: false 139 WebKit: 140 default: false 141 WebCore: 142 default: false 143 144 SimpleLineLayoutDebugBordersEnabled: 145 type: bool 146 webcoreOnChange: setNeedsRecalcStyleInAllFrames 147 147 defaultValue: 148 148 WebKitLegacy: -
trunk/Source/WebCore/ChangeLog
r269603 r269605 1 2020-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 1 14 2020-11-09 Zalan Bujtas <zalan@apple.com> 2 15 -
trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp
r269603 r269605 404 404 textPainter.setFont(style.fontCascade()); 405 405 textPainter.setStyle(computeTextPaintStyle(flow().frame(), style, paintInfo)); 406 if (auto* debugShadow = debugTextShadow()) 407 textPainter.setShadow(debugShadow); 406 408 407 409 textPainter.setGlyphDisplayListIfNeeded(run, paintInfo, style.fontCascade(), paintInfo.context(), textRun); … … 465 467 } 466 468 469 ShadowData* 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 467 478 void LineLayout::releaseCaches(RenderView& view) 468 479 { -
trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h
r269603 r269605 107 107 const Layout::ContainerBox& rootLayoutBox() const; 108 108 Layout::ContainerBox& rootLayoutBox(); 109 ShadowData* debugTextShadow(); 109 110 void releaseInlineItemCache(); 110 111 -
trunk/Source/WebCore/rendering/InlineTextBox.cpp
r269603 r269605 1164 1164 } 1165 1165 textPainter.setEmphasisMark(emphasisMark, emphasisMarkOffset, combinedText()); 1166 if (auto* debugShadow = debugTextShadow())1167 textPainter.setShadow(debugShadow);1168 1166 1169 1167 TextRun textRun = createTextRun(); … … 1432 1430 } 1433 1431 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 1443 1432 ExpansionBehavior InlineTextBox::expansionBehavior() const 1444 1433 { -
trunk/Source/WebCore/rendering/InlineTextBox.h
r269603 r269605 200 200 const FontCascade& lineFont() const; 201 201 202 ShadowData* debugTextShadow();203 204 202 String text(bool ignoreCombinedText = false, bool ignoreHyphen = false) const; // The effective text for the run. 205 203 TextRun createTextRun(bool ignoreCombinedText = false, bool ignoreHyphen = false) const; -
trunk/Source/WebKit/ChangeLog
r269603 r269605 1 2020-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 1 14 2020-11-09 Zalan Bujtas <zalan@apple.com> 2 15 -
trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
r269603 r269605 1280 1280 } 1281 1281 1282 void WKPreferencesSet LegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef preferencesRef, bool flag)1283 { 1284 toImpl(preferencesRef)->set LegacyLineLayoutVisualCoverageEnabled(flag);1285 } 1286 1287 bool WKPreferencesGet LegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef preferencesRef)1288 { 1289 return toImpl(preferencesRef)-> legacyLineLayoutVisualCoverageEnabled();1282 void WKPreferencesSetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef preferencesRef, bool flag) 1283 { 1284 toImpl(preferencesRef)->setSimpleLineLayoutDebugBordersEnabled(flag); 1285 } 1286 1287 bool WKPreferencesGetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef preferencesRef) 1288 { 1289 return toImpl(preferencesRef)->simpleLineLayoutDebugBordersEnabled(); 1290 1290 } 1291 1291 -
trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h
r269603 r269605 318 318 319 319 // Defaults to false. 320 WK_EXPORT void WKPreferencesSet LegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef, bool);321 WK_EXPORT bool WKPreferencesGet LegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef);320 WK_EXPORT void WKPreferencesSetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef, bool); 321 WK_EXPORT bool WKPreferencesGetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef); 322 322 323 323 WK_EXPORT void WKPreferencesSetContentChangeObserverEnabled(WKPreferencesRef, bool); -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
r269603 r269605 306 306 } 307 307 308 - (BOOL)_ legacyLineLayoutVisualCoverageEnabled309 { 310 return _preferences-> legacyLineLayoutVisualCoverageEnabled();311 } 312 313 - (void)_set LegacyLineLayoutVisualCoverageEnabled:(BOOL)legacyLineLayoutVisualCoverageEnabled314 { 315 _preferences->set LegacyLineLayoutVisualCoverageEnabled(legacyLineLayoutVisualCoverageEnabled);308 - (BOOL)_simpleLineLayoutDebugBordersEnabled 309 { 310 return _preferences->simpleLineLayoutDebugBordersEnabled(); 311 } 312 313 - (void)_setSimpleLineLayoutDebugBordersEnabled:(BOOL)simpleLineLayoutDebugBordersEnabled 314 { 315 _preferences->setSimpleLineLayoutDebugBordersEnabled(simpleLineLayoutDebugBordersEnabled); 316 316 } 317 317 -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
r269603 r269605 70 70 @property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions WK_API_AVAILABLE(macos(10.11), ios(9.0)); 71 71 @property (nonatomic, setter=_setSimpleLineLayoutEnabled:) BOOL _simpleLineLayoutEnabled WK_API_AVAILABLE(macos(10.12), ios(10.0)); 72 @property (nonatomic, setter=_set LegacyLineLayoutVisualCoverageEnabled:) 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)); 73 73 @property (nonatomic, setter=_setContentChangeObserverEnabled:) BOOL _contentChangeObserverEnabled WK_API_AVAILABLE(macos(10.15), ios(13.0)); 74 74 @property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macos(10.12), ios(10.0)); -
trunk/Source/WebKitLegacy/mac/ChangeLog
r269603 r269605 1 2020-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 1 14 2020-11-09 Zalan Bujtas <zalan@apple.com> 2 15 -
trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h
r269603 r269605 110 110 #define WebKitSubpixelAntialiasedLayerTextEnabledPreferenceKey @"WebKitSubpixelAntialiasedLayerTextEnabled" 111 111 #define WebKitSimpleLineLayoutEnabledPreferenceKey @"WebKitSimpleLineLayoutEnabled" 112 #define WebKit LegacyLineLayoutVisualCoverageEnabledPreferenceKey @"WebKitLegacyLineLayoutVisualCoverageEnabled"112 #define WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey @"WebKitSimpleLineLayoutDebugBordersEnabled" 113 113 #define WebKitContentChangeObserverEnabledPreferenceKey @"WebKitContentChangeObserverEnabled" 114 114 #define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter" -
trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
r269603 r269605 1810 1810 } 1811 1811 1812 - (BOOL) legacyLineLayoutVisualCoverageEnabled1813 { 1814 return [self _boolValueForKey:WebKit LegacyLineLayoutVisualCoverageEnabledPreferenceKey];1815 } 1816 1817 - (void)set LegacyLineLayoutVisualCoverageEnabled:(BOOL)enabled1818 { 1819 [self _setBoolValue:enabled forKey:WebKit LegacyLineLayoutVisualCoverageEnabledPreferenceKey];1812 - (BOOL)simpleLineLayoutDebugBordersEnabled 1813 { 1814 return [self _boolValueForKey:WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey]; 1815 } 1816 1817 - (void)setSimpleLineLayoutDebugBordersEnabled:(BOOL)enabled 1818 { 1819 [self _setBoolValue:enabled forKey:WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey]; 1820 1820 } 1821 1821 -
trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h
r269603 r269605 153 153 @property (nonatomic) BOOL showDebugBorders; 154 154 @property (nonatomic) BOOL simpleLineLayoutEnabled; 155 @property (nonatomic) BOOL legacyLineLayoutVisualCoverageEnabled;155 @property (nonatomic) BOOL simpleLineLayoutDebugBordersEnabled; 156 156 @property (nonatomic) BOOL showRepaintCounter; 157 157 @property (nonatomic) BOOL webAudioEnabled; -
trunk/Tools/ChangeLog
r269603 r269605 1 2020-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 1 14 2020-11-09 Zalan Bujtas <zalan@apple.com> 2 15 -
trunk/Tools/MiniBrowser/mac/SettingsController.h
r269603 r269605 38 38 @property (nonatomic, readonly) BOOL layerBordersVisible; 39 39 @property (nonatomic, readonly) BOOL simpleLineLayoutEnabled; 40 @property (nonatomic, readonly) BOOL legacyLineLayoutVisualCoverageEnabled;40 @property (nonatomic, readonly) BOOL simpleLineLayoutDebugBordersEnabled; 41 41 @property (nonatomic, readonly) BOOL incrementalRenderingSuppressed; 42 42 @property (nonatomic, readonly) BOOL tiledScrollingIndicatorVisible; -
trunk/Tools/MiniBrowser/mac/SettingsController.m
r269603 r269605 43 43 static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible"; 44 44 static NSString * const SimpleLineLayoutEnabledPreferenceKey = @"SimpleLineLayoutEnabled"; 45 static NSString * const LegacyLineLayoutVisualCoverageEnabledPreferenceKey = @"LegacyLineLayoutVisualCoverageEnabled";45 static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled"; 46 46 static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible"; 47 47 static NSString * const ReserveSpaceForBannersPreferenceKey = @"ReserveSpaceForBanners"; … … 162 162 [self _addItemWithTitle:@"Show Layer Borders" action:@selector(toggleShowLayerBorders:) indented:NO]; 163 163 [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]; 165 165 [self _addItemWithTitle:@"Suppress Incremental Rendering in New Windows" action:@selector(toggleIncrementalRenderingSuppressed:) indented:NO]; 166 166 [self _addItemWithTitle:@"Enable Accelerated Drawing" action:@selector(toggleAcceleratedDrawingEnabled:) indented:NO]; … … 347 347 else if (action == @selector(toggleSimpleLineLayoutEnabled:)) 348 348 [menuItem setState:[self simpleLineLayoutEnabled] ? NSControlStateValueOff : NSControlStateValueOn]; 349 else if (action == @selector(toggle LegacyLineLayoutVisualCoverageEnabled:))350 [menuItem setState:[self legacyLineLayoutVisualCoverageEnabled] ? NSControlStateValueOn : NSControlStateValueOff];349 else if (action == @selector(toggleSimpleLineLayoutDebugBordersEnabled:)) 350 [menuItem setState:[self simpleLineLayoutDebugBordersEnabled] ? NSControlStateValueOn : NSControlStateValueOff]; 351 351 else if (action == @selector(toggleIncrementalRenderingSuppressed:)) 352 352 [menuItem setState:[self incrementalRenderingSuppressed] ? NSControlStateValueOn : NSControlStateValueOff]; … … 524 524 } 525 525 526 - (void)toggle LegacyLineLayoutVisualCoverageEnabled:(id)sender527 { 528 [self _toggleBooleanDefault: LegacyLineLayoutVisualCoverageEnabledPreferenceKey];529 } 530 531 - (BOOL) legacyLineLayoutVisualCoverageEnabled532 { 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]; 534 534 } 535 535 -
trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m
r269603 r269605 327 327 [[WebPreferences standardPreferences] setShowDebugBorders:settings.layerBordersVisible]; 328 328 [[WebPreferences standardPreferences] setSimpleLineLayoutEnabled:settings.simpleLineLayoutEnabled]; 329 [[WebPreferences standardPreferences] set LegacyLineLayoutVisualCoverageEnabled:settings.legacyLineLayoutVisualCoverageEnabled];329 [[WebPreferences standardPreferences] setSimpleLineLayoutDebugBordersEnabled:settings.simpleLineLayoutDebugBordersEnabled]; 330 330 [[WebPreferences standardPreferences] setShowRepaintCounter:settings.layerBordersVisible]; 331 331 [[WebPreferences standardPreferences] setSuppressesIncrementalRendering:settings.incrementalRenderingSuppressed]; -
trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m
r269603 r269605 473 473 preferences._compositingRepaintCountersVisible = settings.layerBordersVisible; 474 474 preferences._simpleLineLayoutEnabled = settings.simpleLineLayoutEnabled; 475 preferences._ legacyLineLayoutVisualCoverageEnabled = settings.legacyLineLayoutVisualCoverageEnabled;475 preferences._simpleLineLayoutDebugBordersEnabled = settings.simpleLineLayoutDebugBordersEnabled; 476 476 preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled; 477 477 preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
Note: See TracChangeset
for help on using the changeset viewer.