Title: [204411] trunk/Tools
- Revision
- 204411
- Author
- [email protected]
- Date
- 2016-08-12 08:55:10 -0700 (Fri, 12 Aug 2016)
Log Message
Fix the 32-bit Mac build after:
Add WK2 ExperimentalFeature support to MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=160788
Reviewed by NOBODY (OOPS!).
Sprinkle "#if WK_API_ENABLED"s liberally.
* MiniBrowser/mac/AppDelegate.m:
(defaultConfiguration):
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (204410 => 204411)
--- trunk/Tools/ChangeLog 2016-08-12 10:38:29 UTC (rev 204410)
+++ trunk/Tools/ChangeLog 2016-08-12 15:55:10 UTC (rev 204411)
@@ -1,3 +1,19 @@
+2016-08-12 Brady Eidson <[email protected]>
+
+ Fix the 32-bit Mac build after:
+ Add WK2 ExperimentalFeature support to MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=160788
+
+ Unreviewed.
+
+ Sprinkle "#if WK_API_ENABLED"s liberally.
+
+ * MiniBrowser/mac/AppDelegate.m:
+ (defaultConfiguration):
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+
2016-08-12 Philippe Normand <[email protected]>
[GStreamer][OWR] Video rendering fixes
Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (204410 => 204411)
--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2016-08-12 10:38:29 UTC (rev 204410)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2016-08-12 15:55:10 UTC (rev 204411)
@@ -35,10 +35,13 @@
#import <WebKit/WKWebViewConfigurationPrivate.h>
#import <WebKit/WKWebsiteDataStorePrivate.h>
#import <WebKit/WebKit.h>
-#import <WebKit/_WKExperimentalFeature.h>
#import <WebKit/_WKProcessPoolConfiguration.h>
#import <WebKit/_WKUserContentExtensionStore.h>
+#if WK_API_ENABLED
+#import <WebKit/_WKExperimentalFeature.h>
+#endif
+
enum {
WebKit1NewWindowTag = 1,
WebKit2NewWindowTag = 2
@@ -83,11 +86,13 @@
[singleProcessConfiguration release];
}
+#if WK_API_ENABLED
NSArray<_WKExperimentalFeature *> *features = [WKPreferences _experimentalFeatures];
for (_WKExperimentalFeature *feature in features) {
BOOL enabled = [[NSUserDefaults standardUserDefaults] boolForKey:feature.key];
[configuration.preferences _setEnabled:enabled forFeature:feature];
}
+#endif
}
configuration.suppressesIncrementalRendering = [SettingsController shared].incrementalRenderingSuppressed;
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (204410 => 204411)
--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2016-08-12 10:38:29 UTC (rev 204410)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2016-08-12 15:55:10 UTC (rev 204411)
@@ -28,7 +28,10 @@
#import "AppDelegate.h"
#import "BrowserWindowController.h"
#import <WebKit/WKPreferencesPrivate.h>
+
+#if WK_API_ENABLED
#import <WebKit/_WKExperimentalFeature.h>
+#endif
static NSString * const defaultURL = @"http://www.webkit.org/";
static NSString * const DefaultURLPreferenceKey = @"DefaultURL";
@@ -58,7 +61,9 @@
typedef NS_ENUM(NSInteger, DebugOverylayMenuItemTag) {
NonFastScrollableRegionOverlayTag = 100,
WheelEventHandlerRegionOverlayTag,
+#if WK_API_ENABLED
ExperimentalFeatureTag,
+#endif
};
@implementation SettingsController
@@ -143,6 +148,7 @@
[_menu addItem:debugOverlaysSubmenuItem];
[debugOverlaysSubmenuItem release];
+#if WK_API_ENABLED
NSMenuItem *experimentalFeaturesSubmenuItem = [[NSMenuItem alloc] initWithTitle:@"Experimental Features" action:nil keyEquivalent:@""];
NSMenu *experimentalFeaturesMenu = [[NSMenu alloc] initWithTitle:@"Experimental Features"];
[experimentalFeaturesSubmenuItem setSubmenu:experimentalFeaturesMenu];
@@ -160,6 +166,7 @@
[_menu addItem:experimentalFeaturesSubmenuItem];
[experimentalFeaturesSubmenuItem release];
+#endif // WK_API_ENABLED
[self _addHeaderWithTitle:@"WebKit1-only Settings"];
[self _addItemWithTitle:@"Enable Subpixel CSSOM Metrics" action:@selector(toggleEnableSubPixelCSSOMMetrics:) indented:YES];
@@ -200,10 +207,12 @@
else if (action == @selector(toggleDebugOverlay:))
[menuItem setState:[self debugOverlayVisible:menuItem] ? NSOnState : NSOffState];
+#if WK_API_ENABLED
if (menuItem.tag == ExperimentalFeatureTag) {
_WKExperimentalFeature *feature = menuItem.representedObject;
[menuItem setState:[defaultPreferences() _isEnabledForFeature:feature] ? NSOnState : NSOffState];
}
+#endif
return YES;
}
@@ -395,6 +404,7 @@
[self _toggleBooleanDefault:preferenceKey];
}
+#if WK_API_ENABLED
- (void)toggleExperimentalFeature:(id)sender
{
_WKExperimentalFeature *feature = ((NSMenuItem *)sender).representedObject;
@@ -405,6 +415,7 @@
[[NSUserDefaults standardUserDefaults] setBool:!currentlyEnabled forKey:feature.key];
}
+#endif
- (BOOL)debugOverlayVisible:(NSMenuItem *)menuItem
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
