<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209159] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209159">209159</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-30 15:48:00 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImageh">trunk/Source/WebCore/loader/cache/CachedImage.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImagecpp">trunk/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImageh">trunk/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageObserverh">trunk/Source/WebCore/platform/graphics/ImageObserver.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerh">trunk/Tools/MiniBrowser/mac/SettingsController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerm">trunk/Tools/MiniBrowser/mac/SettingsController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-11-30 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: layoutState->m_renderer == this in WebCore::RenderBlock::offsetFromLogicalTopOfFirstPage
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -92,7 +92,8 @@
</span><span class="cx">
</span><span class="cx"> if (m_loader) {
</span><span class="cx"> m_allowSubsampling = m_loader->frameLoader()->frame().settings().imageSubsamplingEnabled();
</span><del>- m_allowAsyncImageDecoding = m_loader->frameLoader()->frame().settings().asyncImageDecodingEnabled();
</del><ins>+ m_allowLargeImageAsyncDecoding = m_loader->frameLoader()->frame().settings().largeImageAsyncDecodingEnabled();
+ m_allowAnimatedImageAsyncDecoding = m_loader->frameLoader()->frame().settings().animatedImageAsyncDecodingEnabled();
</ins><span class="cx"> m_showDebugBackground = m_loader->frameLoader()->frame().settings().showDebugBorders();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -118,7 +118,8 @@
</span><span class="cx">
</span><span class="cx"> // ImageObserver
</span><span class="cx"> bool allowSubsampling() const override { return m_allowSubsampling; }
</span><del>- bool allowAsyncImageDecoding() const override { return m_allowAsyncImageDecoding; }
</del><ins>+ bool allowLargeImageAsyncDecoding() const override { return m_allowLargeImageAsyncDecoding; }
+ bool allowAnimatedImageAsyncDecoding() const override { return m_allowAnimatedImageAsyncDecoding; }
</ins><span class="cx"> bool showDebugBackground() const override { return m_showDebugBackground; }
</span><span class="cx"> void decodedSizeChanged(const Image*, long long delta) override;
</span><span class="cx"> void didDraw(const Image*) override;
</span><span class="lines">@@ -145,7 +146,8 @@
</span><span class="cx"> #else
</span><span class="cx"> bool m_allowSubsampling { false };
</span><span class="cx"> #endif
</span><del>- bool m_allowAsyncImageDecoding { true };
</del><ins>+ bool m_allowLargeImageAsyncDecoding { true };
+ bool m_allowAnimatedImageAsyncDecoding { true };
</ins><span class="cx"> bool m_showDebugBackground { false };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -289,7 +289,8 @@
</span><span class="cx"> forcedDisplayIsMonochromeAccessibilityValue type=ForcedAccessibilityValue, initial=defaultForcedDisplayIsMonochromeAccessibilityValue
</span><span class="cx"> forcedPrefersReducedMotionAccessibilityValue type=ForcedAccessibilityValue, initial=defaultForcedPrefersReducedMotionAccessibilityValue
</span><span class="cx">
</span><del>-asyncImageDecodingEnabled initial=true
</del><ins>+largeImageAsyncDecodingEnabled initial=true
+animatedImageAsyncDecodingEnabled initial=true
</ins><span class="cx">
</span><span class="cx"> es6ModulesEnabled initial=false
</span><span class="cx"> pointerLockEnabled initial=false
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> // it will be decoded on a separate work queue. When decoding nextFrame finishes, we will be notified
</span><span class="cx"> // through the callback newFrameNativeImageAvailableAtIndex(). Otherwise, advanceAnimation() will be called
</span><span class="cx"> // when the timer fires and m_currentFrame will be advanced to nextFrame since it is not being decoded.
</span><del>- if ((allowAsyncImageDecoding() && m_source.isAsyncDecodingRequired()) || isAsyncDecodingForcedForTesting()) {
</del><ins>+ if ((allowAnimatedImageAsyncDecoding() && m_source.isAsyncDecodingRequired()) || isAsyncDecodingForcedForTesting()) {
</ins><span class="cx"> if (!m_source.requestFrameAsyncDecodingAtIndex(nextFrame, m_currentSubsamplingLevel))
</span><span class="cx"> LOG(Images, "BitmapImage %p %s - cachedFrameCount %ld nextFrame %ld", this, __FUNCTION__, ++m_cachedFrameCount, nextFrame);
</span><span class="cx"> m_desiredFrameDecodeTimeForTesting = time + std::max(m_frameDecodingDurationForTesting, 0.0f);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -134,7 +134,8 @@
</span><span class="cx"> NativeImagePtr frameImageAtIndex(size_t, SubsamplingLevel = SubsamplingLevel::Default, const GraphicsContext* = nullptr);
</span><span class="cx">
</span><span class="cx"> bool allowSubsampling() const { return imageObserver() && imageObserver()->allowSubsampling(); }
</span><del>- bool allowAsyncImageDecoding() const { return imageObserver() && imageObserver()->allowAsyncImageDecoding(); }
</del><ins>+ bool allowLargeImageAsyncDecoding() const { return imageObserver() && imageObserver()->allowLargeImageAsyncDecoding(); }
+ bool allowAnimatedImageAsyncDecoding() const { return imageObserver() && imageObserver()->allowAnimatedImageAsyncDecoding(); }
</ins><span class="cx"> bool showDebugBackground() const { return imageObserver() && imageObserver()->showDebugBackground(); }
</span><span class="cx">
</span><span class="cx"> // Called to invalidate cached data. When |destroyAll| is true, we wipe out
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageObserver.h (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx"> virtual ~ImageObserver() {}
</span><span class="cx"> public:
</span><span class="cx"> virtual bool allowSubsampling() const = 0;
</span><del>- virtual bool allowAsyncImageDecoding() const = 0;
</del><ins>+ virtual bool allowLargeImageAsyncDecoding() const = 0;
+ virtual bool allowAnimatedImageAsyncDecoding() const = 0;
</ins><span class="cx"> virtual bool showDebugBackground() const = 0;
</span><span class="cx"> virtual void decodedSizeChanged(const Image*, long long delta) = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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:]):
+
</ins><span class="cx"> 2016-11-29 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Enable two clang warnings recommended by Xcode
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -141,7 +141,8 @@
</span><span class="cx"> #define WebKitSuppressesIncrementalRenderingKey @"WebKitSuppressesIncrementalRendering"
</span><span class="cx"> #define WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey @"WebKitSubpixelCSSOMElementMetricsEnabled"
</span><span class="cx"> #define WebKitResourceLoadStatisticsEnabledPreferenceKey @"WebKitResourceLoadStatisticsEnabled"
</span><del>-#define WebKitAsyncImageDecodingEnabledPreferenceKey @"WebKitAsyncImageDecodingEnabledEnabled"
</del><ins>+#define WebKitLargeImageAsyncDecodingEnabledPreferenceKey @"WebKitLargeImageAsyncDecodingEnabled"
+#define WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey @"WebKitAnimatedImageAsyncDecodingEnabled"
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> #define WebKitAudioSessionCategoryOverride @"WebKitAudioSessionCategoryOverride"
</span><span class="cx"> #define WebKitAVKitEnabled @"WebKitAVKitEnabled"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -507,7 +507,8 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitAccelerated2dCanvasEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitResourceLoadStatisticsEnabledPreferenceKey,
</span><del>- [NSNumber numberWithBool:YES], WebKitAsyncImageDecodingEnabledPreferenceKey,
</del><ins>+ [NSNumber numberWithBool:YES], WebKitLargeImageAsyncDecodingEnabledPreferenceKey,
+ [NSNumber numberWithBool:YES], WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey,
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitFrameFlatteningEnabledPreferenceKey,
</span><span class="cx"> #else
</span><span class="lines">@@ -1887,16 +1888,26 @@
</span><span class="cx"> [self _setBoolValue:enabled forKey:WebKitResourceLoadStatisticsEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)asyncImageDecodingEnabled
</del><ins>+- (BOOL)largeImageAsyncDecodingEnabled
</ins><span class="cx"> {
</span><del>- return [self _boolValueForKey:WebKitAsyncImageDecodingEnabledPreferenceKey];
</del><ins>+ return [self _boolValueForKey:WebKitLargeImageAsyncDecodingEnabledPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setAsyncImageDecodingEnabled:(BOOL)enabled
</del><ins>+- (void)setLargeImageAsyncDecodingEnabled:(BOOL)enabled
</ins><span class="cx"> {
</span><del>- [self _setBoolValue:enabled forKey:WebKitAsyncImageDecodingEnabledPreferenceKey];
</del><ins>+ [self _setBoolValue:enabled forKey:WebKitLargeImageAsyncDecodingEnabledPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)animatedImageAsyncDecodingEnabled
+{
+ return [self _boolValueForKey:WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey];
+}
+
+- (void)setAnimatedImageAsyncDecodingEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (BOOL)canvasUsesAcceleratedDrawing
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitCanvasUsesAcceleratedDrawingPreferenceKey];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -513,7 +513,8 @@
</span><span class="cx"> - (BOOL)modernMediaControlsEnabled;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic) BOOL visualViewportEnabled;
</span><del>-@property (nonatomic) BOOL asyncImageDecodingEnabled;
</del><ins>+@property (nonatomic) BOOL largeImageAsyncDecodingEnabled;
+@property (nonatomic) BOOL animatedImageAsyncDecodingEnabled;
</ins><span class="cx"> @property (nonatomic) BOOL javaScriptMarkupEnabled;
</span><span class="cx"> @property (nonatomic) BOOL mediaDataLoadsAutomatically;
</span><span class="cx"> @property (nonatomic) BOOL attachmentElementEnabled;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2900,7 +2900,8 @@
</span><span class="cx">
</span><span class="cx"> settings.setShouldConvertInvalidURLsToBlank(shouldConvertInvalidURLsToBlank());
</span><span class="cx">
</span><del>- settings.setAsyncImageDecodingEnabled([preferences asyncImageDecodingEnabled]);
</del><ins>+ settings.setLargeImageAsyncDecodingEnabled([preferences largeImageAsyncDecodingEnabled]);
+ settings.setAnimatedImageAsyncDecodingEnabled([preferences animatedImageAsyncDecodingEnabled]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline IMP getMethod(id o, SEL s)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-11-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Turn on HTML interactive form validation feature
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -240,7 +240,8 @@
</span><span class="cx"> macro(ApplePayCapabilityDisclosureAllowed, applePayCapabilityDisclosureAllowed, Bool, bool, true, "", "") \
</span><span class="cx"> macro(VisualViewportEnabled, visualViewportEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(NeedsStorageAccessFromFileURLsQuirk, needsStorageAccessFromFileURLsQuirk, Bool, bool, true, "", "") \
</span><del>- macro(AsyncImageDecodingEnabled, asyncImageDecodingEnabled, Bool, bool, true, "", "") \
</del><ins>+ macro(LargeImageAsyncDecodingEnabled, largeImageAsyncDecodingEnabled, Bool, bool, true, "", "") \
+ macro(AnimatedImageAsyncDecodingEnabled, animatedImageAsyncDecodingEnabled, Bool, bool, true, "", "") \
</ins><span class="cx"> macro(CustomElementsEnabled, customElementsEnabled, Bool, bool, true, "", "") \
</span><span class="cx"> macro(EncryptedMediaAPIEnabled, encryptedMediaAPIEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(IntersectionObserverEnabled, intersectionObserverEnabled, Bool, bool, false, "Intersection Observer", "Enable Intersection Observer support") \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -325,16 +325,26 @@
</span><span class="cx"> _preferences->setVisualViewportEnabled(_visualViewportEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_asyncImageDecodingEnabled
</del><ins>+- (BOOL)_largeImageAsyncDecodingEnabled
</ins><span class="cx"> {
</span><del>- return _preferences->asyncImageDecodingEnabled();
</del><ins>+ return _preferences->largeImageAsyncDecodingEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setAsyncImageDecodingEnabled:(BOOL)_asyncImageDecodingEnabled
</del><ins>+- (void)_setLargeImageAsyncDecodingEnabled:(BOOL)_largeImageAsyncDecodingEnabled
</ins><span class="cx"> {
</span><del>- _preferences->setAsyncImageDecodingEnabled(_asyncImageDecodingEnabled);
</del><ins>+ _preferences->setLargeImageAsyncDecodingEnabled(_largeImageAsyncDecodingEnabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_animatedImageAsyncDecodingEnabled
+{
+ return _preferences->animatedImageAsyncDecodingEnabled();
+}
+
+- (void)_setAnimatedImageAsyncDecodingEnabled:(BOOL)_animatedImageAsyncDecodingEnabled
+{
+ _preferences->setAnimatedImageAsyncDecodingEnabled(_animatedImageAsyncDecodingEnabled);
+}
+
</ins><span class="cx"> - (BOOL)_textAutosizingEnabled
</span><span class="cx"> {
</span><span class="cx"> return _preferences->textAutosizingEnabled();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -64,7 +64,8 @@
</span><span class="cx"> @property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><span class="cx"> @property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><span class="cx"> @property (nonatomic, setter=_setVisualViewportEnabled:) BOOL _visualViewportEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><del>-@property (nonatomic, setter=_setAsyncImageDecodingEnabled:) BOOL _asyncImageDecodingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</del><ins>+@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));
</ins><span class="cx"> @property (nonatomic, setter=_setTextAutosizingEnabled:) BOOL _textAutosizingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -242,7 +242,8 @@
</span><span class="cx"> macro(WebKitMediaStreamEnabled, MediaStreamEnabled, mediaStreamEnabled) \
</span><span class="cx"> macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled) \
</span><span class="cx"> macro(WebKitVisualViewportEnabled, VisualViewportEnabled, visualViewportEnabled) \
</span><del>- macro(WebKitAsyncImageDecodingEnabled, AsyncImageDecodingEnabled, asyncImageDecodingEnabled) \
</del><ins>+ macro(WebKitLargeImageAsyncDecodingEnabled, LargeImageAsyncDecodingEnabled, largeImageAsyncDecodingEnabled) \
+ macro(WebKitAnimatedImageAsyncDecodingEnabled, AnimatedImageAsyncDecodingEnabled, animatedImageAsyncDecodingEnabled) \
</ins><span class="cx"> macro(WebKitES6ModulesEnabled, Es6ModulesEnabled, es6ModulesEnabled) \
</span><span class="cx"> \
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3219,7 +3219,8 @@
</span><span class="cx"> m_viewportConfiguration.setCanIgnoreScalingConstraints(m_ignoreViewportScalingConstraints);
</span><span class="cx"> setForceAlwaysUserScalable(m_forceAlwaysUserScalable || store.getBoolValueForKey(WebPreferencesKey::forceAlwaysUserScalableKey()));
</span><span class="cx"> #endif
</span><del>- settings.setAsyncImageDecodingEnabled(store.getBoolValueForKey(WebPreferencesKey::asyncImageDecodingEnabledKey()));
</del><ins>+ settings.setLargeImageAsyncDecodingEnabled(store.getBoolValueForKey(WebPreferencesKey::largeImageAsyncDecodingEnabledKey()));
+ settings.setAnimatedImageAsyncDecodingEnabled(store.getBoolValueForKey(WebPreferencesKey::animatedImageAsyncDecodingEnabledKey()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATA_DETECTION)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-30 23:12:45 UTC (rev 209158)
+++ trunk/Tools/ChangeLog 2016-11-30 23:48:00 UTC (rev 209159)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+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]):
+
</ins><span class="cx"> 2016-11-30 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to use an existing simulator instance for one-off testing
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,7 +50,8 @@
</span><span class="cx"> @property (nonatomic, readonly) BOOL displayListDrawingEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL resourceLoadStatisticsEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL visualViewportEnabled;
</span><del>-@property (nonatomic, readonly) BOOL asyncImageDecodingEnabled;
</del><ins>+@property (nonatomic, readonly) BOOL largeImageAsyncDecodingEnabled;
+@property (nonatomic, readonly) BOOL animatedImageAsyncDecodingEnabled;
</ins><span class="cx"> @property (nonatomic, readonly) BOOL loadsAllSiteIcons;
</span><span class="cx"> @property (nonatomic, readonly) BOOL usesGameControllerFramework;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,7 +56,8 @@
</span><span class="cx"> static NSString * const EnableSubPixelCSSOMMetricsPreferenceKey = @"EnableSubPixelCSSOMMetrics";
</span><span class="cx">
</span><span class="cx"> static NSString * const VisualViewportEnabledPreferenceKey = @"VisualViewportEnabled";
</span><del>-static NSString * const AsyncImageDecodingEnabledPreferenceKey = @"AsyncImageDecodingEnabled";
</del><ins>+static NSString * const LargeImageAsyncDecodingEnabledPreferenceKey = @"LargeImageAsyncDecodingEnabled";
+static NSString * const AnimatedImageAsyncDecodingEnabledPreferenceKey = @"AnimatedImageAsyncDecodingEnabled";
</ins><span class="cx">
</span><span class="cx"> // This default name intentionally overlaps with the key that WebKit2 checks when creating a view.
</span><span class="cx"> static NSString * const UseRemoteLayerTreeDrawingAreaPreferenceKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
</span><span class="lines">@@ -128,7 +129,8 @@
</span><span class="cx"> [self _addItemWithTitle:@"Enable Display List Drawing" action:@selector(toggleDisplayListDrawingEnabled:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Enable Visual Viewport" action:@selector(toggleVisualViewportEnabled:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Enable Resource Load Statistics" action:@selector(toggleResourceLoadStatisticsEnabled:) indented:NO];
</span><del>- [self _addItemWithTitle:@"Enable Async Image Decoding" action:@selector(toggleAsyncImageDecodingEnabled:) indented:NO];
</del><ins>+ [self _addItemWithTitle:@"Enable Large Image Async Decoding" action:@selector(toggleLargeImageAsyncDecodingEnabled:) indented:NO];
+ [self _addItemWithTitle:@"Enable Animated Image Async Decoding" action:@selector(toggleAnimatedImageAsyncDecodingEnabled:) indented:NO];
</ins><span class="cx">
</span><span class="cx"> [self _addHeaderWithTitle:@"WebKit2-only Settings"];
</span><span class="cx">
</span><span class="lines">@@ -203,8 +205,10 @@
</span><span class="cx"> [menuItem setState:[self displayListDrawingEnabled] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleResourceLoadStatisticsEnabled:))
</span><span class="cx"> [menuItem setState:[self resourceLoadStatisticsEnabled] ? NSOnState : NSOffState];
</span><del>- else if (action == @selector(toggleAsyncImageDecodingEnabled:))
- [menuItem setState:[self asyncImageDecodingEnabled] ? NSOnState : NSOffState];
</del><ins>+ else if (action == @selector(toggleLargeImageAsyncDecodingEnabled:))
+ [menuItem setState:[self largeImageAsyncDecodingEnabled] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleAnimatedImageAsyncDecodingEnabled:))
+ [menuItem setState:[self animatedImageAsyncDecodingEnabled] ? NSOnState : NSOffState];
</ins><span class="cx"> else if (action == @selector(toggleVisualViewportEnabled:))
</span><span class="cx"> [menuItem setState:[self visualViewportEnabled] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleShowTiledScrollingIndicator:))
</span><span class="lines">@@ -412,16 +416,26 @@
</span><span class="cx"> return [[NSUserDefaults standardUserDefaults] boolForKey:ResourceLoadStatisticsEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)toggleAsyncImageDecodingEnabled:(id)sender
</del><ins>+- (void)toggleLargeImageAsyncDecodingEnabled:(id)sender
</ins><span class="cx"> {
</span><del>- [self _toggleBooleanDefault:AsyncImageDecodingEnabledPreferenceKey];
</del><ins>+ [self _toggleBooleanDefault:LargeImageAsyncDecodingEnabledPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)asyncImageDecodingEnabled
</del><ins>+- (BOOL)largeImageAsyncDecodingEnabled
</ins><span class="cx"> {
</span><del>- return [[NSUserDefaults standardUserDefaults] boolForKey:AsyncImageDecodingEnabledPreferenceKey];
</del><ins>+ return [[NSUserDefaults standardUserDefaults] boolForKey:LargeImageAsyncDecodingEnabledPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)toggleAnimatedImageAsyncDecodingEnabled:(id)sender
+{
+ [self _toggleBooleanDefault:AnimatedImageAsyncDecodingEnabledPreferenceKey];
+}
+
+- (BOOL)animatedImageAsyncDecodingEnabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:AnimatedImageAsyncDecodingEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (void)toggleEnableSubPixelCSSOMMetrics:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [self _toggleBooleanDefault:EnableSubPixelCSSOMMetricsPreferenceKey];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -282,7 +282,8 @@
</span><span class="cx"> [[WebPreferences standardPreferences] setAcceleratedDrawingEnabled:settings.acceleratedDrawingEnabled];
</span><span class="cx"> [[WebPreferences standardPreferences] setResourceLoadStatisticsEnabled:settings.resourceLoadStatisticsEnabled];
</span><span class="cx"> [[WebPreferences standardPreferences] setVisualViewportEnabled:settings.visualViewportEnabled];
</span><del>- [[WebPreferences standardPreferences] setAsyncImageDecodingEnabled:settings.asyncImageDecodingEnabled];
</del><ins>+ [[WebPreferences standardPreferences] setLargeImageAsyncDecodingEnabled:settings.largeImageAsyncDecodingEnabled];
+ [[WebPreferences standardPreferences] setAnimatedImageAsyncDecodingEnabled:settings.animatedImageAsyncDecodingEnabled];
</ins><span class="cx">
</span><span class="cx"> BOOL useTransparentWindows = settings.useTransparentWindows;
</span><span class="cx"> if (useTransparentWindows != !self.window.isOpaque) {
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (209158 => 209159)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -375,7 +375,8 @@
</span><span class="cx"> preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
</span><span class="cx"> preferences._displayListDrawingEnabled = settings.displayListDrawingEnabled;
</span><span class="cx"> preferences._visualViewportEnabled = settings.visualViewportEnabled;
</span><del>- preferences._asyncImageDecodingEnabled = settings.asyncImageDecodingEnabled;
</del><ins>+ preferences._largeImageAsyncDecodingEnabled = settings.largeImageAsyncDecodingEnabled;
+ preferences._animatedImageAsyncDecodingEnabled = settings.animatedImageAsyncDecodingEnabled;
</ins><span class="cx">
</span><span class="cx"> _webView.configuration.websiteDataStore._resourceLoadStatisticsEnabled = settings.resourceLoadStatisticsEnabled;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>