<!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>[204658] 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/204658">204658</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-08-19 15:13:00 -0700 (Fri, 19 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Addressing post-review comments after <a href="http://trac.webkit.org/projects/webkit/changeset/204592">r204592</a>
https://bugs.webkit.org/show_bug.cgi?id=160895
Unreviewed.
No new tests because there is no behavior change.
* page/cocoa/ResourceUsageOverlayCocoa.mm:
(WebCore::showText):
* platform/graphics/ca/PlatformCALayer.cpp:
(WebCore::PlatformCALayer::drawTextAtPoint):
* platform/ios/LegacyTileCache.mm:
(WebCore::LegacyTileCache::drawLayer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagecocoaResourceUsageOverlayCocoamm">trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileCachemm">trunk/Source/WebCore/platform/ios/LegacyTileCache.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204657 => 204658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-19 22:09:30 UTC (rev 204657)
+++ trunk/Source/WebCore/ChangeLog 2016-08-19 22:13:00 UTC (rev 204658)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-08-19 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Addressing post-review comments after r204592
+ https://bugs.webkit.org/show_bug.cgi?id=160895
+
+ Unreviewed.
+
+ No new tests because there is no behavior change.
+
+ * page/cocoa/ResourceUsageOverlayCocoa.mm:
+ (WebCore::showText):
+ * platform/graphics/ca/PlatformCALayer.cpp:
+ (WebCore::PlatformCALayer::drawTextAtPoint):
+ * platform/ios/LegacyTileCache.mm:
+ (WebCore::LegacyTileCache::drawLayer):
+
</ins><span class="cx"> 2016-08-19 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Attempt to fix the Windows build after r204652.
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaResourceUsageOverlayCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm (204657 => 204658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2016-08-19 22:09:30 UTC (rev 204657)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2016-08-19 22:13:00 UTC (rev 204658)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> CGContextSetTextDrawingMode(context, kCGTextFill);
</span><span class="cx"> CGContextSetFillColorWithColor(context, color);
</span><span class="cx">
</span><del>- CGAffineTransform matrix = CGAffineTransformMakeScale(1, -1);
</del><ins>+ auto matrix = CGAffineTransformMakeScale(1, -1);
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> CFStringRef fontName = CFSTR("Courier");
</span><span class="cx"> CGFloat fontSize = 10;
</span><span class="lines">@@ -262,14 +262,14 @@
</span><span class="cx"> CFStringRef fontName = CFSTR("Menlo");
</span><span class="cx"> CGFloat fontSize = 11;
</span><span class="cx"> #endif
</span><del>- RetainPtr<CTFontRef> font = adoptCF(CTFontCreateWithName(fontName, fontSize, &matrix));
</del><ins>+ auto font = adoptCF(CTFontCreateWithName(fontName, fontSize, &matrix));
</ins><span class="cx"> CFTypeRef keys[] = { kCTFontAttributeName, kCTForegroundColorFromContextAttributeName };
</span><span class="cx"> CFTypeRef values[] = { font.get(), kCFBooleanTrue };
</span><del>- RetainPtr<CFDictionaryRef> attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</del><ins>+ auto attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</ins><span class="cx"> CString cstr = text.ascii();
</span><del>- RetainPtr<CFStringRef> string = adoptCF(CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(cstr.data()), cstr.length(), kCFStringEncodingASCII, false, kCFAllocatorNull));
- RetainPtr<CFAttributedStringRef> attributedString = adoptCF(CFAttributedStringCreate(kCFAllocatorDefault, string.get(), attributes.get()));
- RetainPtr<CTLineRef> line = adoptCF(CTLineCreateWithAttributedString(attributedString.get()));
</del><ins>+ auto string = adoptCF(CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(cstr.data()), cstr.length(), kCFStringEncodingASCII, false, kCFAllocatorNull));
+ auto attributedString = adoptCF(CFAttributedStringCreate(kCFAllocatorDefault, string.get(), attributes.get()));
+ auto line = adoptCF(CTLineCreateWithAttributedString(attributedString.get()));
</ins><span class="cx"> CGContextSetTextPosition(context, x, y);
</span><span class="cx"> CTLineDraw(line.get(), context);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp (204657 => 204658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2016-08-19 22:09:30 UTC (rev 204657)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2016-08-19 22:13:00 UTC (rev 204658)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #include <CoreText/CoreText.h>
</span><del>-
</del><span class="cx"> #include "GraphicsContextCG.h"
</span><span class="cx"> #include "LayerPool.h"
</span><span class="cx"> #include "PlatformCALayerClient.h"
</span><span class="lines">@@ -128,14 +127,14 @@
</span><span class="cx"> // This function is needed to work around a bug in Windows CG <rdar://problem/22703470>
</span><span class="cx"> void PlatformCALayer::drawTextAtPoint(CGContextRef context, CGFloat x, CGFloat y, CGSize scale, CGFloat fontSize, const char* text, size_t length) const
</span><span class="cx"> {
</span><del>- CGAffineTransform matrix = CGAffineTransformMakeScale(scale.width, scale.height);
- RetainPtr<CTFontRef> font = adoptCF(CTFontCreateWithName(CFSTR("Helvetica"), fontSize, &matrix));
</del><ins>+ auto matrix = CGAffineTransformMakeScale(scale.width, scale.height);
+ auto font = adoptCF(CTFontCreateWithName(CFSTR("Helvetica"), fontSize, &matrix));
</ins><span class="cx"> CFTypeRef keys[] = { kCTFontAttributeName, kCTForegroundColorFromContextAttributeName };
</span><span class="cx"> CFTypeRef values[] = { font.get(), kCFBooleanTrue };
</span><del>- RetainPtr<CFDictionaryRef> attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
- RetainPtr<CFStringRef> string = adoptCF(CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(text), length, kCFStringEncodingUTF8, false, kCFAllocatorNull));
- RetainPtr<CFAttributedStringRef> attributedString = adoptCF(CFAttributedStringCreate(kCFAllocatorDefault, string.get(), attributes.get()));
- RetainPtr<CTLineRef> line = adoptCF(CTLineCreateWithAttributedString(attributedString.get()));
</del><ins>+ auto attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+ auto string = adoptCF(CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(text), length, kCFStringEncodingUTF8, false, kCFAllocatorNull));
+ auto attributedString = adoptCF(CFAttributedStringCreate(kCFAllocatorDefault, string.get(), attributes.get()));
+ auto line = adoptCF(CTLineCreateWithAttributedString(attributedString.get()));
</ins><span class="cx"> CGContextSetTextPosition(context, x, y);
</span><span class="cx"> CTLineDraw(line.get(), context);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.mm (204657 => 204658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2016-08-19 22:09:30 UTC (rev 204657)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2016-08-19 22:13:00 UTC (rev 204658)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #include <CoreText/CoreText.h>
</span><del>-
</del><span class="cx"> #include "FontAntialiasingStateSaver.h"
</span><span class="cx"> #include "LegacyTileGrid.h"
</span><span class="cx"> #include "LegacyTileGridTile.h"
</span><span class="lines">@@ -594,14 +593,14 @@
</span><span class="cx"> else
</span><span class="cx"> CGContextSetRGBFillColor(context, 1, 1, 1, 0.6f);
</span><span class="cx">
</span><del>- CGAffineTransform matrix = CGAffineTransformMakeScale(1, -1);
- RetainPtr<CTFontRef> font = adoptCF(CTFontCreateWithName(CFSTR("Helvetica"), 25, &matrix));
</del><ins>+ auto matrix = CGAffineTransformMakeScale(1, -1);
+ auto font = adoptCF(CTFontCreateWithName(CFSTR("Helvetica"), 25, &matrix));
</ins><span class="cx"> CFTypeRef keys[] = { kCTFontAttributeName, kCTForegroundColorFromContextAttributeName };
</span><span class="cx"> CFTypeRef values[] = { font.get(), kCFBooleanTrue };
</span><del>- RetainPtr<CFDictionaryRef> attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
- RetainPtr<CFStringRef> string = adoptCF(CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(text), strlen(text), kCFStringEncodingUTF8, false, kCFAllocatorNull));
- RetainPtr<CFAttributedStringRef> attributedString = adoptCF(CFAttributedStringCreate(kCFAllocatorDefault, string.get(), attributes.get()));
- RetainPtr<CTLineRef> line = adoptCF(CTLineCreateWithAttributedString(attributedString.get()));
</del><ins>+ auto attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+ auto string = adoptCF(CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(text), strlen(text), kCFStringEncodingUTF8, false, kCFAllocatorNull));
+ auto attributedString = adoptCF(CFAttributedStringCreate(kCFAllocatorDefault, string.get(), attributes.get()));
+ auto line = adoptCF(CTLineCreateWithAttributedString(attributedString.get()));
</ins><span class="cx"> CGContextSetTextPosition(context, labelBounds.origin.x + 3, labelBounds.origin.y + 20);
</span><span class="cx"> CTLineDraw(line.get(), context);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>