Changeset 194683 in webkit

Timestamp:

Jan 6, 2016, 5:43:25 PM (10 years ago)

Author:

Simon Fraser

Message:

Add a setting and preferences to enable display-list drawing. Does nothing yet.
​https://bugs.webkit.org/show_bug.cgi?id=152807

Reviewed by Zalan Bujtas.
Source/WebCore:

Setting for display-list drawing.

• page/Settings.in:

Source/WebKit/mac:

WK1 pref for display-list drawing, defaults to off.

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

(+[WebPreferences initialize]):
(-[WebPreferences displayListDrawingEnabled]):
(-[WebPreferences setDisplayListDrawingEnabled:]):

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

(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
(-[WebView _preferencesChanged:]):

Source/WebKit2:

WK2 debug pref for display-list drawing, defaults to off.

• Shared/WebPreferencesDefinitions.h:
• UIProcess/API/Cocoa/WKPreferences.mm:

(-[WKPreferences _displayListDrawingEnabled]):
(-[WKPreferences _setDisplayListDrawingEnabled:]):

• UIProcess/API/Cocoa/WKPreferencesPrivate.h:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

Tools:

Add an item to the Settings menu to toggle display-list drawing.

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

(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController toggleDisplayListDrawingEnabled:]):
(-[SettingsController displayListDrawingEnabled]):

• MiniBrowser/mac/WK2BrowserWindowController.m:

(-[WK2BrowserWindowController didChangeSettings]):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Settings.in (modified) (1 diff)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• Source/WebKit/mac/WebView/WebPreferences.mm (modified) (2 diffs)
• Source/WebKit/mac/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• Source/WebKit/mac/WebView/WebView.mm (modified) (2 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/WebPreferencesDefinitions.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/mac/SettingsController.h (modified) (1 diff)
• Tools/MiniBrowser/mac/SettingsController.m (modified) (4 diffs)
• Tools/MiniBrowser/mac/WK2BrowserWindowController.m (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Add a setting and preferences to enable display-list drawing. Does nothing yet.
+        https://bugs.webkit.org/show_bug.cgi?id=152807
+
+        Reviewed by Zalan Bujtas.
+
+        Setting for display-list drawing.
+
+        * page/Settings.in:
+
 2016-01-06  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/page/Settings.in

@@ -86 +86 @@
 canvasUsesAcceleratedDrawing initial=false
 acceleratedDrawingEnabled initial=false
+displayListDrawingEnabled initial=false
 acceleratedFiltersEnabled initial=false
 useLegacyTextAlignPositionedElementBehavior initial=false

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2016-01-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Add a setting and preferences to enable display-list drawing. Does nothing yet.
+        https://bugs.webkit.org/show_bug.cgi?id=152807
+
+        Reviewed by Zalan Bujtas.
+        
+        WK1 pref for display-list drawing, defaults to off.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences displayListDrawingEnabled]):
+        (-[WebPreferences setDisplayListDrawingEnabled:]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+        (-[WebView _preferencesChanged:]):
+
 2016-01-06  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

@@ -100 +100 @@
 #define WebKitXSSAuditorEnabledPreferenceKey @"WebKitXSSAuditorEnabled"
 #define WebKitAcceleratedDrawingEnabledPreferenceKey @"WebKitAcceleratedDrawingEnabled"
+#define WebKitDisplayListDrawingEnabledPreferenceKey @"WebKitDisplayListDrawingEnabled"
 #define WebKitCanvasUsesAcceleratedDrawingPreferenceKey @"WebKitCanvasUsesAcceleratedDrawing"
 #define WebKitAcceleratedCompositingEnabledPreferenceKey @"WebKitAcceleratedCompositingEnabled"

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -491 +491 @@
         [NSNumber numberWithBool:YES], WebKitCSSRegionsEnabledPreferenceKey,
         [NSNumber numberWithBool:YES], WebKitCSSCompositingEnabledPreferenceKey,
+        [NSNumber numberWithBool:NO],   WebKitDisplayListDrawingEnabledPreferenceKey,
 #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
         [NSNumber numberWithBool:YES],  WebKitAcceleratedDrawingEnabledPreferenceKey,
@@ -1818 +1819 @@
 }
 
