<!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>[191330] trunk/Source/WebCore</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/191330">191330</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-10-19 21:22:59 -0700 (Mon, 19 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Shadow GraphicsContext's ImageInterpolationQuality inside GraphicsContextState
https://bugs.webkit.org/show_bug.cgi?id=150306
Reviewed by Simon Fraser.
When getting the ImageInterpolationQuality, there is no need to round-trip through
the platform's graphics context. This patch migrates this piece of state to the
existing idiom of having a setter in GraphicsContext.cpp which sets the relevent
state in GraphicsContextState and then calls into a platform-specific setter.
No new tests because there is no behavior change.
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::setImageInterpolationQuality):
* platform/graphics/GraphicsContext.h:
(WebCore::GraphicsContext::imageInterpolationQuality):
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::setPlatformImageInterpolationQuality):
(WebCore::GraphicsContext::setImageInterpolationQuality): Deleted.
(WebCore::GraphicsContext::imageInterpolationQuality): Deleted.
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::convertInterpolationQuality):
(WebCore::GraphicsContext::platformInit):
(WebCore::GraphicsContext::setPlatformImageInterpolationQuality):
(WebCore::GraphicsContext::setImageInterpolationQuality): Deleted.
(WebCore::GraphicsContext::imageInterpolationQuality): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191329 => 191330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-20 03:39:44 UTC (rev 191329)
+++ trunk/Source/WebCore/ChangeLog 2015-10-20 04:22:59 UTC (rev 191330)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-10-19 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Shadow GraphicsContext's ImageInterpolationQuality inside GraphicsContextState
+ https://bugs.webkit.org/show_bug.cgi?id=150306
+
+ Reviewed by Simon Fraser.
+
+ When getting the ImageInterpolationQuality, there is no need to round-trip through
+ the platform's graphics context. This patch migrates this piece of state to the
+ existing idiom of having a setter in GraphicsContext.cpp which sets the relevent
+ state in GraphicsContextState and then calls into a platform-specific setter.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::setImageInterpolationQuality):
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::GraphicsContext::imageInterpolationQuality):
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::setPlatformImageInterpolationQuality):
+ (WebCore::GraphicsContext::setImageInterpolationQuality): Deleted.
+ (WebCore::GraphicsContext::imageInterpolationQuality): Deleted.
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::convertInterpolationQuality):
+ (WebCore::GraphicsContext::platformInit):
+ (WebCore::GraphicsContext::setPlatformImageInterpolationQuality):
+ (WebCore::GraphicsContext::setImageInterpolationQuality): Deleted.
+ (WebCore::GraphicsContext::imageInterpolationQuality): Deleted.
+
</ins><span class="cx"> 2015-10-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop unnecessary Node::toInputElement() virtual function
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (191329 => 191330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-10-20 03:39:44 UTC (rev 191329)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-10-20 04:22:59 UTC (rev 191330)
</span><span class="lines">@@ -262,6 +262,16 @@
</span><span class="cx"> setPlatformShouldSmoothFonts(shouldSmoothFonts);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsContext::setImageInterpolationQuality(InterpolationQuality imageInterpolationQuality)
+{
+ m_state.imageInterpolationQuality = imageInterpolationQuality;
+
+ if (paintingDisabled())
+ return;
+
+ setPlatformImageInterpolationQuality(imageInterpolationQuality);
+}
+
</ins><span class="cx"> void GraphicsContext::setAntialiasedFontDilationEnabled(bool antialiasedFontDilationEnabled)
</span><span class="cx"> {
</span><span class="cx"> m_state.antialiasedFontDilationEnabled = antialiasedFontDilationEnabled;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (191329 => 191330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2015-10-20 03:39:44 UTC (rev 191329)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2015-10-20 04:22:59 UTC (rev 191330)
</span><span class="lines">@@ -155,6 +155,7 @@
</span><span class="cx"> float alpha { 1 };
</span><span class="cx"> CompositeOperator compositeOperator { CompositeSourceOver };
</span><span class="cx"> BlendMode blendMode { BlendModeNormal };
</span><ins>+ InterpolationQuality imageInterpolationQuality { InterpolationDefault };
</ins><span class="cx">
</span><span class="cx"> bool shouldAntialias : 1;
</span><span class="cx"> bool shouldSmoothFonts : 1;
</span><span class="lines">@@ -322,7 +323,7 @@
</span><span class="cx"> void drawPattern(Image&, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, ColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setImageInterpolationQuality(InterpolationQuality);
</span><del>- InterpolationQuality imageInterpolationQuality() const;
</del><ins>+ InterpolationQuality imageInterpolationQuality() const { return m_state.imageInterpolationQuality; }
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void clip(const IntRect&);
</span><span class="cx"> WEBCORE_EXPORT void clip(const FloatRect&);
</span><span class="lines">@@ -538,6 +539,7 @@
</span><span class="cx">
</span><span class="cx"> void setPlatformShouldAntialias(bool);
</span><span class="cx"> void setPlatformShouldSmoothFonts(bool);
</span><ins>+ void setPlatformImageInterpolationQuality(InterpolationQuality);
</ins><span class="cx">
</span><span class="cx"> void setPlatformShadow(const FloatSize&, float blur, const Color&, ColorSpace);
</span><span class="cx"> void clearPlatformShadow();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (191329 => 191330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-10-20 03:39:44 UTC (rev 191329)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-10-20 04:22:59 UTC (rev 191330)
</span><span class="lines">@@ -1098,16 +1098,11 @@
</span><span class="cx"> cairo_set_antialias(platformContext()->cr(), enable ? CAIRO_ANTIALIAS_DEFAULT : CAIRO_ANTIALIAS_NONE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setImageInterpolationQuality(InterpolationQuality quality)
</del><ins>+void GraphicsContext::setPlatformImageInterpolationQuality(InterpolationQuality quality)
</ins><span class="cx"> {
</span><span class="cx"> platformContext()->setImageInterpolationQuality(quality);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InterpolationQuality GraphicsContext::imageInterpolationQuality() const
-{
- return platformContext()->imageInterpolationQuality();
-}
-
</del><span class="cx"> bool GraphicsContext::isAcceleratedContext() const
</span><span class="cx"> {
</span><span class="cx"> return cairo_surface_get_type(cairo_get_target(platformContext()->cr())) == CAIRO_SURFACE_TYPE_GL;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (191329 => 191330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-10-20 03:39:44 UTC (rev 191329)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-10-20 04:22:59 UTC (rev 191330)
</span><span class="lines">@@ -104,6 +104,23 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static InterpolationQuality convertInterpolationQuality(CGInterpolationQuality quality)
+{
+ switch (quality) {
+ case kCGInterpolationDefault:
+ return InterpolationDefault;
+ case kCGInterpolationNone:
+ return InterpolationNone;
+ case kCGInterpolationLow:
+ return InterpolationLow;
+ case kCGInterpolationMedium:
+ return InterpolationMedium;
+ case kCGInterpolationHigh:
+ return InterpolationHigh;
+ }
+ return InterpolationDefault;
+}
+
</ins><span class="cx"> void GraphicsContext::platformInit(CGContextRef cgContext)
</span><span class="cx"> {
</span><span class="cx"> m_data = new GraphicsContextPlatformPrivate(cgContext);
</span><span class="lines">@@ -113,6 +130,7 @@
</span><span class="cx"> setPlatformFillColor(fillColor(), fillColorSpace());
</span><span class="cx"> setPlatformStrokeColor(strokeColor(), strokeColorSpace());
</span><span class="cx"> setPlatformStrokeThickness(strokeThickness());
</span><ins>+ m_state.imageInterpolationQuality = convertInterpolationQuality(CGContextGetInterpolationQuality(platformContext()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1433,11 +1451,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setImageInterpolationQuality(InterpolationQuality mode)
</del><ins>+void GraphicsContext::setPlatformImageInterpolationQuality(InterpolationQuality mode)
</ins><span class="cx"> {
</span><del>- if (paintingDisabled())
- return;
-
</del><span class="cx"> CGInterpolationQuality quality = kCGInterpolationDefault;
</span><span class="cx"> switch (mode) {
</span><span class="cx"> case InterpolationDefault:
</span><span class="lines">@@ -1459,27 +1474,6 @@
</span><span class="cx"> CGContextSetInterpolationQuality(platformContext(), quality);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InterpolationQuality GraphicsContext::imageInterpolationQuality() const
-{
- if (paintingDisabled())
- return InterpolationDefault;
-
- CGInterpolationQuality quality = CGContextGetInterpolationQuality(platformContext());
- switch (quality) {
- case kCGInterpolationDefault:
- return InterpolationDefault;
- case kCGInterpolationNone:
- return InterpolationNone;
- case kCGInterpolationLow:
- return InterpolationLow;
- case kCGInterpolationMedium:
- return InterpolationMedium;
- case kCGInterpolationHigh:
- return InterpolationHigh;
- }
- return InterpolationDefault;
-}
-
</del><span class="cx"> void GraphicsContext::setIsCALayerContext(bool isLayerContext)
</span><span class="cx"> {
</span><span class="cx"> if (isLayerContext)
</span></span></pre>
</div>
</div>
</body>
</html>