Changeset 185857 in webkit

Timestamp:

Jun 22, 2015, 6:59:05 PM (10 years ago)

Author:

Simon Fraser

Message:

Make it possible to enable incremental rendering suppression in MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=146223

Reviewed by Tim Horton.

Add a menu item to enable incremental rendering suppression to MiniBrowser.

For WK1, this just toggles a pref, and takes effect immediately.

For WK2, this is a WKConfiguration property, so only affects new web views.

Also remove a toolbar item connection to toggleUseMinimumViewSize: that caused
logging on launch.

• MiniBrowser/mac/AppDelegate.m:

(defaultConfiguration):

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

(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController toggleIncrementalRenderingSuppressed:]):
(-[SettingsController incrementalRenderingSuppressed]):

• MiniBrowser/mac/WK1BrowserWindowController.m:

(-[WK1BrowserWindowController didChangeSettings]):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/mac/AppDelegate.m (modified) (1 diff)
• MiniBrowser/mac/BrowserWindow.xib (modified) (1 diff)
• MiniBrowser/mac/SettingsController.h (modified) (1 diff)
• MiniBrowser/mac/SettingsController.m (modified) (4 diffs)
• MiniBrowser/mac/WK1BrowserWindowController.m (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-06-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Make it possible to enable incremental rendering suppression in MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=146223
+        
+        Reviewed by Tim Horton.
+
+        Add a menu item to enable incremental rendering suppression to MiniBrowser.
+        
+        For WK1, this just toggles a pref, and takes effect immediately.
+        
+        For WK2, this is a WKConfiguration property, so only affects new web views.
+        
+        Also remove a toolbar item connection to toggleUseMinimumViewSize: that caused
+        logging on launch.
+
+        * MiniBrowser/mac/AppDelegate.m:
+        (defaultConfiguration):
+        * MiniBrowser/mac/BrowserWindow.xib:
+        * MiniBrowser/mac/SettingsController.h:
+        * MiniBrowser/mac/SettingsController.m:
+        (-[SettingsController _populateMenu]):
+        (-[SettingsController validateMenuItem:]):
+        (-[SettingsController toggleIncrementalRenderingSuppressed:]):
+        (-[SettingsController incrementalRenderingSuppressed]):
+        * MiniBrowser/mac/WK1BrowserWindowController.m:
+        (-[WK1BrowserWindowController didChangeSettings]):
+
 2015-06-19  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Tools/MiniBrowser/mac/AppDelegate.m

@@ -83 +83 @@
     }
 
+    configuration.suppressesIncrementalRendering = [SettingsController shared].incrementalRenderingSuppressed;
     return configuration;
 }

trunk/Tools/MiniBrowser/mac/BrowserWindow.xib

@@ -101 +101 @@
                             </connections>
                         </button>
-                        <connections>
-                            <action selector="toggleUseMinimumViewSize:" target="-2" id="gZA-yS-7L4"/>
-                        </connections>
                     </toolbarItem>
                     <toolbarItem implicitItemIdentifier="6BDC61B7-F1A8-425A-A212-9CAC59C56385" label="Progress" paletteLabel="Progress" tag="-1" id="60">

trunk/Tools/MiniBrowser/mac/SettingsController.h

@@ -39 +39 @@
 @property (nonatomic, readonly) BOOL layerBordersVisible;
 @property (nonatomic, readonly) BOOL simpleLineLayoutDebugBordersEnabled;
+@property (nonatomic, readonly) BOOL incrementalRenderingSuppressed;
 @property (nonatomic, readonly) BOOL tiledScrollingIndicatorVisible;
 @property (nonatomic, readonly) BOOL nonFastScrollableRegionOverlayVisible;

trunk/Tools/MiniBrowser/mac/SettingsController.m

@@ -36 +36 @@
 static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
 static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
+static NSString * const IncrementalRenderingSuppressedPreferenceKey = @"IncrementalRenderingSuppressed";
 
 static NSString * const NonFastScrollableRegionOverlayVisiblePreferenceKey = @"NonFastScrollableRegionOverlayVisible";
@@ -105 +106 @@
     [self _addItemWithTitle:@"Show Layer Borders" action:@selector(toggleShowLayerBorders:) indented:NO];
     [self _addItemWithTitle:@"Show Simple Line Layout Borders" action:@selector(toggleSimpleLineLayoutDebugBordersEnabled:) indented:NO];
+    [self _addItemWithTitle:@"Suppress Incremental Rendering in New Windows" action:@selector(toggleIncrementalRenderingSuppressed:) indented:NO];
 
     [self _addHeaderWithTitle:@"WebKit2-only Settings"];
@@ -148 +150 @@
     else if (action == @selector(toggleSimpleLineLayoutDebugBordersEnabled:))
         [menuItem setState:[self simpleLineLayoutDebugBordersEnabled] ? NSOnState : NSOffState];
+    else if (action == @selector(toggleIncrementalRenderingSuppressed:))
+        [menuItem setState:[self incrementalRenderingSuppressed] ? NSOnState : NSOffState];
     else if (action == @selector(toggleShowTiledScrollingIndicator:))
         [menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
@@ -230 +234 @@
 }
 
+- (void)toggleIncrementalRenderingSuppressed:(id)sender
+{
+    [self _toggleBooleanDefault:IncrementalRenderingSuppressedPreferenceKey];
+}
+
+- (BOOL)incrementalRenderingSuppressed
+{
+    return [[NSUserDefaults standardUserDefaults] boolForKey:IncrementalRenderingSuppressedPreferenceKey];
+}
+
 - (void)toggleShowLayerBorders:(id)sender
 {

trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m

@@ -251 +251 @@
     [[WebPreferences standardPreferences] setSimpleLineLayoutDebugBordersEnabled:settings.simpleLineLayoutDebugBordersEnabled];
     [[WebPreferences standardPreferences] setShowRepaintCounter:settings.layerBordersVisible];
+    [[WebPreferences standardPreferences] setSuppressesIncrementalRendering:settings.incrementalRenderingSuppressed];
 
     BOOL useTransparentWindows = settings.useTransparentWindows;