+- (BOOL)displayListDrawingEnabled
+{
+    return [self _boolValueForKey:WebKitDisplayListDrawingEnabledPreferenceKey];
+}
+
+- (void)setDisplayListDrawingEnabled:(BOOL)enabled
+{
+    [self _setBoolValue:enabled forKey:WebKitDisplayListDrawingEnabledPreferenceKey];
+}
+
 - (BOOL)canvasUsesAcceleratedDrawing
 {

trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

@@ -201 +201 @@
 - (void)setAcceleratedDrawingEnabled:(BOOL)enabled;
 
+- (BOOL)displayListDrawingEnabled;
+- (void)setDisplayListDrawingEnabled:(BOOL)enabled;
+
 - (BOOL)canvasUsesAcceleratedDrawing;
 - (void)setCanvasUsesAcceleratedDrawing:(BOOL)enabled;

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1230 +1230 @@
     _private->page->settings().setDownloadableBinaryFontsEnabled(false);
     _private->page->settings().setAcceleratedDrawingEnabled([preferences acceleratedDrawingEnabled]);
+    _private->page->settings().setDisplayListDrawingEnabled([preferences displayListDrawingEnabled]);
     
     _private->page->settings().setFontFallbackPrefersPictographs(true);
@@ -2282 +2283 @@
     settings.setAcceleratedCompositingEnabled([preferences acceleratedCompositingEnabled]);
     settings.setAcceleratedDrawingEnabled([preferences acceleratedDrawingEnabled]);
-    settings.setCanvasUsesAcceleratedDrawing([preferences canvasUsesAcceleratedDrawing]);    
+    settings.setDisplayListDrawingEnabled([preferences displayListDrawingEnabled]);
+    settings.setCanvasUsesAcceleratedDrawing([preferences canvasUsesAcceleratedDrawing]);
     settings.setShowDebugBorders([preferences showDebugBorders]);
     settings.setSimpleLineLayoutDebugBordersEnabled([preferences simpleLineLayoutDebugBordersEnabled]);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-01-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Add a setting and preferences to enable display-list drawing. Does nothing yet.
+        https://bugs.webkit.org/show_bug.cgi?id=152807
+
+        Reviewed by Zalan Bujtas.
+        
+        WK2 debug pref for display-list drawing, defaults to off.
+
+        * Shared/WebPreferencesDefinitions.h:
+        * UIProcess/API/Cocoa/WKPreferences.mm:
+        (-[WKPreferences _displayListDrawingEnabled]):
+        (-[WKPreferences _setDisplayListDrawingEnabled:]):
+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
 2016-01-06  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h

@@ -244 +244 @@
 #define FOR_EACH_WEBKIT_DEBUG_BOOL_PREFERENCE(macro) \
     macro(AcceleratedDrawingEnabled, acceleratedDrawingEnabled, Bool, bool, DEFAULT_ACCELERATED_DRAWING_ENABLED) \
+    macro(DisplayListDrawingEnabled, displayListDrawingEnabled, Bool, bool, false) \
     macro(CompositingBordersVisible, compositingBordersVisible, Bool, bool, false) \
     macro(CompositingRepaintCountersVisible, compositingRepaintCountersVisible, Bool, bool, false) \

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm

@@ -258 +258 @@
 }
 
+- (BOOL)_displayListDrawingEnabled
+{
+    return _preferences->displayListDrawingEnabled();
+}
+
+- (void)_setDisplayListDrawingEnabled:(BOOL)displayListDrawingEnabled
+{
+    _preferences->setDisplayListDrawingEnabled(displayListDrawingEnabled);
+}
+
 - (BOOL)_developerExtrasEnabled
 {

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h

@@ -60 +60 @@
 @property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_AVAILABLE(10_11, 9_0);
 @property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
 
 @property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_AVAILABLE(10_11, 9_0);

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -2767 +2767 @@
     settings.setAcceleratedCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingEnabledKey()));
     settings.setAcceleratedDrawingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedDrawingEnabledKey()));
