<!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>[191301] 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/191301">191301</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-10-19 11:50:26 -0700 (Mon, 19 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/191295">r191295</a>.
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::translatePlatformCTM):
(WebCore::GraphicsContext::setPlatformFillColor):
(WebCore::GraphicsContext::concatPlatformCTM):
(WebCore::GraphicsContext::setPlatformCTM):
(WebCore::GraphicsContext::setPlatformShadow):
(WebCore::GraphicsContext::rotatePlatformCTM):
(WebCore::GraphicsContext::scalePlatformCTM):
(WebCore::GraphicsContext::clipOut):
* platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
(WebCore::GraphicsContextPlatformPrivate::save):
(WebCore::GraphicsContextPlatformPrivate::restore):
(WebCore::GraphicsContextPlatformPrivate::flush):
(WebCore::GraphicsContextPlatformPrivate::clip):
(WebCore::GraphicsContextPlatformPrivate::scalePlatformCTM):
(WebCore::GraphicsContextPlatformPrivate::rotatePlatformCTM):
(WebCore::GraphicsContextPlatformPrivate::translatePlatformCTM):
(WebCore::GraphicsContextPlatformPrivate::concatPlatformCTM):
(WebCore::GraphicsContextPlatformPrivate::setPlatformCTM):
(WebCore::GraphicsContextPlatformPrivate::syncContext):
(WebCore::GraphicsContextPlatformPrivate::scale): Deleted.
(WebCore::GraphicsContextPlatformPrivate::rotate): Deleted.
(WebCore::GraphicsContextPlatformPrivate::translate): Deleted.
(WebCore::GraphicsContextPlatformPrivate::concatCTM): Deleted.
(WebCore::GraphicsContextPlatformPrivate::setCTM): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextPlatformPrivateCairoh">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191300 => 191301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-19 18:32:30 UTC (rev 191300)
+++ trunk/Source/WebCore/ChangeLog 2015-10-19 18:50:26 UTC (rev 191301)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-10-19 Alex Christensen <achristensen@webkit.org>
+
+ Unreviewed build fix after r191295.
+
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::translatePlatformCTM):
+ (WebCore::GraphicsContext::setPlatformFillColor):
+ (WebCore::GraphicsContext::concatPlatformCTM):
+ (WebCore::GraphicsContext::setPlatformCTM):
+ (WebCore::GraphicsContext::setPlatformShadow):
+ (WebCore::GraphicsContext::rotatePlatformCTM):
+ (WebCore::GraphicsContext::scalePlatformCTM):
+ (WebCore::GraphicsContext::clipOut):
+ * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
+ (WebCore::GraphicsContextPlatformPrivate::save):
+ (WebCore::GraphicsContextPlatformPrivate::restore):
+ (WebCore::GraphicsContextPlatformPrivate::flush):
+ (WebCore::GraphicsContextPlatformPrivate::clip):
+ (WebCore::GraphicsContextPlatformPrivate::scalePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::rotatePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::translatePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::concatPlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::setPlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::syncContext):
+ (WebCore::GraphicsContextPlatformPrivate::scale): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::rotate): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::translate): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::concatCTM): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::setCTM): Deleted.
+
</ins><span class="cx"> 2015-10-19 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Add magnify and rotate gesture event support for Mac
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (191300 => 191301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-10-19 18:32:30 UTC (rev 191300)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-10-19 18:50:26 UTC (rev 191301)
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx">
</span><span class="cx"> cairo_t* cr = platformContext()->cr();
</span><span class="cx"> cairo_translate(cr, x, y);
</span><del>- m_data->translate(x, y);
</del><ins>+ m_data->translatePlatformCTM(x, y);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setPlatformFillColor(const Color&, ColorSpace)
</span><span class="lines">@@ -789,7 +789,7 @@
</span><span class="cx"> cairo_t* cr = platformContext()->cr();
</span><span class="cx"> const cairo_matrix_t matrix = cairo_matrix_t(transform);
</span><span class="cx"> cairo_transform(cr, &matrix);
</span><del>- m_data->concatCTM(transform);
</del><ins>+ m_data->concatPlatformCTM(transform);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setPlatformCTM(const AffineTransform& transform)
</span><span class="lines">@@ -800,7 +800,7 @@
</span><span class="cx"> cairo_t* cr = platformContext()->cr();
</span><span class="cx"> const cairo_matrix_t matrix = cairo_matrix_t(transform);
</span><span class="cx"> cairo_set_matrix(cr, &matrix);
</span><del>- m_data->setCTM(transform);
</del><ins>+ m_data->setPlatformCTM(transform);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setPlatformShadow(FloatSize const& size, float, Color const&, ColorSpace)
</span><span class="lines">@@ -1017,7 +1017,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> cairo_rotate(platformContext()->cr(), radians);
</span><del>- m_data->rotate(radians);
</del><ins>+ m_data->rotatePlatformCTM(radians);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::scalePlatformCTM(float x, float y)
</span><span class="lines">@@ -1026,7 +1026,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> cairo_scale(platformContext()->cr(), x, y);
</span><del>- m_data->scale(FloatSize(x, y));
</del><ins>+ m_data->scalePlatformCTM(x, y);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::clipOut(const FloatRect& r)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextPlatformPrivateCairoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h (191300 => 191301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h 2015-10-19 18:32:30 UTC (rev 191300)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h 2015-10-19 18:50:26 UTC (rev 191301)
</span><span class="lines">@@ -67,24 +67,24 @@
</span><span class="cx"> void flush();
</span><span class="cx"> void clip(const FloatRect&);
</span><span class="cx"> void clip(const Path&);
</span><del>- void scale(const FloatSize&);
- void rotate(float);
- void translate(float, float);
- void concatCTM(const AffineTransform&);
- void setCTM(const AffineTransform&);
</del><ins>+ void scalePlatformCTM(float, float);
+ void rotatePlatformCTM(float);
+ void translatePlatformCTM(float, float);
+ void concatPlatformCTM(const AffineTransform&);
+ void setPlatformCTM(const AffineTransform&);
</ins><span class="cx"> void syncContext(cairo_t* cr);
</span><span class="cx"> #else
</span><span class="cx"> // On everything else, we do nothing.
</span><del>- void save() {}
- void restore() {}
- void flush() {}
- void clip(const FloatRect&) {}
- void clip(const Path&) {}
- void scale(const FloatSize&) {}
- void rotate(float) {}
- void translate(float, float) {}
- void concatCTM(const AffineTransform&) {}
- void setCTM(const AffineTransform&) {}
</del><ins>+ void save() { }
+ void restore() { }
+ void flush() { }
+ void clip(const FloatRect&) { }
+ void clip(const Path&) { }
+ void scalePlatformCTM(float, float) { }
+ void rotatePlatformCTM(float) { }
+ void translatePlatformCTM(float, float) { }
+ void concatPlatformCTM(const AffineTransform&) { }
+ void setPlatformCTM(const AffineTransform&) { }
</ins><span class="cx"> void syncContext(cairo_t*) { }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>