Diff
Modified: trunk/Source/WebCore/ChangeLog (208398 => 208399)
--- trunk/Source/WebCore/ChangeLog 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebCore/ChangeLog 2016-11-04 21:54:44 UTC (rev 208399)
@@ -1,3 +1,18 @@
+2016-11-04 Said Abou-Hallawa <[email protected]>
+
+ Add a setting and preferences to enable/disable async image decoding
+ https://bugs.webkit.org/show_bug.cgi?id=164417
+
+ Reviewed by Simon Fraser.
+
+ Add an asyncImageDecodingEnabled setting. This setting controls whether an
+ image "can" be asynchronously decoded on a separate thread or not. The
+ function ImageSource::isAsyncDecodingRequired() will be used in conjunction
+ with this setting to decide whether an image "should" be asynchronously
+ decoded or not.
+
+ * page/Settings.in:
+
2016-11-04 Tim Horton <[email protected]>
Apply post-landing review comments for r208347
Modified: trunk/Source/WebCore/page/Settings.in (208398 => 208399)
--- trunk/Source/WebCore/page/Settings.in 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebCore/page/Settings.in 2016-11-04 21:54:44 UTC (rev 208399)
@@ -286,3 +286,5 @@
youTubeFlashPluginReplacementEnabled initial=defaultYouTubeFlashPluginReplacementEnabled
forcedPrefersReducedMotionValue type=ForcedPrefersReducedMotionValue, initial=defaultForcedPrefersReducedMotionValue
+
+asyncImageDecodingEnabled initial=true
Modified: trunk/Source/WebKit/mac/ChangeLog (208398 => 208399)
--- trunk/Source/WebKit/mac/ChangeLog 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-11-04 21:54:44 UTC (rev 208399)
@@ -1,3 +1,21 @@
+2016-11-04 Said Abou-Hallawa <[email protected]>
+
+ Add a setting and preferences to enable/disable async image decoding
+ https://bugs.webkit.org/show_bug.cgi?id=164417
+
+ Reviewed by Simon Fraser.
+
+ Hook up the asyncImageDecodingEnabled setting for WebKit1.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences asyncImageDecodingEnabled]):
+ (-[WebPreferences setAsyncImageDecodingEnabled:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2016-11-01 Alex Christensen <[email protected]>
Remove PassRefPtr from DumpRenderTree
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (208398 => 208399)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-11-04 21:54:44 UTC (rev 208399)
@@ -140,6 +140,7 @@
#define WebKitSuppressesIncrementalRenderingKey @"WebKitSuppressesIncrementalRendering"
#define WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey @"WebKitSubpixelCSSOMElementMetricsEnabled"
#define WebKitResourceLoadStatisticsEnabledPreferenceKey @"WebKitResourceLoadStatisticsEnabled"
+#define WebKitAsyncImageDecodingEnabledPreferenceKey @"WebKitAsyncImageDecodingEnabledEnabled"
#if TARGET_OS_IPHONE
#define WebKitAudioSessionCategoryOverride @"WebKitAudioSessionCategoryOverride"
#define WebKitAVKitEnabled @"WebKitAVKitEnabled"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (208398 => 208399)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-11-04 21:54:44 UTC (rev 208399)
@@ -507,6 +507,7 @@
[NSNumber numberWithBool:NO], WebKitAccelerated2dCanvasEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitResourceLoadStatisticsEnabledPreferenceKey,
+ [NSNumber numberWithBool:YES], WebKitAsyncImageDecodingEnabledPreferenceKey,
#if PLATFORM(IOS)
[NSNumber numberWithBool:YES], WebKitFrameFlatteningEnabledPreferenceKey,
#else
@@ -1874,6 +1875,16 @@
[self _setBoolValue:enabled forKey:WebKitResourceLoadStatisticsEnabledPreferenceKey];
}
+- (BOOL)asyncImageDecodingEnabled
+{
+ return [self _boolValueForKey:WebKitAsyncImageDecodingEnabledPreferenceKey];
+}
+
+- (void)setAsyncImageDecodingEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitAsyncImageDecodingEnabledPreferenceKey];
+}
+
- (BOOL)canvasUsesAcceleratedDrawing
{
return [self _boolValueForKey:WebKitCanvasUsesAcceleratedDrawingPreferenceKey];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (208398 => 208399)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-11-04 21:54:44 UTC (rev 208399)
@@ -504,6 +504,7 @@
- (BOOL)modernMediaControlsEnabled;
@property (nonatomic) BOOL visualViewportEnabled;
+@property (nonatomic) BOOL asyncImageDecodingEnabled;
@property (nonatomic) BOOL _javascript_MarkupEnabled;
@property (nonatomic) BOOL mediaDataLoadsAutomatically;
@property (nonatomic) BOOL attachmentElementEnabled;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (208398 => 208399)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-11-04 21:54:44 UTC (rev 208399)
@@ -2601,6 +2601,8 @@
settings.setAllowWindowOpenWithoutUserGesture(shouldAllowWindowOpenWithoutUserGesture());
settings.setShouldConvertInvalidURLsToBlank(shouldConvertInvalidURLsToBlank());
+
+ settings.setAsyncImageDecodingEnabled([preferences asyncImageDecodingEnabled]);
}
static inline IMP getMethod(id o, SEL s)
Modified: trunk/Source/WebKit2/ChangeLog (208398 => 208399)
--- trunk/Source/WebKit2/ChangeLog 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-04 21:54:44 UTC (rev 208399)
@@ -1,3 +1,22 @@
+2016-11-04 Said Abou-Hallawa <[email protected]>
+
+ Add a setting and preferences to enable/disable async image decoding
+ https://bugs.webkit.org/show_bug.cgi?id=164417
+
+ Reviewed by Simon Fraser.
+
+ Hook up the asyncImageDecodingEnabled setting for WebKit2.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _asyncImageDecodingEnabled]):
+ (-[WKPreferences _setAsyncImageDecodingEnabled:]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2016-11-04 Simon Fraser <[email protected]>
Rename some ScrollingTree/Node-related functions to reduce the number of uses of "update"
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (208398 => 208399)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-11-04 21:54:44 UTC (rev 208399)
@@ -233,6 +233,7 @@
macro(ApplePayEnabled, applePayEnabled, Bool, bool, false, "", "") \
macro(ApplePayCapabilityDisclosureAllowed, applePayCapabilityDisclosureAllowed, Bool, bool, true, "", "") \
macro(VisualViewportEnabled, visualViewportEnabled, Bool, bool, false, "", "") \
+ macro(AsyncImageDecodingEnabled, asyncImageDecodingEnabled, Bool, bool, true, "", "") \
\
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (208398 => 208399)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-11-04 21:54:44 UTC (rev 208399)
@@ -325,6 +325,16 @@
_preferences->setVisualViewportEnabled(_visualViewportEnabled);
}
+- (BOOL)_asyncImageDecodingEnabled
+{
+ return _preferences->asyncImageDecodingEnabled();
+}
+
+- (void)_setAsyncImageDecodingEnabled:(BOOL)_asyncImageDecodingEnabled
+{
+ _preferences->setAsyncImageDecodingEnabled(_asyncImageDecodingEnabled);
+}
+
- (BOOL)_textAutosizingEnabled
{
return _preferences->textAutosizingEnabled();
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (208398 => 208399)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-11-04 21:54:44 UTC (rev 208399)
@@ -64,6 +64,7 @@
@property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
@property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
@property (nonatomic, setter=_setVisualViewportEnabled:) BOOL _visualViewportEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, setter=_setAsyncImageDecodingEnabled:) BOOL _asyncImageDecodingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic, setter=_setTextAutosizingEnabled:) BOOL _textAutosizingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
@property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (208398 => 208399)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-11-04 21:54:44 UTC (rev 208399)
@@ -236,7 +236,9 @@
macro(WebKitDisplayImagesKey, LoadsImagesAutomatically, loadsImagesAutomatically) \
macro(WebKitMediaStreamEnabled, MediaStreamEnabled, mediaStreamEnabled) \
macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled) \
- macro(WebKitVisualViewportEnabled, VisualViewportEnabled, visualViewportEnabled)
+ macro(WebKitVisualViewportEnabled, VisualViewportEnabled, visualViewportEnabled) \
+ macro(WebKitAsyncImageDecodingEnabled, AsyncImageDecodingEnabled, asyncImageDecodingEnabled) \
+ \
#define OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES(TestRunnerName, SettingsName, WebPreferencesName) \
if (preference == #TestRunnerName) { \
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (208398 => 208399)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-11-04 21:54:44 UTC (rev 208399)
@@ -3241,6 +3241,7 @@
m_viewportConfiguration.setCanIgnoreScalingConstraints(m_ignoreViewportScalingConstraints);
setForceAlwaysUserScalable(m_forceAlwaysUserScalable || store.getBoolValueForKey(WebPreferencesKey::forceAlwaysUserScalableKey()));
#endif
+ settings.setAsyncImageDecodingEnabled(store.getBoolValueForKey(WebPreferencesKey::asyncImageDecodingEnabledKey()));
}
#if ENABLE(DATA_DETECTION)
Modified: trunk/Tools/ChangeLog (208398 => 208399)
--- trunk/Tools/ChangeLog 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Tools/ChangeLog 2016-11-04 21:54:44 UTC (rev 208399)
@@ -1,3 +1,23 @@
+2016-11-04 Said Abou-Hallawa <[email protected]>
+
+ Add a setting and preferences to enable/disable async image decoding
+ https://bugs.webkit.org/show_bug.cgi?id=164417
+
+ Reviewed by Simon Fraser.
+
+ Pref and a menu item to toggle asyncImageDecodingEnabled for WebKits 1 and 2.
+
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+ (-[SettingsController toggleAsyncImageDecodingEnabled:]):
+ (-[SettingsController asyncImageDecodingEnabled]):
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController didChangeSettings]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController didChangeSettings]):
+
2016-11-04 Brady Eidson <[email protected]>
REGRESSION (r208349) StringHasher::hashMemory behavior changed, causing API tests to fail
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (208398 => 208399)
--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2016-11-04 21:54:44 UTC (rev 208399)
@@ -50,6 +50,7 @@
@property (nonatomic, readonly) BOOL displayListDrawingEnabled;
@property (nonatomic, readonly) BOOL resourceLoadStatisticsEnabled;
@property (nonatomic, readonly) BOOL visualViewportEnabled;
+@property (nonatomic, readonly) BOOL asyncImageDecodingEnabled;
@property (nonatomic, readonly) BOOL usesGameControllerFramework;
@property (nonatomic, readonly) NSString *defaultURL;
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (208398 => 208399)
--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2016-11-04 21:54:44 UTC (rev 208399)
@@ -55,6 +55,7 @@
static NSString * const EnableSubPixelCSSOMMetricsPreferenceKey = @"EnableSubPixelCSSOMMetrics";
static NSString * const VisualViewportEnabledPreferenceKey = @"VisualViewportEnabled";
+static NSString * const AsyncImageDecodingEnabledPreferenceKey = @"AsyncImageDecodingEnabled";
// This default name intentionally overlaps with the key that WebKit2 checks when creating a view.
static NSString * const UseRemoteLayerTreeDrawingAreaPreferenceKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
@@ -126,6 +127,7 @@
[self _addItemWithTitle:@"Enable Display List Drawing" action:@selector(toggleDisplayListDrawingEnabled:) indented:NO];
[self _addItemWithTitle:@"Enable Visual Viewport" action:@selector(toggleVisualViewportEnabled:) indented:NO];
[self _addItemWithTitle:@"Enable Resource Load Statistics" action:@selector(toggleResourceLoadStatisticsEnabled:) indented:NO];
+ [self _addItemWithTitle:@"Enable Async Image Decoding" action:@selector(toggleAsyncImageDecodingEnabled:) indented:NO];
[self _addHeaderWithTitle:@"WebKit2-only Settings"];
@@ -199,6 +201,8 @@
[menuItem setState:[self displayListDrawingEnabled] ? NSOnState : NSOffState];
else if (action == @selector(toggleResourceLoadStatisticsEnabled:))
[menuItem setState:[self resourceLoadStatisticsEnabled] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleAsyncImageDecodingEnabled:))
+ [menuItem setState:[self asyncImageDecodingEnabled] ? NSOnState : NSOffState];
else if (action == @selector(toggleVisualViewportEnabled:))
[menuItem setState:[self visualViewportEnabled] ? NSOnState : NSOffState];
else if (action == @selector(toggleShowTiledScrollingIndicator:))
@@ -394,6 +398,16 @@
return [[NSUserDefaults standardUserDefaults] boolForKey:ResourceLoadStatisticsEnabledPreferenceKey];
}
+- (void)toggleAsyncImageDecodingEnabled:(id)sender
+{
+ [self _toggleBooleanDefault:AsyncImageDecodingEnabledPreferenceKey];
+}
+
+- (BOOL)asyncImageDecodingEnabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:AsyncImageDecodingEnabledPreferenceKey];
+}
+
- (void)toggleEnableSubPixelCSSOMMetrics:(id)sender
{
[self _toggleBooleanDefault:EnableSubPixelCSSOMMetricsPreferenceKey];
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (208398 => 208399)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2016-11-04 21:54:44 UTC (rev 208399)
@@ -282,6 +282,7 @@
[[WebPreferences standardPreferences] setAcceleratedDrawingEnabled:settings.acceleratedDrawingEnabled];
[[WebPreferences standardPreferences] setResourceLoadStatisticsEnabled:settings.resourceLoadStatisticsEnabled];
[[WebPreferences standardPreferences] setVisualViewportEnabled:settings.visualViewportEnabled];
+ [[WebPreferences standardPreferences] setAsyncImageDecodingEnabled:settings.asyncImageDecodingEnabled];
BOOL useTransparentWindows = settings.useTransparentWindows;
if (useTransparentWindows != !self.window.isOpaque) {
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (208398 => 208399)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-11-04 21:04:28 UTC (rev 208398)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-11-04 21:54:44 UTC (rev 208399)
@@ -368,6 +368,7 @@
preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
preferences._displayListDrawingEnabled = settings.displayListDrawingEnabled;
preferences._visualViewportEnabled = settings.visualViewportEnabled;
+ preferences._asyncImageDecodingEnabled = settings.asyncImageDecodingEnabled;
_webView.configuration.websiteDataStore._resourceLoadStatisticsEnabled = settings.resourceLoadStatisticsEnabled;