+    settings.setDisplayListDrawingEnabled(store.getBoolValueForKey(WebPreferencesKey::displayListDrawingEnabledKey()));
     settings.setCanvasUsesAcceleratedDrawing(store.getBoolValueForKey(WebPreferencesKey::canvasUsesAcceleratedDrawingKey()));
     settings.setShowDebugBorders(store.getBoolValueForKey(WebPreferencesKey::compositingBordersVisibleKey()));

trunk/Tools/ChangeLog

@@ +1 @@
+2016-01-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Add a setting and preferences to enable display-list drawing. Does nothing yet.
+        https://bugs.webkit.org/show_bug.cgi?id=152807
+
+        Reviewed by Zalan Bujtas.
+        
+        Add an item to the Settings menu to toggle display-list drawing.
+
+        * MiniBrowser/mac/SettingsController.h:
+        * MiniBrowser/mac/SettingsController.m:
+        (-[SettingsController _populateMenu]):
+        (-[SettingsController validateMenuItem:]):
+        (-[SettingsController toggleDisplayListDrawingEnabled:]):
+        (-[SettingsController displayListDrawingEnabled]):
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController didChangeSettings]):
+
 2016-01-06  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Tools/MiniBrowser/mac/SettingsController.h

@@ -48 +48 @@
 @property (nonatomic, readonly) BOOL subPixelCSSOMMetricsEnabled;
 @property (nonatomic, readonly) BOOL acceleratedDrawingEnabled;
+@property (nonatomic, readonly) BOOL displayListDrawingEnabled;
 @property (nonatomic, readonly) NSString *defaultURL;
 

trunk/Tools/MiniBrowser/mac/SettingsController.m

@@ -39 +39 @@
 static NSString * const IncrementalRenderingSuppressedPreferenceKey = @"IncrementalRenderingSuppressed";
 static NSString * const AcceleratedDrawingEnabledPreferenceKey = @"AcceleratedDrawingEnabled";
+static NSString * const DisplayListDrawingEnabledPreferenceKey = @"DisplayListDrawingEnabled";
 
 static NSString * const NonFastScrollableRegionOverlayVisiblePreferenceKey = @"NonFastScrollableRegionOverlayVisible";
@@ -111 +112 @@
     [self _addItemWithTitle:@"Suppress Incremental Rendering in New Windows" action:@selector(toggleIncrementalRenderingSuppressed:) indented:NO];
     [self _addItemWithTitle:@"Enable Accelerated Drawing" action:@selector(toggleAcceleratedDrawingEnabled:) indented:NO];
+    [self _addItemWithTitle:@"Enable Display List Drawing" action:@selector(toggleDisplayListDrawingEnabled:) indented:NO];
 
     [self _addHeaderWithTitle:@"WebKit2-only Settings"];
@@ -159 +161 @@
     else if (action == @selector(toggleAcceleratedDrawingEnabled:))
         [menuItem setState:[self acceleratedDrawingEnabled] ? NSOnState : NSOffState];
+    else if (action == @selector(toggleDisplayListDrawingEnabled:))
+        [menuItem setState:[self displayListDrawingEnabled] ? NSOnState : NSOffState];
     else if (action == @selector(toggleShowTiledScrollingIndicator:))
         [menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
@@ -283 +287 @@
 }
 
+- (void)toggleDisplayListDrawingEnabled:(id)sender
+{
+    [self _toggleBooleanDefault:DisplayListDrawingEnabledPreferenceKey];
+}
+
+- (BOOL)displayListDrawingEnabled
+{
+    return [[NSUserDefaults standardUserDefaults] boolForKey:DisplayListDrawingEnabledPreferenceKey];
+}
+
 - (void)toggleShowTiledScrollingIndicator:(id)sender
 {

trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

@@ -344 +344 @@
     preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled;
     preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
+    preferences._displayListDrawingEnabled = settings.displayListDrawingEnabled;
 
     BOOL useTransparentWindows = settings.useTransparentWindows;