<!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>[173150] 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/173150">173150</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-08-31 15:06:29 -0700 (Sun, 31 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unnecessary (and unnecessarily iOS-specific) setStrokeAndFillColor
https://bugs.webkit.org/show_bug.cgi?id=136416
Reviewed by Dan Bernstein.
* WebCore.exp.in:
* platform/graphics/GraphicsContext.h:
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::setStrokeAndFillColor): Deleted.
Remove.
* WebView/WebFrameView.mm:
(-[WebFrameView drawRect:]):
We only end up filling, so only set the fill color.
* WebView/WebPDFViewIOS.mm:
(-[WebPDFView drawPage:]):
(-[WebPDFView drawRect:]):
* WebView/WebPlainWhiteView.mm:
We only end up filling, so only set the fill color.</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="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebViewWebPDFViewIOSmm">trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm</a></li>
<li><a href="#trunkSourceWebKitiosWebViewWebPlainWhiteViewmm">trunk/Source/WebKit/ios/WebView/WebPlainWhiteView.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewmm">trunk/Source/WebKit/mac/WebView/WebFrameView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173149 => 173150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-31 22:03:50 UTC (rev 173149)
+++ trunk/Source/WebCore/ChangeLog 2014-08-31 22:06:29 UTC (rev 173150)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-08-31 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Remove unnecessary (and unnecessarily iOS-specific) setStrokeAndFillColor
+ https://bugs.webkit.org/show_bug.cgi?id=136416
+
+ Reviewed by Dan Bernstein.
+
+ * WebCore.exp.in:
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::setStrokeAndFillColor): Deleted.
+ Remove.
+
+2014-08-31 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Remove duplicate implementation of drawEllipse and some related PLATFORM(IOS) ifdefs
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136413
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (173149 => 173150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-08-31 22:03:50 UTC (rev 173149)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-08-31 22:06:29 UTC (rev 173150)
</span><span class="lines">@@ -2654,7 +2654,6 @@
</span><span class="cx"> __ZN7WebCore21SQLiteDatabaseTracker9setClientEPNS_27SQLiteDatabaseTrackerClientE
</span><span class="cx"> __ZN7WebCore21applicationIsFacebookEv
</span><span class="cx"> __ZN7WebCore21nextParagraphPositionERKNS_15VisiblePositionEi
</span><del>-__ZN7WebCore21setStrokeAndFillColorEP9CGContextP7CGColor
</del><span class="cx"> __ZN7WebCore21wordRangeFromPositionERKNS_15VisiblePositionE
</span><span class="cx"> __ZN7WebCore22startOfEditableContentERKNS_15VisiblePositionE
</span><span class="cx"> __ZN7WebCore23applicationIsMobileMailEv
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (173149 => 173150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-08-31 22:03:50 UTC (rev 173149)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-08-31 22:06:29 UTC (rev 173150)
</span><span class="lines">@@ -189,10 +189,6 @@
</span><span class="cx"> bool drawLuminanceMask : 1;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- WEBCORE_EXPORT void setStrokeAndFillColor(PlatformGraphicsContext*, CGColorRef);
-#endif
-
</del><span class="cx"> struct ImagePaintingOptions {
</span><span class="cx"> ImagePaintingOptions(CompositeOperator compositeOperator = CompositeSourceOver, BlendMode blendMode = BlendModeNormal, ImageOrientationDescription orientationDescription = ImageOrientationDescription(), bool useLowQualityScale = false)
</span><span class="cx"> : m_compositeOperator(compositeOperator)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (173149 => 173150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-08-31 22:03:50 UTC (rev 173149)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-08-31 22:06:29 UTC (rev 173150)
</span><span class="lines">@@ -104,14 +104,6 @@
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-void setStrokeAndFillColor(CGContextRef context, CGColorRef color)
-{
- CGContextSetStrokeColorWithColor(context, color);
- CGContextSetFillColorWithColor(context, color);
-}
-#endif // PLATFORM(IOS)
-
</del><span class="cx"> #if PLATFORM(WIN) || PLATFORM(IOS)
</span><span class="cx"> CGColorSpaceRef linearRGBColorSpaceRef()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (173149 => 173150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-08-31 22:03:50 UTC (rev 173149)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-08-31 22:06:29 UTC (rev 173150)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-31 Tim Horton <timothy_horton@apple.com>
+
+ Remove unnecessary (and unnecessarily iOS-specific) setStrokeAndFillColor
+ https://bugs.webkit.org/show_bug.cgi?id=136416
+
+ Reviewed by Dan Bernstein.
+
+ * WebView/WebPDFViewIOS.mm:
+ (-[WebPDFView drawPage:]):
+ (-[WebPDFView drawRect:]):
+ * WebView/WebPlainWhiteView.mm:
+ We only end up filling, so only set the fill color.
+
</ins><span class="cx"> 2014-08-22 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement paint flashing in the WK1 InspectorOverlay page
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebViewWebPDFViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm (173149 => 173150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm 2014-08-31 22:03:50 UTC (rev 173149)
+++ trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm 2014-08-31 22:06:29 UTC (rev 173150)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> CGContextSaveGState(context);
</span><span class="cx"> CGFloat height = WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_FLIPPED_SHADOWS) ? 2.0f : -2.0f;
</span><span class="cx"> CGContextSetShadowWithColor(context, CGSizeMake(0.0f, height), 3.0f, [[self class] shadowColor]);
</span><del>- setStrokeAndFillColor(context, cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</del><ins>+ CGContextSetFillColorWithColor(context, cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</ins><span class="cx"> CGContextFillRect(context, pageRect);
</span><span class="cx"> CGContextRestoreGState(context);
</span><span class="cx">
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> // Draw Background.
</span><span class="cx"> CGContextSaveGState(context);
</span><del>- setStrokeAndFillColor(context, [[self class] backgroundColor]);
</del><ins>+ CGContextSetFillColorWithColor(context, [[self class] backgroundColor]);
</ins><span class="cx"> CGContextFillRect(context, aRect);
</span><span class="cx"> CGContextRestoreGState(context);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebViewWebPlainWhiteViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebView/WebPlainWhiteView.mm (173149 => 173150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebView/WebPlainWhiteView.mm 2014-08-31 22:03:50 UTC (rev 173149)
+++ trunk/Source/WebKit/ios/WebView/WebPlainWhiteView.mm 2014-08-31 22:06:29 UTC (rev 173150)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> - (void)drawRect:(NSRect)rect
</span><span class="cx"> {
</span><span class="cx"> CGContextRef context = WKGetCurrentGraphicsContext();
</span><del>- setStrokeAndFillColor(context, cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</del><ins>+ CGContextSetFillColorWithColor(context, cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</ins><span class="cx"> WKRectFill(context, [self bounds]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173149 => 173150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-08-31 22:03:50 UTC (rev 173149)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-08-31 22:06:29 UTC (rev 173150)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-31 Tim Horton <timothy_horton@apple.com>
+
+ Remove unnecessary (and unnecessarily iOS-specific) setStrokeAndFillColor
+ https://bugs.webkit.org/show_bug.cgi?id=136416
+
+ Reviewed by Dan Bernstein.
+
+ * WebView/WebFrameView.mm:
+ (-[WebFrameView drawRect:]):
+ We only end up filling, so only set the fill color.
+
</ins><span class="cx"> 2014-08-26 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Use RetainPtr::autorelease in some places where it seems appropriate
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (173149 => 173150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2014-08-31 22:03:50 UTC (rev 173149)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2014-08-31 22:06:29 UTC (rev 173150)
</span><span class="lines">@@ -526,7 +526,7 @@
</span><span class="cx"> NSRectFill(rect);
</span><span class="cx"> #else
</span><span class="cx"> CGContextRef cgContext = WKGetCurrentGraphicsContext();
</span><del>- setStrokeAndFillColor(cgContext, cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</del><ins>+ CGContextSetFillColorWithColor(cgContext, cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</ins><span class="cx"> WKRectFill(cgContext, rect);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -538,7 +538,7 @@
</span><span class="cx"> NSRectFill(rect);
</span><span class="cx"> #else
</span><span class="cx"> CGContextRef cgContext = WKGetCurrentGraphicsContext();
</span><del>- setStrokeAndFillColor(cgContext, cachedCGColor(Color::cyan, ColorSpaceDeviceRGB));
</del><ins>+ CGContextSetFillColorWithColor(cgContext, cachedCGColor(Color::cyan, ColorSpaceDeviceRGB));
</ins><span class="cx"> WKRectFill(cgContext, rect);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>