<!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>[168452] trunk/Source</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/168452">168452</a></dd>
<dt>Author</dt> <dd>psolanki@apple.com</dd>
<dt>Date</dt> <dd>2014-05-07 16:28:50 -0700 (Wed, 07 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use system defaults for hardware jpeg decoding
https://bugs.webkit.org/show_bug.cgi?id=132661
<rdar://problem/11348201>
Reviewed by Tim Horton.
Remove code that explicitly disabled hardware image decoding. Let the system decide what to do.
Source/WebCore:
* WebCore.exp.in:
* platform/graphics/ImageSource.h:
(WebCore::ImageSource::acceleratedImageDecodingEnabled): Deleted.
(WebCore::ImageSource::setAcceleratedImageDecodingEnabled): Deleted.
* platform/graphics/cg/ImageSourceCG.cpp:
(WebCore::ImageSource::imageSourceOptions):
Source/WebKit/mac:
* WebView/WebView.mm:
(+[WebView _setAcceleratedImageDecoding:]):
(+[WebView _acceleratedImageDecoding]): Deleted.
* WebView/WebViewPrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageSourceh">trunk/Source/WebCore/platform/graphics/ImageSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageSourceCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewPrivateh">trunk/Source/WebKit/mac/WebView/WebViewPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168451 => 168452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebCore/ChangeLog 2014-05-07 23:28:50 UTC (rev 168452)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-05-07 Pratik Solanki <psolanki@apple.com>
+
+ Use system defaults for hardware jpeg decoding
+ https://bugs.webkit.org/show_bug.cgi?id=132661
+ <rdar://problem/11348201>
+
+ Reviewed by Tim Horton.
+
+ Remove code that explicitly disabled hardware image decoding. Let the system decide what to do.
+
+ * WebCore.exp.in:
+ * platform/graphics/ImageSource.h:
+ (WebCore::ImageSource::acceleratedImageDecodingEnabled): Deleted.
+ (WebCore::ImageSource::setAcceleratedImageDecodingEnabled): Deleted.
+ * platform/graphics/cg/ImageSourceCG.cpp:
+ (WebCore::ImageSource::imageSourceOptions):
+
</ins><span class="cx"> 2014-05-07 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> Use after free in WebCore::RenderObject::nextSibling / WebCore::RenderBoxModelObject::moveChildrenTo
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (168451 => 168452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-05-07 23:28:50 UTC (rev 168452)
</span><span class="lines">@@ -2455,7 +2455,6 @@
</span><span class="cx"> __ZN7WebCore11EditCommand18setEndingSelectionERKNS_16VisibleSelectionE
</span><span class="cx"> __ZN7WebCore11FileChooser16chooseMediaFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_PNS_4IconE
</span><span class="cx"> __ZN7WebCore11Geolocation29resetAllGeolocationPermissionEv
</span><del>-__ZN7WebCore11ImageSource26s_acceleratedImageDecodingE
</del><span class="cx"> __ZN7WebCore11MathMLNames4initEv
</span><span class="cx"> __ZN7WebCore11MemoryCache18pruneDeadResourcesEv
</span><span class="cx"> __ZN7WebCore11MemoryCache18pruneLiveResourcesEb
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageSource.h (168451 => 168452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageSource.h 2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebCore/platform/graphics/ImageSource.h 2014-05-07 23:28:50 UTC (rev 168452)
</span><span class="lines">@@ -166,11 +166,6 @@
</span><span class="cx"> static void setMaxPixelsPerDecodedImage(unsigned maxPixels) { s_maxPixelsPerDecodedImage = maxPixels; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- static bool acceleratedImageDecodingEnabled() { return s_acceleratedImageDecoding; }
- static void setAcceleratedImageDecodingEnabled(bool flag) { s_acceleratedImageDecoding = flag; }
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> NativeImageDecoderPtr m_decoder;
</span><span class="cx">
</span><span class="lines">@@ -185,7 +180,6 @@
</span><span class="cx"> mutable int m_baseSubsampling;
</span><span class="cx"> mutable bool m_isProgressive;
</span><span class="cx"> CFDictionaryRef imageSourceOptions(ShouldSkipMetadata, int subsampling = 0) const;
</span><del>- static bool s_acceleratedImageDecoding;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageSourceCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp (168451 => 168452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2014-05-07 23:28:50 UTC (rev 168452)
</span><span class="lines">@@ -53,10 +53,6 @@
</span><span class="cx"> const CFStringRef kCGImageSourceShouldPreferRGB32 = CFSTR("kCGImageSourceShouldPreferRGB32");
</span><span class="cx"> const CFStringRef kCGImageSourceSkipMetadata = CFSTR("kCGImageSourceSkipMetadata");
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-bool ImageSource::s_acceleratedImageDecoding;
-#endif
-
</del><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> size_t sharedBufferGetBytesAtPosition(void* info, void* buffer, off_t position, size_t count)
</span><span class="cx"> {
</span><span class="lines">@@ -133,11 +129,10 @@
</span><span class="cx"> if (!options[subsampling]) {
</span><span class="cx"> int subsampleInt = 1 << subsampling; // [0..3] => [1, 2, 4, 8]
</span><span class="cx"> RetainPtr<CFNumberRef> subsampleNumber = adoptCF(CFNumberCreate(nullptr, kCFNumberIntType, &subsampleInt));
</span><del>- const CFIndex numOptions = 5;
</del><ins>+ const CFIndex numOptions = 4;
</ins><span class="cx"> const CFBooleanRef imageSourceSkipMetaData = (skipMetaData == ImageSource::SkipMetadata) ? kCFBooleanTrue : kCFBooleanFalse;
</span><del>- const CFBooleanRef acceleratedImageDecoding = ImageSource::s_acceleratedImageDecoding ? kCFBooleanTrue : kCFBooleanFalse;
- const void* keys[numOptions] = { kCGImageSourceShouldCache, kCGImageSourceShouldPreferRGB32, kCGImageSourceSubsampleFactor, kCGImageSourceSkipMetadata, kCGImageSourceUseHardwareAcceleration };
- const void* values[numOptions] = { kCFBooleanTrue, kCFBooleanTrue, subsampleNumber.get(), imageSourceSkipMetaData, acceleratedImageDecoding };
</del><ins>+ const void* keys[numOptions] = { kCGImageSourceShouldCache, kCGImageSourceShouldPreferRGB32, kCGImageSourceSubsampleFactor, kCGImageSourceSkipMetadata };
+ const void* values[numOptions] = { kCFBooleanTrue, kCFBooleanTrue, subsampleNumber.get(), imageSourceSkipMetaData };
</ins><span class="cx"> options[subsampling] = CFDictionaryCreate(nullptr, keys, values, numOptions, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</span><span class="cx"> }
</span><span class="cx"> return options[subsampling];
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (168451 => 168452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-05-07 23:28:50 UTC (rev 168452)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-07 Pratik Solanki <psolanki@apple.com>
+
+ Use system defaults for hardware jpeg decoding
+ https://bugs.webkit.org/show_bug.cgi?id=132661
+ <rdar://problem/11348201>
+
+ Reviewed by Tim Horton.
+
+ Remove code that explicitly disabled hardware image decoding. Let the system decide what to do.
+
+ * WebView/WebView.mm:
+ (+[WebView _setAcceleratedImageDecoding:]):
+ (+[WebView _acceleratedImageDecoding]): Deleted.
+ * WebView/WebViewPrivate.h:
+
</ins><span class="cx"> 2014-05-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac, iOS] REGRESSION: WK2 YouTube support
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (168451 => 168452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-05-07 23:28:50 UTC (rev 168452)
</span><span class="lines">@@ -1590,14 +1590,9 @@
</span><span class="cx">
</span><span class="cx"> + (void)_setAcceleratedImageDecoding:(BOOL)enabled
</span><span class="cx"> {
</span><del>- ImageSource::setAcceleratedImageDecodingEnabled(enabled);
</del><ins>+ UNUSED_PARAM(enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-+ (BOOL)_acceleratedImageDecoding
-{
- return ImageSource::acceleratedImageDecodingEnabled();
-}
-
</del><span class="cx"> + (void)_setAllowCookies:(BOOL)allow
</span><span class="cx"> {
</span><span class="cx"> ResourceRequestBase::setDefaultAllowCookies(allow);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (168451 => 168452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-05-07 23:28:50 UTC (rev 168452)
</span><span class="lines">@@ -465,7 +465,6 @@
</span><span class="cx"> + (void)_setTileCacheLayerPoolCapacity:(unsigned)capacity;
</span><span class="cx">
</span><span class="cx"> + (void)_setAcceleratedImageDecoding:(BOOL)enabled;
</span><del>-+ (BOOL)_acceleratedImageDecoding;
</del><span class="cx"> + (void)_setAllowCookies:(BOOL)allow;
</span><span class="cx"> + (BOOL)_allowCookies;
</span><span class="cx"> + (BOOL)_isUnderMemoryPressure;
</span></span></pre>
</div>
</div>
</body>
</html>