Diff
Modified: trunk/Source/WebCore/ChangeLog (209158 => 209159)
--- trunk/Source/WebCore/ChangeLog 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 23:48:00 UTC (rev 209159)
@@ -1,3 +1,27 @@
+2016-11-30 Said Abou-Hallawa <[email protected]>
+
+ Add separate settings and preferences to enable/disable async decoding for large images and animated images
+ https://bugs.webkit.org/show_bug.cgi?id=165177
+
+ Reviewed by Simon Fraser.
+
+ Instead of having the async image decoding be controlled by one setting,
+ two separate settings are added:
+ largeImageAsyncDecodingEnabled
+ animatedImageAsyncDecodingEnabled
+
+ And an existing setting is removed:
+ asyncImageDecodingEnabled
+
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::load):
+ * loader/cache/CachedImage.h:
+ * page/Settings.in:
+ * platform/graphics/BitmapImage.cpp:
+ (WebCore::BitmapImage::internalStartAnimation):
+ * platform/graphics/BitmapImage.h:
+ * platform/graphics/ImageObserver.h:
+
2016-11-30 Zalan Bujtas <[email protected]>
ASSERTION FAILED: layoutState->m_renderer == this in WebCore::RenderBlock::offsetFromLogicalTopOfFirstPage
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (209158 => 209159)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2016-11-30 23:48:00 UTC (rev 209159)
@@ -92,7 +92,8 @@
if (m_loader) {
m_allowSubsampling = m_loader->frameLoader()->frame().settings().imageSubsamplingEnabled();
- m_allowAsyncImageDecoding = m_loader->frameLoader()->frame().settings().asyncImageDecodingEnabled();
+ m_allowLargeImageAsyncDecoding = m_loader->frameLoader()->frame().settings().largeImageAsyncDecodingEnabled();
+ m_allowAnimatedImageAsyncDecoding = m_loader->frameLoader()->frame().settings().animatedImageAsyncDecodingEnabled();
m_showDebugBackground = m_loader->frameLoader()->frame().settings().showDebugBorders();
}
}
Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (209158 => 209159)
--- trunk/Source/WebCore/loader/cache/CachedImage.h 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2016-11-30 23:48:00 UTC (rev 209159)
@@ -118,7 +118,8 @@
// ImageObserver
bool allowSubsampling() const override { return m_allowSubsampling; }
- bool allowAsyncImageDecoding() const override { return m_allowAsyncImageDecoding; }
+ bool allowLargeImageAsyncDecoding() const override { return m_allowLargeImageAsyncDecoding; }
+ bool allowAnimatedImageAsyncDecoding() const override { return m_allowAnimatedImageAsyncDecoding; }
bool showDebugBackground() const override { return m_showDebugBackground; }
void decodedSizeChanged(const Image*, long long delta) override;
void didDraw(const Image*) override;
@@ -145,7 +146,8 @@
#else
bool m_allowSubsampling { false };
#endif
- bool m_allowAsyncImageDecoding { true };
+ bool m_allowLargeImageAsyncDecoding { true };
+ bool m_allowAnimatedImageAsyncDecoding { true };
bool m_showDebugBackground { false };
};
Modified: trunk/Source/WebCore/page/Settings.in (209158 => 209159)
--- trunk/Source/WebCore/page/Settings.in 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebCore/page/Settings.in 2016-11-30 23:48:00 UTC (rev 209159)
@@ -289,7 +289,8 @@
forcedDisplayIsMonochromeAccessibilityValue type=ForcedAccessibilityValue, initial=defaultForcedDisplayIsMonochromeAccessibilityValue
forcedPrefersReducedMotionAccessibilityValue type=ForcedAccessibilityValue, initial=defaultForcedPrefersReducedMotionAccessibilityValue
-asyncImageDecodingEnabled initial=true
+largeImageAsyncDecodingEnabled initial=true
+animatedImageAsyncDecodingEnabled initial=true
es6ModulesEnabled initial=false
pointerLockEnabled initial=false
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (209158 => 209159)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2016-11-30 23:48:00 UTC (rev 209159)
@@ -278,7 +278,7 @@
// it will be decoded on a separate work queue. When decoding nextFrame finishes, we will be notified
// through the callback newFrameNativeImageAvailableAtIndex(). Otherwise, advanceAnimation() will be called
// when the timer fires and m_currentFrame will be advanced to nextFrame since it is not being decoded.
- if ((allowAsyncImageDecoding() && m_source.isAsyncDecodingRequired()) || isAsyncDecodingForcedForTesting()) {
+ if ((allowAnimatedImageAsyncDecoding() && m_source.isAsyncDecodingRequired()) || isAsyncDecodingForcedForTesting()) {
if (!m_source.requestFrameAsyncDecodingAtIndex(nextFrame, m_currentSubsamplingLevel))
LOG(Images, "BitmapImage %p %s - cachedFrameCount %ld nextFrame %ld", this, __FUNCTION__, ++m_cachedFrameCount, nextFrame);
m_desiredFrameDecodeTimeForTesting = time + std::max(m_frameDecodingDurationForTesting, 0.0f);
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (209158 => 209159)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2016-11-30 23:48:00 UTC (rev 209159)
@@ -134,7 +134,8 @@
NativeImagePtr frameImageAtIndex(size_t, SubsamplingLevel = SubsamplingLevel::Default, const GraphicsContext* = nullptr);
bool allowSubsampling() const { return imageObserver() && imageObserver()->allowSubsampling(); }
- bool allowAsyncImageDecoding() const { return imageObserver() && imageObserver()->allowAsyncImageDecoding(); }
+ bool allowLargeImageAsyncDecoding() const { return imageObserver() && imageObserver()->allowLargeImageAsyncDecoding(); }
+ bool allowAnimatedImageAsyncDecoding() const { return imageObserver() && imageObserver()->allowAnimatedImageAsyncDecoding(); }
bool showDebugBackground() const { return imageObserver() && imageObserver()->showDebugBackground(); }
// Called to invalidate cached data. When |destroyAll| is true, we wipe out
Modified: trunk/Source/WebCore/platform/graphics/ImageObserver.h (209158 => 209159)
--- trunk/Source/WebCore/platform/graphics/ImageObserver.h 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebCore/platform/graphics/ImageObserver.h 2016-11-30 23:48:00 UTC (rev 209159)
@@ -38,7 +38,8 @@
virtual ~ImageObserver() {}
public:
virtual bool allowSubsampling() const = 0;
- virtual bool allowAsyncImageDecoding() const = 0;
+ virtual bool allowLargeImageAsyncDecoding() const = 0;
+ virtual bool allowAnimatedImageAsyncDecoding() const = 0;
virtual bool showDebugBackground() const = 0;
virtual void decodedSizeChanged(const Image*, long long delta) = 0;
Modified: trunk/Source/WebKit/mac/ChangeLog (209158 => 209159)
--- trunk/Source/WebKit/mac/ChangeLog 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-11-30 23:48:00 UTC (rev 209159)
@@ -1,3 +1,25 @@
+2016-11-30 Said Abou-Hallawa <[email protected]>
+
+ Add separate settings and preferences to enable/disable async decoding for large images and animated images
+ https://bugs.webkit.org/show_bug.cgi?id=165177
+
+ Reviewed by Simon Fraser.
+
+ Hook up the async image decoding settings for WebKit1.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences largeImageAsyncDecodingEnabled]):
+ (-[WebPreferences setLargeImageAsyncDecodingEnabled:]):
+ (-[WebPreferences animatedImageAsyncDecodingEnabled]):
+ (-[WebPreferences setAnimatedImageAsyncDecodingEnabled:]):
+ (-[WebPreferences asyncImageDecodingEnabled]): Deleted.
+ (-[WebPreferences setAsyncImageDecodingEnabled:]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2016-11-29 Andy Estes <[email protected]>
[Cocoa] Enable two clang warnings recommended by Xcode
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (209158 => 209159)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-11-30 23:48:00 UTC (rev 209159)
@@ -141,7 +141,8 @@
#define WebKitSuppressesIncrementalRenderingKey @"WebKitSuppressesIncrementalRendering"
#define WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey @"WebKitSubpixelCSSOMElementMetricsEnabled"
#define WebKitResourceLoadStatisticsEnabledPreferenceKey @"WebKitResourceLoadStatisticsEnabled"
-#define WebKitAsyncImageDecodingEnabledPreferenceKey @"WebKitAsyncImageDecodingEnabledEnabled"
+#define WebKitLargeImageAsyncDecodingEnabledPreferenceKey @"WebKitLargeImageAsyncDecodingEnabled"
+#define WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey @"WebKitAnimatedImageAsyncDecodingEnabled"
#if TARGET_OS_IPHONE
#define WebKitAudioSessionCategoryOverride @"WebKitAudioSessionCategoryOverride"
#define WebKitAVKitEnabled @"WebKitAVKitEnabled"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (209158 => 209159)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-11-30 23:48:00 UTC (rev 209159)
@@ -507,7 +507,8 @@
[NSNumber numberWithBool:NO], WebKitAccelerated2dCanvasEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitResourceLoadStatisticsEnabledPreferenceKey,
- [NSNumber numberWithBool:YES], WebKitAsyncImageDecodingEnabledPreferenceKey,
+ [NSNumber numberWithBool:YES], WebKitLargeImageAsyncDecodingEnabledPreferenceKey,
+ [NSNumber numberWithBool:YES], WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey,
#if PLATFORM(IOS)
[NSNumber numberWithBool:YES], WebKitFrameFlatteningEnabledPreferenceKey,
#else
@@ -1887,16 +1888,26 @@
[self _setBoolValue:enabled forKey:WebKitResourceLoadStatisticsEnabledPreferenceKey];
}
-- (BOOL)asyncImageDecodingEnabled
+- (BOOL)largeImageAsyncDecodingEnabled
{
- return [self _boolValueForKey:WebKitAsyncImageDecodingEnabledPreferenceKey];
+ return [self _boolValueForKey:WebKitLargeImageAsyncDecodingEnabledPreferenceKey];
}
-- (void)setAsyncImageDecodingEnabled:(BOOL)enabled
+- (void)setLargeImageAsyncDecodingEnabled:(BOOL)enabled
{
- [self _setBoolValue:enabled forKey:WebKitAsyncImageDecodingEnabledPreferenceKey];
+ [self _setBoolValue:enabled forKey:WebKitLargeImageAsyncDecodingEnabledPreferenceKey];
}
+- (BOOL)animatedImageAsyncDecodingEnabled
+{
+ return [self _boolValueForKey:WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey];
+}
+
+- (void)setAnimatedImageAsyncDecodingEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey];
+}
+
- (BOOL)canvasUsesAcceleratedDrawing
{
return [self _boolValueForKey:WebKitCanvasUsesAcceleratedDrawingPreferenceKey];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (209158 => 209159)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-11-30 23:48:00 UTC (rev 209159)
@@ -513,7 +513,8 @@
- (BOOL)modernMediaControlsEnabled;
@property (nonatomic) BOOL visualViewportEnabled;
-@property (nonatomic) BOOL asyncImageDecodingEnabled;
+@property (nonatomic) BOOL largeImageAsyncDecodingEnabled;
+@property (nonatomic) BOOL animatedImageAsyncDecodingEnabled;
@property (nonatomic) BOOL _javascript_MarkupEnabled;
@property (nonatomic) BOOL mediaDataLoadsAutomatically;
@property (nonatomic) BOOL attachmentElementEnabled;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (209158 => 209159)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-11-30 23:48:00 UTC (rev 209159)
@@ -2900,7 +2900,8 @@
settings.setShouldConvertInvalidURLsToBlank(shouldConvertInvalidURLsToBlank());
- settings.setAsyncImageDecodingEnabled([preferences asyncImageDecodingEnabled]);
+ settings.setLargeImageAsyncDecodingEnabled([preferences largeImageAsyncDecodingEnabled]);
+ settings.setAnimatedImageAsyncDecodingEnabled([preferences animatedImageAsyncDecodingEnabled]);
}
static inline IMP getMethod(id o, SEL s)
Modified: trunk/Source/WebKit2/ChangeLog (209158 => 209159)
--- trunk/Source/WebKit2/ChangeLog 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-30 23:48:00 UTC (rev 209159)
@@ -1,3 +1,26 @@
+2016-11-30 Said Abou-Hallawa <[email protected]>
+
+ Add separate settings and preferences to enable/disable async decoding for large images and animated images
+ https://bugs.webkit.org/show_bug.cgi?id=165177
+
+ Reviewed by Simon Fraser.
+
+ Hook up the async image decoding settings for WebKit2.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _largeImageAsyncDecodingEnabled]):
+ (-[WKPreferences _setLargeImageAsyncDecodingEnabled:]):
+ (-[WKPreferences _animatedImageAsyncDecodingEnabled]):
+ (-[WKPreferences _setAnimatedImageAsyncDecodingEnabled:]):
+ (-[WKPreferences _asyncImageDecodingEnabled]): Deleted.
+ (-[WKPreferences _setAsyncImageDecodingEnabled:]): Deleted.
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2016-11-30 Chris Dumez <[email protected]>
[iOS][WK2] Turn on HTML interactive form validation feature
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (209158 => 209159)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-11-30 23:48:00 UTC (rev 209159)
@@ -240,7 +240,8 @@
macro(ApplePayCapabilityDisclosureAllowed, applePayCapabilityDisclosureAllowed, Bool, bool, true, "", "") \
macro(VisualViewportEnabled, visualViewportEnabled, Bool, bool, false, "", "") \
macro(NeedsStorageAccessFromFileURLsQuirk, needsStorageAccessFromFileURLsQuirk, Bool, bool, true, "", "") \
- macro(AsyncImageDecodingEnabled, asyncImageDecodingEnabled, Bool, bool, true, "", "") \
+ macro(LargeImageAsyncDecodingEnabled, largeImageAsyncDecodingEnabled, Bool, bool, true, "", "") \
+ macro(AnimatedImageAsyncDecodingEnabled, animatedImageAsyncDecodingEnabled, Bool, bool, true, "", "") \
macro(CustomElementsEnabled, customElementsEnabled, Bool, bool, true, "", "") \
macro(EncryptedMediaAPIEnabled, encryptedMediaAPIEnabled, Bool, bool, false, "", "") \
macro(IntersectionObserverEnabled, intersectionObserverEnabled, Bool, bool, false, "Intersection Observer", "Enable Intersection Observer support") \
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (209158 => 209159)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-11-30 23:48:00 UTC (rev 209159)
@@ -325,16 +325,26 @@
_preferences->setVisualViewportEnabled(_visualViewportEnabled);
}
-- (BOOL)_asyncImageDecodingEnabled
+- (BOOL)_largeImageAsyncDecodingEnabled
{
- return _preferences->asyncImageDecodingEnabled();
+ return _preferences->largeImageAsyncDecodingEnabled();
}
-- (void)_setAsyncImageDecodingEnabled:(BOOL)_asyncImageDecodingEnabled
+- (void)_setLargeImageAsyncDecodingEnabled:(BOOL)_largeImageAsyncDecodingEnabled
{
- _preferences->setAsyncImageDecodingEnabled(_asyncImageDecodingEnabled);
+ _preferences->setLargeImageAsyncDecodingEnabled(_largeImageAsyncDecodingEnabled);
}
+- (BOOL)_animatedImageAsyncDecodingEnabled
+{
+ return _preferences->animatedImageAsyncDecodingEnabled();
+}
+
+- (void)_setAnimatedImageAsyncDecodingEnabled:(BOOL)_animatedImageAsyncDecodingEnabled
+{
+ _preferences->setAnimatedImageAsyncDecodingEnabled(_animatedImageAsyncDecodingEnabled);
+}
+
- (BOOL)_textAutosizingEnabled
{
return _preferences->textAutosizingEnabled();
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (209158 => 209159)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-11-30 23:48:00 UTC (rev 209159)
@@ -64,7 +64,8 @@
@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=_setLargeImageAsyncDecodingEnabled:) BOOL _largeImageAsyncDecodingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, setter=_setAnimatedImageAsyncDecodingEnabled:) BOOL _animatedImageAsyncDecodingEnabled 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 (209158 => 209159)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-11-30 23:48:00 UTC (rev 209159)
@@ -242,7 +242,8 @@
macro(WebKitMediaStreamEnabled, MediaStreamEnabled, mediaStreamEnabled) \
macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled) \
macro(WebKitVisualViewportEnabled, VisualViewportEnabled, visualViewportEnabled) \
- macro(WebKitAsyncImageDecodingEnabled, AsyncImageDecodingEnabled, asyncImageDecodingEnabled) \
+ macro(WebKitLargeImageAsyncDecodingEnabled, LargeImageAsyncDecodingEnabled, largeImageAsyncDecodingEnabled) \
+ macro(WebKitAnimatedImageAsyncDecodingEnabled, AnimatedImageAsyncDecodingEnabled, animatedImageAsyncDecodingEnabled) \
macro(WebKitES6ModulesEnabled, Es6ModulesEnabled, es6ModulesEnabled) \
\
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (209158 => 209159)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-11-30 23:48:00 UTC (rev 209159)
@@ -3219,7 +3219,8 @@
m_viewportConfiguration.setCanIgnoreScalingConstraints(m_ignoreViewportScalingConstraints);
setForceAlwaysUserScalable(m_forceAlwaysUserScalable || store.getBoolValueForKey(WebPreferencesKey::forceAlwaysUserScalableKey()));
#endif
- settings.setAsyncImageDecodingEnabled(store.getBoolValueForKey(WebPreferencesKey::asyncImageDecodingEnabledKey()));
+ settings.setLargeImageAsyncDecodingEnabled(store.getBoolValueForKey(WebPreferencesKey::largeImageAsyncDecodingEnabledKey()));
+ settings.setAnimatedImageAsyncDecodingEnabled(store.getBoolValueForKey(WebPreferencesKey::animatedImageAsyncDecodingEnabledKey()));
}
#if ENABLE(DATA_DETECTION)
Modified: trunk/Tools/ChangeLog (209158 => 209159)
--- trunk/Tools/ChangeLog 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Tools/ChangeLog 2016-11-30 23:48:00 UTC (rev 209159)
@@ -1,3 +1,27 @@
+2016-11-30 Said Abou-Hallawa <[email protected]>
+
+ Add separate settings and preferences to enable/disable async decoding for large images and animated images
+ https://bugs.webkit.org/show_bug.cgi?id=165177
+
+ Reviewed by Simon Fraser.
+
+ Pref and a menu item to toggle async image decoding settings for WebKits 1 and 2.
+
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+ (-[SettingsController toggleLargeImageAsyncDecodingEnabled:]):
+ (-[SettingsController largeImageAsyncDecodingEnabled]):
+ (-[SettingsController toggleAnimatedImageAsyncDecodingEnabled:]):
+ (-[SettingsController animatedImageAsyncDecodingEnabled]):
+ (-[SettingsController toggleAsyncImageDecodingEnabled:]): Deleted.
+ (-[SettingsController asyncImageDecodingEnabled]): Deleted.
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController didChangeSettings]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController didChangeSettings]):
+
2016-11-30 Jonathan Bedard <[email protected]>
Make it possible to use an existing simulator instance for one-off testing
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (209158 => 209159)
--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2016-11-30 23:48:00 UTC (rev 209159)
@@ -50,7 +50,8 @@
@property (nonatomic, readonly) BOOL displayListDrawingEnabled;
@property (nonatomic, readonly) BOOL resourceLoadStatisticsEnabled;
@property (nonatomic, readonly) BOOL visualViewportEnabled;
-@property (nonatomic, readonly) BOOL asyncImageDecodingEnabled;
+@property (nonatomic, readonly) BOOL largeImageAsyncDecodingEnabled;
+@property (nonatomic, readonly) BOOL animatedImageAsyncDecodingEnabled;
@property (nonatomic, readonly) BOOL loadsAllSiteIcons;
@property (nonatomic, readonly) BOOL usesGameControllerFramework;
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (209158 => 209159)
--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2016-11-30 23:48:00 UTC (rev 209159)
@@ -56,7 +56,8 @@
static NSString * const EnableSubPixelCSSOMMetricsPreferenceKey = @"EnableSubPixelCSSOMMetrics";
static NSString * const VisualViewportEnabledPreferenceKey = @"VisualViewportEnabled";
-static NSString * const AsyncImageDecodingEnabledPreferenceKey = @"AsyncImageDecodingEnabled";
+static NSString * const LargeImageAsyncDecodingEnabledPreferenceKey = @"LargeImageAsyncDecodingEnabled";
+static NSString * const AnimatedImageAsyncDecodingEnabledPreferenceKey = @"AnimatedImageAsyncDecodingEnabled";
// This default name intentionally overlaps with the key that WebKit2 checks when creating a view.
static NSString * const UseRemoteLayerTreeDrawingAreaPreferenceKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
@@ -128,7 +129,8 @@
[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 _addItemWithTitle:@"Enable Large Image Async Decoding" action:@selector(toggleLargeImageAsyncDecodingEnabled:) indented:NO];
+ [self _addItemWithTitle:@"Enable Animated Image Async Decoding" action:@selector(toggleAnimatedImageAsyncDecodingEnabled:) indented:NO];
[self _addHeaderWithTitle:@"WebKit2-only Settings"];
@@ -203,8 +205,10 @@
[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(toggleLargeImageAsyncDecodingEnabled:))
+ [menuItem setState:[self largeImageAsyncDecodingEnabled] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleAnimatedImageAsyncDecodingEnabled:))
+ [menuItem setState:[self animatedImageAsyncDecodingEnabled] ? NSOnState : NSOffState];
else if (action == @selector(toggleVisualViewportEnabled:))
[menuItem setState:[self visualViewportEnabled] ? NSOnState : NSOffState];
else if (action == @selector(toggleShowTiledScrollingIndicator:))
@@ -412,16 +416,26 @@
return [[NSUserDefaults standardUserDefaults] boolForKey:ResourceLoadStatisticsEnabledPreferenceKey];
}
-- (void)toggleAsyncImageDecodingEnabled:(id)sender
+- (void)toggleLargeImageAsyncDecodingEnabled:(id)sender
{
- [self _toggleBooleanDefault:AsyncImageDecodingEnabledPreferenceKey];
+ [self _toggleBooleanDefault:LargeImageAsyncDecodingEnabledPreferenceKey];
}
-- (BOOL)asyncImageDecodingEnabled
+- (BOOL)largeImageAsyncDecodingEnabled
{
- return [[NSUserDefaults standardUserDefaults] boolForKey:AsyncImageDecodingEnabledPreferenceKey];
+ return [[NSUserDefaults standardUserDefaults] boolForKey:LargeImageAsyncDecodingEnabledPreferenceKey];
}
+- (void)toggleAnimatedImageAsyncDecodingEnabled:(id)sender
+{
+ [self _toggleBooleanDefault:AnimatedImageAsyncDecodingEnabledPreferenceKey];
+}
+
+- (BOOL)animatedImageAsyncDecodingEnabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:AnimatedImageAsyncDecodingEnabledPreferenceKey];
+}
+
- (void)toggleEnableSubPixelCSSOMMetrics:(id)sender
{
[self _toggleBooleanDefault:EnableSubPixelCSSOMMetricsPreferenceKey];
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (209158 => 209159)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2016-11-30 23:48:00 UTC (rev 209159)
@@ -282,7 +282,8 @@
[[WebPreferences standardPreferences] setAcceleratedDrawingEnabled:settings.acceleratedDrawingEnabled];
[[WebPreferences standardPreferences] setResourceLoadStatisticsEnabled:settings.resourceLoadStatisticsEnabled];
[[WebPreferences standardPreferences] setVisualViewportEnabled:settings.visualViewportEnabled];
- [[WebPreferences standardPreferences] setAsyncImageDecodingEnabled:settings.asyncImageDecodingEnabled];
+ [[WebPreferences standardPreferences] setLargeImageAsyncDecodingEnabled:settings.largeImageAsyncDecodingEnabled];
+ [[WebPreferences standardPreferences] setAnimatedImageAsyncDecodingEnabled:settings.animatedImageAsyncDecodingEnabled];
BOOL useTransparentWindows = settings.useTransparentWindows;
if (useTransparentWindows != !self.window.isOpaque) {
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (209158 => 209159)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-11-30 23:48:00 UTC (rev 209159)
@@ -375,7 +375,8 @@
preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
preferences._displayListDrawingEnabled = settings.displayListDrawingEnabled;
preferences._visualViewportEnabled = settings.visualViewportEnabled;
- preferences._asyncImageDecodingEnabled = settings.asyncImageDecodingEnabled;
+ preferences._largeImageAsyncDecodingEnabled = settings.largeImageAsyncDecodingEnabled;
+ preferences._animatedImageAsyncDecodingEnabled = settings.animatedImageAsyncDecodingEnabled;
_webView.configuration.websiteDataStore._resourceLoadStatisticsEnabled = settings.resourceLoadStatisticsEnabled;