Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (176487 => 176488)
--- trunk/Source/WebKit/mac/ChangeLog 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-22 00:59:27 UTC (rev 176488)
@@ -1,3 +1,19 @@
+2014-11-21 Zalan Bujtas <[email protected]>
+
+ Simple line layout: Add "show simple line layout debug borders" setting to MiniBrowser.
+ https://bugs.webkit.org/show_bug.cgi?id=138981
+
+ Reviewed by Simon Fraser.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences simpleLineLayoutDebugBordersEnabled]):
+ (-[WebPreferences setSimpleLineLayoutDebugBordersEnabled:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2014-11-21 Tim Horton <[email protected]>
REGRESSION (r176351): Parts of apple.com/contact aren't Lookup-able
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (176487 => 176488)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-11-22 00:59:27 UTC (rev 176488)
@@ -104,6 +104,7 @@
#define WebKitCSSRegionsEnabledPreferenceKey @"WebKitCSSRegionsEnabled"
#define WebKitCSSCompositingEnabledPreferenceKey @"WebKitCSSCompositingEnabled"
#define WebKitShowDebugBordersPreferenceKey @"WebKitShowDebugBorders"
+#define WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey @"WebKitSimpleLineLayoutDebugBordersEnabled"
#define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter"
#define WebKitWebAudioEnabledPreferenceKey @"WebKitWebAudioEnabled"
#define WebKitWebGLEnabledPreferenceKey @"WebKitWebGLEnabled"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (176487 => 176488)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-11-22 00:59:27 UTC (rev 176488)
@@ -494,6 +494,7 @@
[NSNumber numberWithBool:NO], WebKitCanvasUsesAcceleratedDrawingPreferenceKey,
#endif
[NSNumber numberWithBool:NO], WebKitShowDebugBordersPreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitShowRepaintCounterPreferenceKey,
[NSNumber numberWithBool:YES], WebKitWebGLEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitForceSoftwareWebGLRenderingPreferenceKey,
@@ -1855,6 +1856,16 @@
[self _setBoolValue:enabled forKey:WebKitShowDebugBordersPreferenceKey];
}
+- (BOOL)simpleLineLayoutDebugBordersEnabled
+{
+ return [self _boolValueForKey:WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey];
+}
+
+- (void)setSimpleLineLayoutDebugBordersEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey];
+}
+
- (BOOL)showRepaintCounter
{
return [self _boolValueForKey:WebKitShowRepaintCounterPreferenceKey];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (176487 => 176488)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-11-22 00:59:27 UTC (rev 176488)
@@ -211,6 +211,9 @@
- (BOOL)showDebugBorders;
- (void)setShowDebugBorders:(BOOL)show;
+- (BOOL)simpleLineLayoutDebugBordersEnabled;
+- (void)setSimpleLineLayoutDebugBordersEnabled:(BOOL)enabled;
+
- (BOOL)showRepaintCounter;
- (void)setShowRepaintCounter:(BOOL)show;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (176487 => 176488)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-22 00:59:27 UTC (rev 176488)
@@ -2236,6 +2236,7 @@
settings.setAcceleratedDrawingEnabled([preferences acceleratedDrawingEnabled]);
settings.setCanvasUsesAcceleratedDrawing([preferences canvasUsesAcceleratedDrawing]);
settings.setShowDebugBorders([preferences showDebugBorders]);
+ settings.setSimpleLineLayoutDebugBordersEnabled([preferences simpleLineLayoutDebugBordersEnabled]);
settings.setShowRepaintCounter([preferences showRepaintCounter]);
settings.setWebGLEnabled([preferences webGLEnabled]);
settings.setSubpixelCSSOMElementMetricsEnabled([preferences subpixelCSSOMElementMetricsEnabled]);
Modified: trunk/Source/WebKit2/ChangeLog (176487 => 176488)
--- trunk/Source/WebKit2/ChangeLog 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-22 00:59:27 UTC (rev 176488)
@@ -1,3 +1,15 @@
+2014-11-21 Zalan Bujtas <[email protected]>
+
+ Simple line layout: Add "show simple line layout debug borders" setting to MiniBrowser.
+ https://bugs.webkit.org/show_bug.cgi?id=138981
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _simpleLineLayoutDebugBordersEnabled]):
+ (-[WKPreferences _setSimpleLineLayoutDebugBordersEnabled:]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+
2014-11-21 Eric Carlson <[email protected]>
WebVideoFullscreenManagerProxy must clear pointers when invalidated
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (176487 => 176488)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-11-22 00:59:27 UTC (rev 176488)
@@ -186,7 +186,6 @@
macro(LowPowerVideoAudioBufferSizeEnabled, lowPowerVideoAudioBufferSizeEnabled, Bool, bool, false) \
macro(ThreadedScrollingEnabled, threadedScrollingEnabled, Bool, bool, true) \
macro(SimpleLineLayoutEnabled, simpleLineLayoutEnabled, Bool, bool, true) \
- macro(SimpleLineLayoutDebugBordersEnabled, simpleLineLayoutDebugBordersEnabled, Bool, bool, false) \
macro(SubpixelCSSOMElementMetricsEnabled, subpixelCSSOMElementMetricsEnabled, Bool, bool, false) \
macro(BackgroundShouldExtendBeyondPage, backgroundShouldExtendBeyondPage, Bool, bool, false) \
macro(MediaStreamEnabled, mediaStreamEnabled, Bool, bool, false) \
@@ -235,6 +234,7 @@
macro(CompositingBordersVisible, compositingBordersVisible, Bool, bool, false) \
macro(CompositingRepaintCountersVisible, compositingRepaintCountersVisible, Bool, bool, false) \
macro(TiledScrollingIndicatorVisible, tiledScrollingIndicatorVisible, Bool, bool, false) \
+ macro(SimpleLineLayoutDebugBordersEnabled, simpleLineLayoutDebugBordersEnabled, Bool, bool, false) \
macro(LogsPageMessagesToSystemConsoleEnabled, logsPageMessagesToSystemConsoleEnabled, Bool, bool, false) \
\
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (176487 => 176488)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-11-22 00:59:27 UTC (rev 176488)
@@ -213,6 +213,16 @@
_preferences->setVisibleDebugOverlayRegions(regionFlags);
}
+- (BOOL)_simpleLineLayoutDebugBordersEnabled
+{
+ return _preferences->simpleLineLayoutDebugBordersEnabled();
+}
+
+- (void)_setSimpleLineLayoutDebugBordersEnabled:(BOOL)simpleLineLayoutDebugBordersEnabled
+{
+ _preferences->setSimpleLineLayoutDebugBordersEnabled(simpleLineLayoutDebugBordersEnabled);
+}
+
- (BOOL)_developerExtrasEnabled
{
return _preferences->developerExtrasEnabled();
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (176487 => 176488)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-11-22 00:59:27 UTC (rev 176488)
@@ -52,6 +52,7 @@
@property (nonatomic, setter=_setCompositingRepaintCountersVisible:) BOOL _compositingRepaintCountersVisible;
@property (nonatomic, setter=_setTiledScrollingIndicatorVisible:) BOOL _tiledScrollingIndicatorVisible;
@property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions;
+@property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled;
@property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled;
Modified: trunk/Tools/ChangeLog (176487 => 176488)
--- trunk/Tools/ChangeLog 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Tools/ChangeLog 2014-11-22 00:59:27 UTC (rev 176488)
@@ -1,3 +1,21 @@
+2014-11-21 Zalan Bujtas <[email protected]>
+
+ Simple line layout: Add "show simple line layout debug borders" setting to MiniBrowser.
+ https://bugs.webkit.org/show_bug.cgi?id=138981
+
+ Reviewed by Simon Fraser.
+
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+ (-[SettingsController toggleSimpleLineLayoutDebugBordersEnabled:]):
+ (-[SettingsController simpleLineLayoutDebugBordersEnabled]):
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController didChangeSettings]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController didChangeSettings]):
+
2014-11-21 Csaba Osztrogonác <[email protected]>
Remove http lock code from webkitperl
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (176487 => 176488)
--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2014-11-22 00:59:27 UTC (rev 176488)
@@ -37,6 +37,7 @@
@property (nonatomic, readonly) BOOL useTransparentWindows;
@property (nonatomic, readonly) BOOL usePaginatedMode;
@property (nonatomic, readonly) BOOL layerBordersVisible;
+@property (nonatomic, readonly) BOOL simpleLineLayoutDebugBordersEnabled;
@property (nonatomic, readonly) BOOL tiledScrollingIndicatorVisible;
@property (nonatomic, readonly) BOOL nonFastScrollableRegionOverlayVisible;
@property (nonatomic, readonly) BOOL wheelEventHandlerRegionOverlayVisible;
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (176487 => 176488)
--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2014-11-22 00:59:27 UTC (rev 176488)
@@ -33,6 +33,7 @@
static NSString * const UseWebKit2ByDefaultPreferenceKey = @"UseWebKit2ByDefault";
static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
+static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
static NSString * const NonFastScrollableRegionOverlayVisiblePreferenceKey = @"NonFastScrollableRegionOverlayVisible";
@@ -100,6 +101,7 @@
[self _addItemWithTitle:@"Use Transparent Windows" action:@selector(toggleUseTransparentWindows:) indented:NO];
[self _addItemWithTitle:@"Use Paginated Mode" action:@selector(toggleUsePaginatedMode:) indented:NO];
[self _addItemWithTitle:@"Show Layer Borders" action:@selector(toggleShowLayerBorders:) indented:NO];
+ [self _addItemWithTitle:@"Show Simple Line Layout Borders" action:@selector(toggleSimpleLineLayoutDebugBordersEnabled:) indented:NO];
[self _addHeaderWithTitle:@"WebKit2-only Settings"];
@@ -140,6 +142,8 @@
[menuItem setState:[self usePaginatedMode] ? NSOnState : NSOffState];
else if (action == @selector(toggleShowLayerBorders:))
[menuItem setState:[self layerBordersVisible] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleSimpleLineLayoutDebugBordersEnabled:))
+ [menuItem setState:[self simpleLineLayoutDebugBordersEnabled] ? NSOnState : NSOffState];
else if (action == @selector(toggleShowTiledScrollingIndicator:))
[menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
else if (action == @selector(toggleUseUISideCompositing:))
@@ -210,6 +214,16 @@
return [[NSUserDefaults standardUserDefaults] boolForKey:LayerBordersVisiblePreferenceKey];
}
+- (void)toggleSimpleLineLayoutDebugBordersEnabled:(id)sender
+{
+ [self _toggleBooleanDefault:SimpleLineLayoutDebugBordersEnabledPreferenceKey];
+}
+
+- (BOOL)simpleLineLayoutDebugBordersEnabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:SimpleLineLayoutDebugBordersEnabledPreferenceKey];
+}
+
- (void)toggleShowTiledScrollingIndicator:(id)sender
{
[self _toggleBooleanDefault:TiledScrollingIndicatorVisiblePreferenceKey];
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (176487 => 176488)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-11-22 00:59:27 UTC (rev 176488)
@@ -238,6 +238,7 @@
[[WebPreferences standardPreferences] setSubpixelCSSOMElementMetricsEnabled:settings.subPixelCSSOMMetricsEnabled];
[[WebPreferences standardPreferences] setShowDebugBorders:settings.layerBordersVisible];
+ [[WebPreferences standardPreferences] setSimpleLineLayoutDebugBordersEnabled:settings.simpleLineLayoutDebugBordersEnabled];
[[WebPreferences standardPreferences] setShowRepaintCounter:settings.layerBordersVisible];
BOOL useTransparentWindows = settings.useTransparentWindows;
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (176487 => 176488)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-11-22 00:55:45 UTC (rev 176487)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-11-22 00:59:27 UTC (rev 176488)
@@ -278,6 +278,7 @@
preferences._tiledScrollingIndicatorVisible = settings.tiledScrollingIndicatorVisible;
preferences._compositingBordersVisible = settings.layerBordersVisible;
preferences._compositingRepaintCountersVisible = settings.layerBordersVisible;
+ preferences._simpleLineLayoutDebugBordersEnabled = settings.simpleLineLayoutDebugBordersEnabled;
BOOL useTransparentWindows = settings.useTransparentWindows;
if (useTransparentWindows != _webView._drawsTransparentBackground) {
