<!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>[173152] 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/173152">173152</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-08-31 18:53:47 -0700 (Sun, 31 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove GraphicsContext constructor that takes shouldUseContextColors
https://bugs.webkit.org/show_bug.cgi?id=136421
Reviewed by Dan Bernstein.
* WebCore.exp.in:
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::GraphicsContext):
* platform/graphics/GraphicsContext.h:
(WebCore::GraphicsContextState::GraphicsContextState):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::platformInit):
(WebCore::GraphicsContext::drawLinesForText):
As far as I can tell, the last user of this constructor died with WebNSStringDrawing.
Adjust all code to assume shouldUseContextColors=true.</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="#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="#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 (173151 => 173152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-01 01:11:20 UTC (rev 173151)
+++ trunk/Source/WebCore/ChangeLog 2014-09-01 01:53:47 UTC (rev 173152)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-08-31 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Remove GraphicsContext constructor that takes shouldUseContextColors
+ https://bugs.webkit.org/show_bug.cgi?id=136421
+
+ Reviewed by Dan Bernstein.
+
+ * WebCore.exp.in:
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::GraphicsContext):
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::GraphicsContextState::GraphicsContextState):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::platformInit):
+ (WebCore::GraphicsContext::drawLinesForText):
+ As far as I can tell, the last user of this constructor died with WebNSStringDrawing.
+ Adjust all code to assume shouldUseContextColors=true.
+
+2014-08-31 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Remove unused ARMv6-specific #if branches in WebCore::canHyphenate
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136420
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (173151 => 173152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-09-01 01:11:20 UTC (rev 173151)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-09-01 01:53:47 UTC (rev 173152)
</span><span class="lines">@@ -546,6 +546,7 @@
</span><span class="cx"> __ZN7WebCore15GraphicsContext9drawImageEPNS_5ImageENS_10ColorSpaceERKNS_10FloatPointERKNS_20ImagePaintingOptionsE
</span><span class="cx"> __ZN7WebCore15GraphicsContext9setShadowERKNS_9FloatSizeEfRKNS_5ColorENS_10ColorSpaceE
</span><span class="cx"> __ZN7WebCore15GraphicsContext9translateEff
</span><ins>+__ZN7WebCore15GraphicsContextC1EP9CGContext
</ins><span class="cx"> __ZN7WebCore15GraphicsContextD1Ev
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA10initializeEv
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA10setFiltersERKNS_16FilterOperationsE
</span><span class="lines">@@ -2246,7 +2247,6 @@
</span><span class="cx"> __ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELm0ENS6_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
</span><span class="cx"> __ZN7WebCore14cookiesEnabledERKNS_21NetworkStorageSessionERKNS_3URLES5_
</span><del>-__ZN7WebCore15GraphicsContextC1EP9CGContext
</del><span class="cx"> __ZN7WebCore15ResourceRequest41updateFromDelegatePreservingOldPropertiesERKS0_
</span><span class="cx"> __ZN7WebCore16FontPlatformDataC1EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
</span><span class="cx"> __ZN7WebCore16FontPlatformDataC2EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
</span><span class="lines">@@ -2597,7 +2597,6 @@
</span><span class="cx"> __ZN7WebCore15GraphicsContext15drawLineForTextERKNS_10FloatPointEfbb
</span><span class="cx"> __ZN7WebCore15GraphicsContext22setEmojiDrawingEnabledEb
</span><span class="cx"> __ZN7WebCore15GraphicsContext23setIsAcceleratedContextEb
</span><del>-__ZN7WebCore15GraphicsContextC1EP9CGContextb
</del><span class="cx"> __ZN7WebCore15LegacyTileCache14drainLayerPoolEv
</span><span class="cx"> __ZN7WebCore15LegacyTileCache20setLayerPoolCapacityEj
</span><span class="cx"> __ZN7WebCore15ResourceRequest41updateFromDelegatePreservingOldPropertiesERKS0_
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (173151 => 173152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-09-01 01:11:20 UTC (rev 173151)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-09-01 01:53:47 UTC (rev 173152)
</span><span class="lines">@@ -100,21 +100,12 @@
</span><span class="cx"> bool m_interpolationQualityChanged;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> GraphicsContext::GraphicsContext(PlatformGraphicsContext* platformGraphicsContext)
</span><span class="cx"> : m_updatingControlTints(false)
</span><span class="cx"> , m_transparencyCount(0)
</span><span class="cx"> {
</span><span class="cx"> platformInit(platformGraphicsContext);
</span><span class="cx"> }
</span><del>-#else
-GraphicsContext::GraphicsContext(PlatformGraphicsContext* platformGraphicsContext, bool shouldUseContextColors)
- : m_updatingControlTints(false)
- , m_transparencyCount(0)
-{
- platformInit(platformGraphicsContext, shouldUseContextColors);
-}
-#endif
</del><span class="cx">
</span><span class="cx"> GraphicsContext::~GraphicsContext()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (173151 => 173152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-09-01 01:11:20 UTC (rev 173151)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-09-01 01:53:47 UTC (rev 173152)
</span><span class="lines">@@ -131,7 +131,6 @@
</span><span class="cx"> , blendMode(BlendModeNormal)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , emojiDrawingEnabled(true)
</span><del>- , shouldUseContextColors(true)
</del><span class="cx"> #endif
</span><span class="cx"> , shouldAntialias(true)
</span><span class="cx"> , shouldSmoothFonts(true)
</span><span class="lines">@@ -176,7 +175,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool emojiDrawingEnabled : 1;
</span><del>- bool shouldUseContextColors : 1;
</del><span class="cx"> #endif
</span><span class="cx"> bool shouldAntialias : 1;
</span><span class="cx"> bool shouldSmoothFonts : 1;
</span><span class="lines">@@ -223,11 +221,7 @@
</span><span class="cx"> class GraphicsContext {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(GraphicsContext); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> WEBCORE_EXPORT GraphicsContext(PlatformGraphicsContext*);
</span><del>-#else
- WEBCORE_EXPORT GraphicsContext(PlatformGraphicsContext*, bool shouldUseContextColors = true);
-#endif
</del><span class="cx"> WEBCORE_EXPORT ~GraphicsContext();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT PlatformGraphicsContext* platformContext() const;
</span><span class="lines">@@ -550,7 +544,7 @@
</span><span class="cx"> static void adjustLineToPixelBoundaries(FloatPoint& p1, FloatPoint& p2, float strokeWidth, StrokeStyle);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void platformInit(PlatformGraphicsContext*, bool shouldUseContextColors = false);
</del><ins>+ void platformInit(PlatformGraphicsContext*);
</ins><span class="cx"> void platformDestroy();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN) && !USE(WINGDI)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (173151 => 173152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-09-01 01:11:20 UTC (rev 173151)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-09-01 01:53:47 UTC (rev 173152)
</span><span class="lines">@@ -112,24 +112,15 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void GraphicsContext::platformInit(CGContextRef cgContext, bool shouldUseContextColors)
</del><ins>+void GraphicsContext::platformInit(CGContextRef cgContext)
</ins><span class="cx"> {
</span><span class="cx"> m_data = new GraphicsContextPlatformPrivate(cgContext);
</span><span class="cx"> setPaintingDisabled(!cgContext);
</span><span class="cx"> if (cgContext) {
</span><del>-#if PLATFORM(IOS)
- m_state.shouldUseContextColors = shouldUseContextColors;
- if (shouldUseContextColors) {
-#else
- UNUSED_PARAM(shouldUseContextColors);
-#endif
</del><span class="cx"> // Make sure the context starts in sync with our state.
</span><span class="cx"> setPlatformFillColor(fillColor(), fillColorSpace());
</span><span class="cx"> setPlatformStrokeColor(strokeColor(), strokeColorSpace());
</span><span class="cx"> setPlatformStrokeThickness(strokeThickness());
</span><del>-#if PLATFORM(IOS)
- }
-#endif
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1362,19 +1353,13 @@
</span><span class="cx"> dashBounds.append(CGRectMake(bounds.x() + widths[i], bounds.y() + 2 * bounds.height(), widths[i+1] - widths[i], bounds.height()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- if (m_state.shouldUseContextColors)
-#endif
- if (fillColorIsNotEqualToStrokeColor)
- setCGFillColor(platformContext(), localStrokeColor, strokeColorSpace());
</del><ins>+ if (fillColorIsNotEqualToStrokeColor)
+ setCGFillColor(platformContext(), localStrokeColor, strokeColorSpace());
</ins><span class="cx">
</span><span class="cx"> CGContextFillRects(platformContext(), dashBounds.data(), dashBounds.size());
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- if (m_state.shouldUseContextColors)
-#endif
- if (fillColorIsNotEqualToStrokeColor)
- setCGFillColor(platformContext(), fillColor(), fillColorSpace());
</del><ins>+ if (fillColorIsNotEqualToStrokeColor)
+ setCGFillColor(platformContext(), fillColor(), fillColorSpace());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setURLForRect(const URL& link, const IntRect& destRect)
</span></span></pre>
</div>
</div>
</body>
</html>