Changeset 209159 in webkit

Timestamp:

Nov 30, 2016 3:48:00 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2016-11-30
Reviewed by Simon Fraser.
Source/WebCore:

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:

Source/WebKit/mac:

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:]):

Source/WebKit2:

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):

Tools:

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]):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/cache/CachedImage.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedImage.h (modified) (2 diffs)
• Source/WebCore/page/Settings.in (modified) (1 diff)
• Source/WebCore/platform/graphics/BitmapImage.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/BitmapImage.h (modified) (1 diff)
• Source/WebCore/platform/graphics/ImageObserver.h (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) (1 diff)
• 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/InjectedBundle/InjectedBundle.cpp (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/WK1BrowserWindowController.m (modified) (1 diff)
• Tools/MiniBrowser/mac/WK2BrowserWindowController.m (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-30  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        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  <zalan@apple.com>
 

trunk/Source/WebCore/loader/cache/CachedImage.cpp

@@ -93 +93 @@
     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();
     }

trunk/Source/WebCore/loader/cache/CachedImage.h

@@ -119 +119 @@
     // 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;
@@ -146 +147 @@
     bool m_allowSubsampling { false };
 #endif
-    bool m_allowAsyncImageDecoding { true };
+    bool m_allowLargeImageAsyncDecoding { true };
+    bool m_allowAnimatedImageAsyncDecoding { true };
     bool m_showDebugBackground { false };
 };

trunk/Source/WebCore/page/Settings.in

@@ -290 +290 @@
 forcedPrefersReducedMotionAccessibilityValue type=ForcedAccessibilityValue, initial=defaultForcedPrefersReducedMotionAccessibilityValue
 
-asyncImageDecodingEnabled initial=true
+largeImageAsyncDecodingEnabled initial=true
+animatedImageAsyncDecodingEnabled initial=true
 
 es6ModulesEnabled initial=false

trunk/Source/WebCore/platform/graphics/BitmapImage.cpp

@@ -279 +279 @@
     // 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);

trunk/Source/WebCore/platform/graphics/BitmapImage.h

@@ -135 +135 @@
 
     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(); }
 

trunk/Source/WebCore/platform/graphics/ImageObserver.h

@@ -39 +39 @@
 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;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2016-11-30  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        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  <aestes@apple.com>
 

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

@@ -142 +142 @@
 #define WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey @"WebKitSubpixelCSSOMElementMetricsEnabled"
 #define WebKitResourceLoadStatisticsEnabledPreferenceKey @"WebKitResourceLoadStatisticsEnabled"
-#define WebKitAsyncImageDecodingEnabledPreferenceKey @"WebKitAsyncImageDecodingEnabledEnabled"
+#define WebKitLargeImageAsyncDecodingEnabledPreferenceKey @"WebKitLargeImageAsyncDecodingEnabled"
+#define WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey @"WebKitAnimatedImageAsyncDecodingEnabled"
 #if TARGET_OS_IPHONE
 #define WebKitAudioSessionCategoryOverride @"WebKitAudioSessionCategoryOverride"

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

@@ -508 +508 @@
         [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,
@@ -1888 +1889 @@
 }
 
-- (BOOL)asyncImageDecodingEnabled
-{
-    return [self _boolValueForKey:WebKitAsyncImageDecodingEnabledPreferenceKey];
-}
-
-- (void)setAsyncImageDecodingEnabled:(BOOL)enabled
-{
-    [self _setBoolValue:enabled forKey:WebKitAsyncImageDecodingEnabledPreferenceKey];
+- (BOOL)largeImageAsyncDecodingEnabled
+{
+    return [self _boolValueForKey:WebKitLargeImageAsyncDecodingEnabledPreferenceKey];
+}
+
+- (void)setLargeImageAsyncDecodingEnabled:(BOOL)enabled
+{
+    [self _setBoolValue:enabled forKey:WebKitLargeImageAsyncDecodingEnabledPreferenceKey];
+}
+
+- (BOOL)animatedImageAsyncDecodingEnabled
+{
+    return [self _boolValueForKey:WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey];
+}
+
+- (void)setAnimatedImageAsyncDecodingEnabled:(BOOL)enabled
+{
+    [self _setBoolValue:enabled forKey:WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey];
 }
 

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

@@ -514 +514 @@
 
 @property (nonatomic) BOOL visualViewportEnabled;
-@property (nonatomic) BOOL asyncImageDecodingEnabled;
+@property (nonatomic) BOOL largeImageAsyncDecodingEnabled;
+@property (nonatomic) BOOL animatedImageAsyncDecodingEnabled;
 @property (nonatomic) BOOL javaScriptMarkupEnabled;
 @property (nonatomic) BOOL mediaDataLoadsAutomatically;

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

@@ -2901 +2901 @@
     settings.setShouldConvertInvalidURLsToBlank(shouldConvertInvalidURLsToBlank());
 
-    settings.setAsyncImageDecodingEnabled([preferences asyncImageDecodingEnabled]);
+    settings.setLargeImageAsyncDecodingEnabled([preferences largeImageAsyncDecodingEnabled]);
+    settings.setAnimatedImageAsyncDecodingEnabled([preferences animatedImageAsyncDecodingEnabled]);
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-11-30  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        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  <cdumez@apple.com>
 

trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h

@@ -241 +241 @@
     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, "", "") \

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

