<!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>[171009] tags/Safari-538.46</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/171009">171009</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-11 12:47:40 -0700 (Fri, 11 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rollout <a href="http://trac.webkit.org/projects/webkit/changeset/170675">r170675</a>. <rdar://problem/17643689>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari53846LayoutTestsChangeLog">tags/Safari-538.46/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari53846SourceWebCoreChangeLog">tags/Safari-538.46/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari53846SourceWebCoreplatformgraphicsBitmapImagecpp">tags/Safari-538.46/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#tagsSafari53846SourceWebCoreplatformgraphicsBitmapImageh">tags/Safari-538.46/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#tagsSafari53846SourceWebCoreplatformgraphicscgBitmapImageCGcpp">tags/Safari-538.46/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp</a></li>
<li><a href="#tagsSafari53846SourceWebCoreplatformgraphicscgGraphicsContext3DCGcpp">tags/Safari-538.46/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari53846LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46/LayoutTests/ChangeLog (171008 => 171009)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46/LayoutTests/ChangeLog 2014-07-11 19:00:24 UTC (rev 171008)
+++ tags/Safari-538.46/LayoutTests/ChangeLog 2014-07-11 19:47:40 UTC (rev 171009)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-07-11 Dean Jackson <dino@apple.com>
+
+ <rdar://problem/17643689>
+ Revert r170675 on this branch.
+
+ * fast/canvas/image-potential-subsample-expected.txt: Removed.
+ * fast/canvas/image-potential-subsample.html: Removed.
+ * fast/canvas/resources/image-8000x8000.jpg: Removed.
+ * fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-potentially-subsampled-image.js: Removed.
+ * fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image-expected.txt: Removed.
+ * fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image.html: Removed.
+
</ins><span class="cx"> 2014-07-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171001
</span></span></pre></div>
<a id="tagsSafari53846SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46/Source/WebCore/ChangeLog (171008 => 171009)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46/Source/WebCore/ChangeLog 2014-07-11 19:00:24 UTC (rev 171008)
+++ tags/Safari-538.46/Source/WebCore/ChangeLog 2014-07-11 19:47:40 UTC (rev 171009)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-07-11 Dean Jackson <dino@apple.com>
+
+ <rdar://problem/17643689>
+ Revert r170675 on this branch.
+
+ * platform/graphics/BitmapImage.cpp:
+ (WebCore::BitmapImage::cacheFrame):
+ (WebCore::BitmapImage::frameAtIndex):
+ * platform/graphics/BitmapImage.h:
+ (WebCore::FrameData::FrameData):
+ * platform/graphics/cg/BitmapImageCG.cpp:
+ (WebCore::FrameData::clear):
+ (WebCore::BitmapImage::BitmapImage):
+ (WebCore::BitmapImage::draw):
+ (WebCore::BitmapImage::copyUnscaledFrameAtIndex):
+ * platform/graphics/cg/GraphicsContext3DCG.cpp:
+ (WebCore::GraphicsContext3D::ImageExtractor::extractImage):
+
</ins><span class="cx"> 2014-07-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171001
</span></span></pre></div>
<a id="tagsSafari53846SourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46/Source/WebCore/platform/graphics/BitmapImage.cpp (171008 => 171009)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46/Source/WebCore/platform/graphics/BitmapImage.cpp 2014-07-11 19:00:24 UTC (rev 171008)
+++ tags/Safari-538.46/Source/WebCore/platform/graphics/BitmapImage.cpp 2014-07-11 19:47:40 UTC (rev 171009)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_frames[index].m_frame = m_source.createFrameAtIndex(index, &scaleHint);
</span><del>- m_frames[index].m_subsamplingScale = scaleHint;
</del><ins>+ m_frames[index].m_scale = scaleHint;
</ins><span class="cx"> #else
</span><span class="cx"> m_frames[index].m_frame = m_source.createFrameAtIndex(index);
</span><span class="cx"> #endif
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx">
</span><span class="cx"> if (index >= m_frames.size() || !m_frames[index].m_frame)
</span><span class="cx"> cacheFrame(index, scaleHint);
</span><del>- else if (std::min(1.0f, scaleHint) > m_frames[index].m_subsamplingScale) {
</del><ins>+ else if (std::min(1.0f, scaleHint) > m_frames[index].m_scale) {
</ins><span class="cx"> // If the image is already cached, but at too small a size, re-decode a larger version.
</span><span class="cx"> int sizeChange = -m_frames[index].m_frameBytes;
</span><span class="cx"> ASSERT(static_cast<int>(m_decodedSize) + sizeChange >= 0);
</span></span></pre></div>
<a id="tagsSafari53846SourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46/Source/WebCore/platform/graphics/BitmapImage.h (171008 => 171009)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46/Source/WebCore/platform/graphics/BitmapImage.h 2014-07-11 19:00:24 UTC (rev 171008)
+++ tags/Safari-538.46/Source/WebCore/platform/graphics/BitmapImage.h 2014-07-11 19:47:40 UTC (rev 171009)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> : m_frame(0)
</span><span class="cx"> , m_orientation(DefaultImageOrientation)
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- , m_subsamplingScale(0)
</del><ins>+ , m_scale(0)
</ins><span class="cx"> , m_haveInfo(false)
</span><span class="cx"> #endif
</span><span class="cx"> , m_duration(0)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> NativeImagePtr m_frame;
</span><span class="cx"> ImageOrientation m_orientation;
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- float m_subsamplingScale;
</del><ins>+ float m_scale;
</ins><span class="cx"> bool m_haveInfo;
</span><span class="cx"> #endif
</span><span class="cx"> float m_duration;
</span></span></pre></div>
<a id="tagsSafari53846SourceWebCoreplatformgraphicscgBitmapImageCGcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp (171008 => 171009)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2014-07-11 19:00:24 UTC (rev 171008)
+++ tags/Safari-538.46/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2014-07-11 19:47:40 UTC (rev 171009)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_frameBytes = 0;
</span><del>- m_subsamplingScale = 1;
</del><ins>+ m_scale = 1;
</ins><span class="cx"> m_haveInfo = false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> m_frames[0].m_haveMetadata = true;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- m_frames[0].m_subsamplingScale = 1;
</del><ins>+ m_frames[0].m_scale = 1;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> checkForSolidColor();
</span><span class="lines">@@ -199,12 +199,11 @@
</span><span class="cx"> void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription description)
</span><span class="cx"> {
</span><span class="cx"> CGImageRef image;
</span><del>- FloatRect srcRectForCurrentFrame = srcRect;
</del><ins>+#if !PLATFORM(IOS)
+ startAnimation();
</ins><span class="cx">
</span><del>-#if PLATFORM(IOS)
- if (m_originalSize.width() && m_originalSize.height())
- srcRectForCurrentFrame.scale(m_size.width() / static_cast<float>(m_originalSize.width()), m_size.height() / static_cast<float>(m_originalSize.height()));
-
</del><ins>+ image = frameAtIndex(m_currentFrame);
+#else
</ins><span class="cx"> startAnimation(DoNotCatchUp);
</span><span class="cx">
</span><span class="cx"> CGRect transformedDestinationRect = CGRectApplyAffineTransform(destRect, CGContextGetCTM(ctxt->platformContext()));
</span><span class="lines">@@ -213,15 +212,10 @@
</span><span class="cx"> if (CGContextGetType(ctxt->platformContext()) == kCGContextTypePDF)
</span><span class="cx"> imagePossiblyCopied = adoptCF(copyUnscaledFrameAtIndex(m_currentFrame));
</span><span class="cx"> else
</span><del>- imagePossiblyCopied = frameAtIndex(m_currentFrame, std::min<float>(1.0f, std::max(transformedDestinationRect.size.width / srcRectForCurrentFrame.width(), transformedDestinationRect.size.height / srcRectForCurrentFrame.height())));
-
</del><ins>+ imagePossiblyCopied = frameAtIndex(m_currentFrame, std::min<float>(1.0f, std::max(transformedDestinationRect.size.width / srcRect.width(), transformedDestinationRect.size.height / srcRect.height())));
+
</ins><span class="cx"> image = imagePossiblyCopied.get();
</span><del>-#else
- startAnimation();
-
- image = frameAtIndex(m_currentFrame);
</del><span class="cx"> #endif
</span><del>-
</del><span class="cx"> if (!image) // If it's too early we won't have an image yet.
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -232,7 +226,7 @@
</span><span class="cx">
</span><span class="cx"> float scale = 1;
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- scale = m_frames[m_currentFrame].m_subsamplingScale;
</del><ins>+ scale = m_frames[m_currentFrame].m_scale;
</ins><span class="cx"> #endif
</span><span class="cx"> FloatSize selfSize = currentFrameSize();
</span><span class="cx"> ImageOrientation orientation;
</span><span class="lines">@@ -240,7 +234,7 @@
</span><span class="cx"> if (description.respectImageOrientation() == RespectImageOrientation)
</span><span class="cx"> orientation = frameOrientationAtIndex(m_currentFrame);
</span><span class="cx">
</span><del>- ctxt->drawNativeImage(image, selfSize, styleColorSpace, destRect, srcRectForCurrentFrame, scale, compositeOp, blendMode, orientation);
</del><ins>+ ctxt->drawNativeImage(image, selfSize, styleColorSpace, destRect, srcRect, scale, compositeOp, blendMode, orientation);
</ins><span class="cx">
</span><span class="cx"> if (imageObserver())
</span><span class="cx"> imageObserver()->didDraw(this);
</span><span class="lines">@@ -255,7 +249,7 @@
</span><span class="cx"> if (index >= m_frames.size() || !m_frames[index].m_frame)
</span><span class="cx"> cacheFrame(index, 1);
</span><span class="cx">
</span><del>- if (m_frames[index].m_subsamplingScale == 1 && !m_source.isSubsampled())
</del><ins>+ if (m_frames[index].m_scale == 1 && !m_source.isSubsampled())
</ins><span class="cx"> return CGImageRetain(m_frames[index].m_frame);
</span><span class="cx">
</span><span class="cx"> return m_source.createFrameAtIndex(index);
</span></span></pre></div>
<a id="tagsSafari53846SourceWebCoreplatformgraphicscgGraphicsContext3DCGcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp (171008 => 171009)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2014-07-11 19:00:24 UTC (rev 171008)
+++ tags/Safari-538.46/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2014-07-11 19:47:40 UTC (rev 171009)
</span><span class="lines">@@ -332,17 +332,7 @@
</span><span class="cx"> decoder.setData(m_image->data(), true);
</span><span class="cx"> if (!decoder.frameCount())
</span><span class="cx"> return false;
</span><del>-#if PLATFORM(IOS)
- float scaleHint = 1;
- if (m_image->isBitmapImage()) {
- IntSize originalSize = toBitmapImage(m_image)->originalSize();
- if (originalSize.width() && originalSize.height())
- scaleHint = std::min<float>(1.0f, std::max(m_image->size().width() / originalSize.width(), m_image->size().width() / originalSize.height()));
- }
- m_decodedImage = adoptCF(decoder.createFrameAtIndex(0, &scaleHint));
-#else
</del><span class="cx"> m_decodedImage = adoptCF(decoder.createFrameAtIndex(0));
</span><del>-#endif
</del><span class="cx"> m_cgImage = m_decodedImage.get();
</span><span class="cx"> } else
</span><span class="cx"> m_cgImage = m_image->nativeImageForCurrentFrame();
</span></span></pre>
</div>
</div>
</body>
</html>