<!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>[161779] 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/161779">161779</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-11 12:59:14 -0800 (Sat, 11 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unfork GraphicsContext::drawNativeImage for iOS
https://bugs.webkit.org/show_bug.cgi?id=126824
Reviewed by Dean Jackson.
GraphicsContext::drawNativeImage had a different signature for iOS,
which required #ifdefs at all the call sites. Unfork by passing the "scale"
parameter everywhere (it's only used on iOS).
Source/WebCore:
* WebCore.exp.in:
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawImage):
* platform/graphics/GraphicsContext.h:
* platform/graphics/cg/BitmapImageCG.cpp:
(WebCore::BitmapImage::draw):
* platform/graphics/cg/GraphicsContext3DCG.cpp:
(WebCore::GraphicsContext3D::paintToCanvas):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::platformInit):
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::draw):
* platform/graphics/ios/IconIOS.mm:
(WebCore::Icon::paint):
Source/WebKit2:
* Shared/API/c/cg/WKImageCG.cpp:
(WKImageCreateFromCGImage):</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="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgBitmapImageCGcpp">trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContext3DCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosIconIOSmm">trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIccgWKImageCGcpp">trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-01-11 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Unfork GraphicsContext::drawNativeImage for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=126824
+
+ Reviewed by Dean Jackson.
+
+ GraphicsContext::drawNativeImage had a different signature for iOS,
+ which required #ifdefs at all the call sites. Unfork by passing the "scale"
+ parameter everywhere (it's only used on iOS).
+
+ * WebCore.exp.in:
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::drawImage):
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/cg/BitmapImageCG.cpp:
+ (WebCore::BitmapImage::draw):
+ * platform/graphics/cg/GraphicsContext3DCG.cpp:
+ (WebCore::GraphicsContext3D::paintToCanvas):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::platformInit):
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::draw):
+ * platform/graphics/ios/IconIOS.mm:
+ (WebCore::Icon::paint):
+
+2014-01-11 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Work around USE(CFNETWORK) build failure on iOS.
</span><span class="cx">
</span><span class="cx"> * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -2011,7 +2011,7 @@
</span><span class="cx"> __ZN7WebCore12EventHandler8keyEventEP7NSEvent
</span><span class="cx"> __ZN7WebCore12EventHandler9mouseDownEP7NSEvent
</span><span class="cx"> __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
</span><del>-__ZN7WebCore15GraphicsContext15drawNativeImageEP7CGImageRKNS_9FloatSizeENS_10ColorSpaceERKNS_9FloatRectES9_NS_17CompositeOperatorENS_9BlendModeENS_16ImageOrientationE
</del><ins>+__ZN7WebCore15GraphicsContext15drawNativeImageEP7CGImageRKNS_9FloatSizeENS_10ColorSpaceERKNS_9FloatRectES9_fNS_17CompositeOperatorENS_9BlendModeENS_16ImageOrientationE
</ins><span class="cx"> __ZN7WebCore15GraphicsContextC1EP9CGContext
</span><span class="cx"> __ZN7WebCore15ResourceRequest39updateFromDelegatePreservingOldHTTPBodyERKS0_
</span><span class="cx"> __ZN7WebCore16FontPlatformDataC1EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -1458,11 +1458,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> if (PassNativeImagePtr image = video->nativeImageForCurrentTime()) {
</span><del>- c->drawNativeImage(image, FloatSize(video->videoWidth(), video->videoHeight()), ColorSpaceDeviceRGB, dstRect, srcRect
-#if PLATFORM(IOS)
- , DefaultImageOrientation
-#endif
- );
</del><ins>+ c->drawNativeImage(image, FloatSize(video->videoWidth(), video->videoHeight()), ColorSpaceDeviceRGB, dstRect, srcRect);
</ins><span class="cx"> if (rectContainsCanvas(dstRect))
</span><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -253,11 +253,7 @@
</span><span class="cx"> void applyFillPattern();
</span><span class="cx"> void drawPath(const Path&);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- void drawNativeImage(PassNativeImagePtr, const FloatSize& selfSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, float scale, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, ImageOrientation = DefaultImageOrientation);
-#else
- void drawNativeImage(PassNativeImagePtr, const FloatSize& selfSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, ImageOrientation = DefaultImageOrientation);
-#endif
</del><ins>+ void drawNativeImage(PassNativeImagePtr, const FloatSize& selfSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, float scale = 1, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, ImageOrientation = DefaultImageOrientation);
</ins><span class="cx">
</span><span class="cx"> // Allow font smoothing (LCD antialiasing). Not part of the graphics state.
</span><span class="cx"> void setAllowsFontSmoothing(bool);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgBitmapImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -212,20 +212,23 @@
</span><span class="cx">
</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><ins>+ CGImageRef image;
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> startAnimation();
</span><span class="cx">
</span><del>- CGImageRef image = frameAtIndex(m_currentFrame);
</del><ins>+ image = frameAtIndex(m_currentFrame);
</ins><span class="cx"> #else
</span><span class="cx"> startAnimation(false);
</span><span class="cx">
</span><span class="cx"> CGRect transformedDestinationRect = CGRectApplyAffineTransform(destRect, CGContextGetCTM(ctxt->platformContext()));
</span><del>- RetainPtr<CGImageRef> image;
</del><ins>+ RetainPtr<CGImageRef> imagePossiblyCopied;
</ins><span class="cx"> // Never use subsampled images for drawing into PDF contexts.
</span><span class="cx"> if (CGContextGetType(ctxt->platformContext()) == kCGContextTypePDF)
</span><del>- image = adoptCF(copyUnscaledFrameAtIndex(m_currentFrame));
</del><ins>+ imagePossiblyCopied = adoptCF(copyUnscaledFrameAtIndex(m_currentFrame));
</ins><span class="cx"> else
</span><del>- image = frameAtIndex(m_currentFrame, std::min<float>(1.0f, std::max(transformedDestinationRect.size.width / srcRect.width(), transformedDestinationRect.size.height / srcRect.height())));
</del><ins>+ imagePossiblyCopied = frameAtIndex(m_currentFrame, std::min<float>(1.0f, std::max(transformedDestinationRect.size.width / srcRect.width(), transformedDestinationRect.size.height / srcRect.height())));
+
+ image = imagePossiblyCopied.get();
</ins><span class="cx"> #endif
</span><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="lines">@@ -235,8 +238,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ float scale = 1;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- float scale = m_frames[m_currentFrame].m_scale;
</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">@@ -244,11 +248,7 @@
</span><span class="cx"> if (description.respectImageOrientation() == RespectImageOrientation)
</span><span class="cx"> orientation = frameOrientationAtIndex(m_currentFrame);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- ctxt->drawNativeImage(image.get(), selfSize, styleColorSpace, destRect, srcRect, scale, compositeOp, blendMode, orientation);
-#else
- ctxt->drawNativeImage(image, selfSize, styleColorSpace, destRect, srcRect, compositeOp, blendMode, orientation);
-#endif
</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></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContext3DCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> context->scale(FloatSize(1, -1));
</span><span class="cx"> context->translate(0, -imageHeight);
</span><span class="cx"> context->setImageInterpolationQuality(InterpolationNone);
</span><del>- context->drawNativeImage(cgImage.get(), imageSize, ColorSpaceDeviceRGB, canvasRect, FloatRect(FloatPoint(), imageSize), CompositeCopy);
</del><ins>+ context->drawNativeImage(cgImage.get(), imageSize, ColorSpaceDeviceRGB, canvasRect, FloatRect(FloatPoint(), imageSize), 1, CompositeCopy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -169,11 +169,7 @@
</span><span class="cx"> m_data->m_userToDeviceTransformKnownToBeIdentity = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> void GraphicsContext::drawNativeImage(PassNativeImagePtr imagePtr, const FloatSize& imageSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, float scale, CompositeOperator op, BlendMode blendMode, ImageOrientation orientation)
</span><del>-#else
-void GraphicsContext::drawNativeImage(PassNativeImagePtr imagePtr, const FloatSize& imageSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator op, BlendMode blendMode, ImageOrientation orientation)
-#endif
</del><span class="cx"> {
</span><span class="cx"> RetainPtr<CGImageRef> image(imagePtr);
</span><span class="cx">
</span><span class="lines">@@ -181,6 +177,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Unapply the scaling since we are getting this from a scaled bitmap.
</span><span class="cx"> currHeight /= scale;
</span><ins>+#else
+ UNUSED_PARAM(scale);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (currHeight <= srcRect.y())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -304,13 +304,7 @@
</span><span class="cx">
</span><span class="cx"> FloatRect adjustedSrcRect = srcRect;
</span><span class="cx"> adjustedSrcRect.scale(m_resolutionScale, m_resolutionScale);
</span><del>- destContext->drawNativeImage(image.get(), m_data.m_backingStoreSize, colorSpace, destRect, adjustedSrcRect,
-#if PLATFORM(IOS)
- 1.0f, // Default scale of 1.0
-#endif
- op,
- blendMode
- );
</del><ins>+ destContext->drawNativeImage(image.get(), m_data.m_backingStoreSize, colorSpace, destRect, adjustedSrcRect, 1, op, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageBuffer::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosIconIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> ColorSpace colorSpace = ColorSpaceDeviceRGB;
</span><span class="cx">
</span><span class="cx"> context->setImageInterpolationQuality(InterpolationHigh);
</span><del>- context->drawNativeImage(m_cgImage.get(), size, colorSpace, destRect, srcRect, 1.0f, CompositeSourceOver, BlendModeNormal, DefaultImageOrientation);
</del><ins>+ context->drawNativeImage(m_cgImage.get(), size, colorSpace, destRect, srcRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-11 Simon Fraser <simon.fraser@apple.com>
+
+ Unfork GraphicsContext::drawNativeImage for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=126824
+
+ Reviewed by Dean Jackson.
+
+ GraphicsContext::drawNativeImage had a different signature for iOS,
+ which required #ifdefs at all the call sites. Unfork by passing the "scale"
+ parameter everywhere (it's only used on iOS).
+
+ * Shared/API/c/cg/WKImageCG.cpp:
+ (WKImageCreateFromCGImage):
+
</ins><span class="cx"> 2014-01-11 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Clean up iterator filter / iterator range code
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIccgWKImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp (161778 => 161779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2014-01-11 20:59:11 UTC (rev 161778)
+++ trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2014-01-11 20:59:14 UTC (rev 161779)
</span><span class="lines">@@ -57,10 +57,6 @@
</span><span class="cx"> auto graphicsContext = webImage->bitmap()->createGraphicsContext();
</span><span class="cx"> FloatRect rect(FloatPoint(0, 0), imageSize);
</span><span class="cx"> graphicsContext->clearRect(rect);
</span><del>-#if PLATFORM(IOS)
- graphicsContext->drawNativeImage(imageRef, imageSize, WebCore::ColorSpaceDeviceRGB, rect, rect, 1.0);
-#else
</del><span class="cx"> graphicsContext->drawNativeImage(imageRef, imageSize, WebCore::ColorSpaceDeviceRGB, rect, rect);
</span><del>-#endif
</del><span class="cx"> return toAPI(webImage.release().leakRef());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>