@@ -326 +326 @@
 }
 
-- (BOOL)_asyncImageDecodingEnabled
-{
-    return _preferences->asyncImageDecodingEnabled();
-}
-
-- (void)_setAsyncImageDecodingEnabled:(BOOL)_asyncImageDecodingEnabled
-{
-    _preferences->setAsyncImageDecodingEnabled(_asyncImageDecodingEnabled);
+- (BOOL)_largeImageAsyncDecodingEnabled
+{
+    return _preferences->largeImageAsyncDecodingEnabled();
+}
+
+- (void)_setLargeImageAsyncDecodingEnabled:(BOOL)_largeImageAsyncDecodingEnabled
+{
+    _preferences->setLargeImageAsyncDecodingEnabled(_largeImageAsyncDecodingEnabled);
+}
+
+- (BOOL)_animatedImageAsyncDecodingEnabled
+{
+    return _preferences->animatedImageAsyncDecodingEnabled();
+}
+
+- (void)_setAnimatedImageAsyncDecodingEnabled:(BOOL)_animatedImageAsyncDecodingEnabled
+{
+    _preferences->setAnimatedImageAsyncDecodingEnabled(_animatedImageAsyncDecodingEnabled);
 }
 

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

@@ -65 +65 @@
 @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));
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -243 +243 @@
     macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled) \
     macro(WebKitVisualViewportEnabled, VisualViewportEnabled, visualViewportEnabled) \
-    macro(WebKitAsyncImageDecodingEnabled, AsyncImageDecodingEnabled, asyncImageDecodingEnabled) \
+    macro(WebKitLargeImageAsyncDecodingEnabled, LargeImageAsyncDecodingEnabled, largeImageAsyncDecodingEnabled) \
+    macro(WebKitAnimatedImageAsyncDecodingEnabled, AnimatedImageAsyncDecodingEnabled, animatedImageAsyncDecodingEnabled) \
     macro(WebKitES6ModulesEnabled, Es6ModulesEnabled, es6ModulesEnabled) \
     \

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

@@ -3220 +3220 @@
     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()));
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2016-11-30  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        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  <jbedard@apple.com>
 

trunk/Tools/MiniBrowser/mac/SettingsController.h

@@ -51 +51 @@
 @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;

trunk/Tools/MiniBrowser/mac/SettingsController.m

@@ -57 +57 @@
 
 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.
@@ -129 +130 @@
     [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"];
@@ -204 +206 @@
     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];
@@ -413 +417 @@
 }
 
-- (void)toggleAsyncImageDecodingEnabled:(id)sender
-{
-    [self _toggleBooleanDefault:AsyncImageDecodingEnabledPreferenceKey];
-}
-
-- (BOOL)asyncImageDecodingEnabled
-{
-    return [[NSUserDefaults standardUserDefaults] boolForKey:AsyncImageDecodingEnabledPreferenceKey];
+- (void)toggleLargeImageAsyncDecodingEnabled:(id)sender
+{
+    [self _toggleBooleanDefault:LargeImageAsyncDecodingEnabledPreferenceKey];
+}
+
+- (BOOL)largeImageAsyncDecodingEnabled
+{
+    return [[NSUserDefaults standardUserDefaults] boolForKey:LargeImageAsyncDecodingEnabledPreferenceKey];
+}
+
+- (void)toggleAnimatedImageAsyncDecodingEnabled:(id)sender
+{
+    [self _toggleBooleanDefault:AnimatedImageAsyncDecodingEnabledPreferenceKey];
+}
+
+- (BOOL)animatedImageAsyncDecodingEnabled
+{
+    return [[NSUserDefaults standardUserDefaults] boolForKey:AnimatedImageAsyncDecodingEnabledPreferenceKey];
 }
 

trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m

@@ -283 +283 @@
     [[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;

trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

@@ -376 +376 @@
     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;