<!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>[174739] 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/174739">174739</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-15 12:15:16 -0700 (Wed, 15 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for TransformOperation subclasses
https://bugs.webkit.org/show_bug.cgi?id=137731
Reviewed by Darin Adler.
Use is<>() / downcast<>() for TransformOperation subclasses and clean
up the surrounding code.
Source/WebCore:
No new tests, no behavior change.
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::validateTransformOperations):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::getTransformFunctionValue):
* platform/graphics/transforms/IdentityTransformOperation.h:
* platform/graphics/transforms/Matrix3DTransformOperation.cpp:
(WebCore::Matrix3DTransformOperation::operator==):
* platform/graphics/transforms/Matrix3DTransformOperation.h:
* platform/graphics/transforms/MatrixTransformOperation.cpp:
(WebCore::MatrixTransformOperation::operator==):
(WebCore::MatrixTransformOperation::blend):
* platform/graphics/transforms/MatrixTransformOperation.h:
* platform/graphics/transforms/PerspectiveTransformOperation.cpp:
(WebCore::PerspectiveTransformOperation::operator==):
(WebCore::PerspectiveTransformOperation::blend):
* platform/graphics/transforms/PerspectiveTransformOperation.h:
* platform/graphics/transforms/RotateTransformOperation.cpp:
(WebCore::RotateTransformOperation::operator==):
(WebCore::RotateTransformOperation::blend):
* platform/graphics/transforms/RotateTransformOperation.h:
* platform/graphics/transforms/ScaleTransformOperation.cpp:
(WebCore::ScaleTransformOperation::operator==):
(WebCore::ScaleTransformOperation::blend):
* platform/graphics/transforms/ScaleTransformOperation.h:
* platform/graphics/transforms/SkewTransformOperation.cpp:
(WebCore::SkewTransformOperation::operator==):
(WebCore::SkewTransformOperation::blend):
* platform/graphics/transforms/SkewTransformOperation.h:
* platform/graphics/transforms/TransformOperation.h:
* platform/graphics/transforms/TranslateTransformOperation.cpp:
(WebCore::TranslateTransformOperation::operator==):
(WebCore::TranslateTransformOperation::blend):
* platform/graphics/transforms/TranslateTransformOperation.h:
Source/WebKit2:
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(IPC::ArgumentCoder<TransformOperations>::encode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsIdentityTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsMatrix3DTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsMatrix3DTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsMatrixTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsMatrixTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsPerspectiveTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsPerspectiveTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsRotateTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsRotateTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsScaleTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsScaleTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsSkewTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsSkewTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/TransformOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTranslateTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTranslateTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/ChangeLog 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -1,5 +1,51 @@
</span><span class="cx"> 2014-10-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use is<>() / downcast<>() for TransformOperation subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137731
+
+ Reviewed by Darin Adler.
+
+ Use is<>() / downcast<>() for TransformOperation subclasses and clean
+ up the surrounding code.
+
+ No new tests, no behavior change.
+
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::validateTransformOperations):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::getTransformFunctionValue):
+ * platform/graphics/transforms/IdentityTransformOperation.h:
+ * platform/graphics/transforms/Matrix3DTransformOperation.cpp:
+ (WebCore::Matrix3DTransformOperation::operator==):
+ * platform/graphics/transforms/Matrix3DTransformOperation.h:
+ * platform/graphics/transforms/MatrixTransformOperation.cpp:
+ (WebCore::MatrixTransformOperation::operator==):
+ (WebCore::MatrixTransformOperation::blend):
+ * platform/graphics/transforms/MatrixTransformOperation.h:
+ * platform/graphics/transforms/PerspectiveTransformOperation.cpp:
+ (WebCore::PerspectiveTransformOperation::operator==):
+ (WebCore::PerspectiveTransformOperation::blend):
+ * platform/graphics/transforms/PerspectiveTransformOperation.h:
+ * platform/graphics/transforms/RotateTransformOperation.cpp:
+ (WebCore::RotateTransformOperation::operator==):
+ (WebCore::RotateTransformOperation::blend):
+ * platform/graphics/transforms/RotateTransformOperation.h:
+ * platform/graphics/transforms/ScaleTransformOperation.cpp:
+ (WebCore::ScaleTransformOperation::operator==):
+ (WebCore::ScaleTransformOperation::blend):
+ * platform/graphics/transforms/ScaleTransformOperation.h:
+ * platform/graphics/transforms/SkewTransformOperation.cpp:
+ (WebCore::SkewTransformOperation::operator==):
+ (WebCore::SkewTransformOperation::blend):
+ * platform/graphics/transforms/SkewTransformOperation.h:
+ * platform/graphics/transforms/TransformOperation.h:
+ * platform/graphics/transforms/TranslateTransformOperation.cpp:
+ (WebCore::TranslateTransformOperation::operator==):
+ (WebCore::TranslateTransformOperation::blend):
+ * platform/graphics/transforms/TranslateTransformOperation.h:
+
+2014-10-15 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use is<>() / downcast<>() for RenderTextControl / RenderTextControlSingleLine
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137727
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -521,8 +521,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Keyframes are valid, check for big rotations.
</span><del>- double lastRotAngle = 0.0;
- double maxRotAngle = -1.0;
</del><ins>+ double lastRotationAngle = 0.0;
+ double maxRotationAngle = -1.0;
</ins><span class="cx">
</span><span class="cx"> for (size_t j = 0; j < firstVal.operations().size(); ++j) {
</span><span class="cx"> TransformOperation::OperationType type = firstVal.operations().at(j)->type();
</span><span class="lines">@@ -532,23 +532,23 @@
</span><span class="cx"> type == TransformOperation::ROTATE_Y ||
</span><span class="cx"> type == TransformOperation::ROTATE_Z ||
</span><span class="cx"> type == TransformOperation::ROTATE_3D) {
</span><del>- lastRotAngle = toRotateTransformOperation(firstVal.operations().at(j).get())->angle();
</del><ins>+ lastRotationAngle = downcast<RotateTransformOperation>(*firstVal.operations().at(j)).angle();
</ins><span class="cx">
</span><del>- if (maxRotAngle < 0)
- maxRotAngle = fabs(lastRotAngle);
</del><ins>+ if (maxRotationAngle < 0)
+ maxRotationAngle = fabs(lastRotationAngle);
</ins><span class="cx">
</span><span class="cx"> for (size_t i = firstIndex + 1; i < valueList.size(); ++i) {
</span><span class="cx"> const TransformOperations& val = operationsAt(valueList, i);
</span><del>- double rotAngle = val.operations().isEmpty() ? 0 : (toRotateTransformOperation(val.operations().at(j).get())->angle());
- double diffAngle = fabs(rotAngle - lastRotAngle);
- if (diffAngle > maxRotAngle)
- maxRotAngle = diffAngle;
- lastRotAngle = rotAngle;
</del><ins>+ double rotationAngle = val.operations().isEmpty() ? 0 : downcast<RotateTransformOperation>(*val.operations().at(j)).angle();
+ double diffAngle = fabs(rotationAngle - lastRotationAngle);
+ if (diffAngle > maxRotationAngle)
+ maxRotationAngle = diffAngle;
+ lastRotationAngle = rotationAngle;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- hasBigRotation = maxRotAngle >= 180.0;
</del><ins>+ hasBigRotation = maxRotationAngle >= 180.0;
</ins><span class="cx">
</span><span class="cx"> return firstIndex;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -129,25 +129,25 @@
</span><span class="cx"> case TransformOperation::ROTATE:
</span><span class="cx"> case TransformOperation::ROTATE_X:
</span><span class="cx"> case TransformOperation::ROTATE_Y:
</span><del>- value = transformOp ? narrowPrecisionToFloat(deg2rad(toRotateTransformOperation(transformOp)->angle())) : 0;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(deg2rad(downcast<RotateTransformOperation>(*transformOp).angle())) : 0;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::SCALE_X:
</span><del>- value = transformOp ? narrowPrecisionToFloat(toScaleTransformOperation(transformOp)->x()) : 1;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(downcast<ScaleTransformOperation>(*transformOp).x()) : 1;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::SCALE_Y:
</span><del>- value = transformOp ? narrowPrecisionToFloat(toScaleTransformOperation(transformOp)->y()) : 1;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(downcast<ScaleTransformOperation>(*transformOp).y()) : 1;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::SCALE_Z:
</span><del>- value = transformOp ? narrowPrecisionToFloat(toScaleTransformOperation(transformOp)->z()) : 1;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(downcast<ScaleTransformOperation>(*transformOp).z()) : 1;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::TRANSLATE_X:
</span><del>- value = transformOp ? narrowPrecisionToFloat(toTranslateTransformOperation(transformOp)->x(size)) : 0;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(downcast<TranslateTransformOperation>(*transformOp).x(size)) : 0;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::TRANSLATE_Y:
</span><del>- value = transformOp ? narrowPrecisionToFloat(toTranslateTransformOperation(transformOp)->y(size)) : 0;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(downcast<TranslateTransformOperation>(*transformOp).y(size)) : 0;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::TRANSLATE_Z:
</span><del>- value = transformOp ? narrowPrecisionToFloat(toTranslateTransformOperation(transformOp)->z(size)) : 0;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(downcast<TranslateTransformOperation>(*transformOp).z(size)) : 0;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> switch (transformType) {
</span><span class="cx"> case TransformOperation::SCALE:
</span><span class="cx"> case TransformOperation::SCALE_3D: {
</span><del>- const ScaleTransformOperation* scaleTransformOp = toScaleTransformOperation(transformOp);
</del><ins>+ const auto* scaleTransformOp = downcast<ScaleTransformOperation>(transformOp);
</ins><span class="cx"> value.setX(scaleTransformOp ? narrowPrecisionToFloat(scaleTransformOp->x()) : 1);
</span><span class="cx"> value.setY(scaleTransformOp ? narrowPrecisionToFloat(scaleTransformOp->y()) : 1);
</span><span class="cx"> value.setZ(scaleTransformOp ? narrowPrecisionToFloat(scaleTransformOp->z()) : 1);
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> }
</span><span class="cx"> case TransformOperation::TRANSLATE:
</span><span class="cx"> case TransformOperation::TRANSLATE_3D: {
</span><del>- const TranslateTransformOperation* translateTransformOp = toTranslateTransformOperation(transformOp);
</del><ins>+ const auto* translateTransformOp = downcast<TranslateTransformOperation>(transformOp);
</ins><span class="cx"> value.setX(translateTransformOp ? narrowPrecisionToFloat(translateTransformOp->x(size)) : 0);
</span><span class="cx"> value.setY(translateTransformOp ? narrowPrecisionToFloat(translateTransformOp->y(size)) : 0);
</span><span class="cx"> value.setZ(translateTransformOp ? narrowPrecisionToFloat(translateTransformOp->z(size)) : 0);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsIdentityTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span><del>-TRANSFORMOPERATION_TYPE_CASTS(IdentityTransformOperation, type() == TransformOperation::IDENTITY);
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_TRANSFORMOPERATION(WebCore::IdentityTransformOperation, type() == WebCore::TransformOperation::IDENTITY)
+
</ins><span class="cx"> #endif // IdentityTransformOperation_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsMatrix3DTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -30,12 +30,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool Matrix3DTransformOperation::operator==(const TransformOperation& o) const
</del><ins>+bool Matrix3DTransformOperation::operator==(const TransformOperation& other) const
</ins><span class="cx"> {
</span><del>- if (!isSameType(o))
- return false;
- const Matrix3DTransformOperation& m = toMatrix3DTransformOperation(o);
- return m_matrix == m.m_matrix;
</del><ins>+ return isSameType(other) && m_matrix == downcast<Matrix3DTransformOperation>(other).m_matrix;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<TransformOperation> Matrix3DTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsMatrix3DTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx"> TransformationMatrix m_matrix;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-TRANSFORMOPERATION_TYPE_CASTS(Matrix3DTransformOperation, type() == TransformOperation::MATRIX_3D);
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_TRANSFORMOPERATION(WebCore::Matrix3DTransformOperation, type() == WebCore::TransformOperation::MATRIX_3D)
+
</ins><span class="cx"> #endif // Matrix3DTransformOperation_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsMatrixTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool MatrixTransformOperation::operator==(const TransformOperation& o) const
</del><ins>+bool MatrixTransformOperation::operator==(const TransformOperation& other) const
</ins><span class="cx"> {
</span><del>- if (!isSameType(o))
</del><ins>+ if (!isSameType(other))
</ins><span class="cx"> return false;
</span><del>- const MatrixTransformOperation& m = toMatrixTransformOperation(o);
</del><ins>+ const MatrixTransformOperation& m = downcast<MatrixTransformOperation>(other);
</ins><span class="cx"> return m_a == m.m_a && m_b == m.m_b && m_c == m.m_c && m_d == m.m_d && m_e == m.m_e && m_f == m.m_f;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -40,11 +40,10 @@
</span><span class="cx"> return this;
</span><span class="cx">
</span><span class="cx"> // convert the TransformOperations into matrices
</span><del>- FloatSize size;
</del><span class="cx"> TransformationMatrix fromT;
</span><span class="cx"> TransformationMatrix toT(m_a, m_b, m_c, m_d, m_e, m_f);
</span><span class="cx"> if (from) {
</span><del>- const MatrixTransformOperation& m = toMatrixTransformOperation(*from);
</del><ins>+ const MatrixTransformOperation& m = downcast<MatrixTransformOperation>(*from);
</ins><span class="cx"> fromT.setMatrix(m.m_a, m.m_b, m.m_c, m.m_d, m.m_e, m.m_f);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsMatrixTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> double m_f;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-TRANSFORMOPERATION_TYPE_CASTS(MatrixTransformOperation, type() == TransformOperation::MATRIX);
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_TRANSFORMOPERATION(WebCore::MatrixTransformOperation, type() == WebCore::TransformOperation::MATRIX)
+
</ins><span class="cx"> #endif // MatrixTransformOperation_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsPerspectiveTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -31,12 +31,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool PerspectiveTransformOperation::operator==(const TransformOperation& o) const
</del><ins>+bool PerspectiveTransformOperation::operator==(const TransformOperation& other) const
</ins><span class="cx"> {
</span><del>- if (!isSameType(o))
</del><ins>+ if (!isSameType(other))
</ins><span class="cx"> return false;
</span><del>- const PerspectiveTransformOperation& p = toPerspectiveTransformOperation(o);
- return m_p == p.m_p;
</del><ins>+ return m_p == downcast<PerspectiveTransformOperation>(other).m_p;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<TransformOperation> PerspectiveTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span><span class="lines">@@ -50,7 +49,7 @@
</span><span class="cx"> return PerspectiveTransformOperation::create(Length(clampToPositiveInteger(p), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const PerspectiveTransformOperation* fromOp = toPerspectiveTransformOperation(from);
</del><ins>+ const PerspectiveTransformOperation* fromOp = downcast<PerspectiveTransformOperation>(from);
</ins><span class="cx"> Length fromP = fromOp ? fromOp->m_p : Length(m_p.type());
</span><span class="cx"> Length toP = m_p;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsPerspectiveTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> Length m_p;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-TRANSFORMOPERATION_TYPE_CASTS(PerspectiveTransformOperation, type() == TransformOperation::PERSPECTIVE);
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_TRANSFORMOPERATION(WebCore::PerspectiveTransformOperation, type() == WebCore::TransformOperation::PERSPECTIVE)
+
</ins><span class="cx"> #endif // PerspectiveTransformOperation_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsRotateTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -28,11 +28,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool RotateTransformOperation::operator==(const TransformOperation& o) const
</del><ins>+bool RotateTransformOperation::operator==(const TransformOperation& other) const
</ins><span class="cx"> {
</span><del>- if (!isSameType(o))
</del><ins>+ if (!isSameType(other))
</ins><span class="cx"> return false;
</span><del>- const RotateTransformOperation& r = toRotateTransformOperation(o);
</del><ins>+ const RotateTransformOperation& r = downcast<RotateTransformOperation>(other);
</ins><span class="cx"> return m_x == r.m_x && m_y == r.m_y && m_z == r.m_z && m_angle == r.m_angle;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> if (blendToIdentity)
</span><span class="cx"> return RotateTransformOperation::create(m_x, m_y, m_z, m_angle - m_angle * progress, m_type);
</span><span class="cx">
</span><del>- const RotateTransformOperation* fromOp = toRotateTransformOperation(from);
</del><ins>+ const RotateTransformOperation* fromOp = downcast<RotateTransformOperation>(from);
</ins><span class="cx">
</span><span class="cx"> // Optimize for single axis rotation
</span><span class="cx"> if (!fromOp || (fromOp->m_x == 0 && fromOp->m_y == 0 && fromOp->m_z == 1) ||
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsRotateTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> OperationType m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-TRANSFORMOPERATION_TYPE_CASTS(RotateTransformOperation, isRotateTransformOperationType());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_TRANSFORMOPERATION(WebCore::RotateTransformOperation, isRotateTransformOperationType())
+
</ins><span class="cx"> #endif // RotateTransformOperation_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsScaleTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool ScaleTransformOperation::operator==(const TransformOperation& o) const
</del><ins>+bool ScaleTransformOperation::operator==(const TransformOperation& other) const
</ins><span class="cx"> {
</span><del>- if (!isSameType(o))
</del><ins>+ if (!isSameType(other))
</ins><span class="cx"> return false;
</span><del>- const ScaleTransformOperation& s = toScaleTransformOperation(o);
</del><ins>+ const ScaleTransformOperation& s = downcast<ScaleTransformOperation>(other);
</ins><span class="cx"> return m_x == s.m_x && m_y == s.m_y && m_z == s.m_z;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> WebCore::blend(m_y, 1.0, progress),
</span><span class="cx"> WebCore::blend(m_z, 1.0, progress), m_type);
</span><span class="cx">
</span><del>- const ScaleTransformOperation* fromOp = toScaleTransformOperation(from);
</del><ins>+ const ScaleTransformOperation* fromOp = downcast<ScaleTransformOperation>(from);
</ins><span class="cx"> double fromX = fromOp ? fromOp->m_x : 1.0;
</span><span class="cx"> double fromY = fromOp ? fromOp->m_y : 1.0;
</span><span class="cx"> double fromZ = fromOp ? fromOp->m_z : 1.0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsScaleTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -76,8 +76,8 @@
</span><span class="cx"> OperationType m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-TRANSFORMOPERATION_TYPE_CASTS(ScaleTransformOperation, isScaleTransformOperationType());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_TRANSFORMOPERATION(WebCore::ScaleTransformOperation, isScaleTransformOperationType())
+
</ins><span class="cx"> #endif // ScaleTransformOperation_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsSkewTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool SkewTransformOperation::operator==(const TransformOperation& o) const
</del><ins>+bool SkewTransformOperation::operator==(const TransformOperation& other) const
</ins><span class="cx"> {
</span><del>- if (!isSameType(o))
</del><ins>+ if (!isSameType(other))
</ins><span class="cx"> return false;
</span><del>- const SkewTransformOperation& s = toSkewTransformOperation(o);
</del><ins>+ const SkewTransformOperation& s = downcast<SkewTransformOperation>(other);
</ins><span class="cx"> return m_angleX == s.m_angleX && m_angleY == s.m_angleY;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> if (blendToIdentity)
</span><span class="cx"> return SkewTransformOperation::create(WebCore::blend(m_angleX, 0.0, progress), WebCore::blend(m_angleY, 0.0, progress), m_type);
</span><span class="cx">
</span><del>- const SkewTransformOperation* fromOp = toSkewTransformOperation(from);
</del><ins>+ const SkewTransformOperation* fromOp = downcast<SkewTransformOperation>(from);
</ins><span class="cx"> double fromAngleX = fromOp ? fromOp->m_angleX : 0;
</span><span class="cx"> double fromAngleY = fromOp ? fromOp->m_angleY : 0;
</span><span class="cx"> return SkewTransformOperation::create(WebCore::blend(fromAngleX, m_angleX, progress), WebCore::blend(fromAngleY, m_angleY, progress), m_type);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsSkewTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -67,8 +67,8 @@
</span><span class="cx"> OperationType m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-TRANSFORMOPERATION_TYPE_CASTS(SkewTransformOperation, isSkewTransformOperationType());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_TRANSFORMOPERATION(WebCore::SkewTransformOperation, isSkewTransformOperationType())
+
</ins><span class="cx"> #endif // SkewTransformOperation_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformOperation.h (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TransformOperation.h 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformOperation.h 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "TransformationMatrix.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -101,9 +102,11 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define TRANSFORMOPERATION_TYPE_CASTS(ToValueTypeName, predicate) \
- TYPE_CASTS_BASE(ToValueTypeName, WebCore::TransformOperation, value, value->predicate, value.predicate)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+#define SPECIALIZE_TYPE_TRAITS_TRANSFORMOPERATION(ToValueTypeName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(ToValueTypeName) \
+ static bool isType(const WebCore::TransformOperation& operation) { return operation.predicate; } \
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #endif // TransformOperation_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTranslateTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -25,11 +25,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool TranslateTransformOperation::operator==(const TransformOperation& o) const
</del><ins>+bool TranslateTransformOperation::operator==(const TransformOperation& other) const
</ins><span class="cx"> {
</span><del>- if (!isSameType(o))
</del><ins>+ if (!isSameType(other))
</ins><span class="cx"> return false;
</span><del>- const TranslateTransformOperation& t = toTranslateTransformOperation(o);
</del><ins>+ const TranslateTransformOperation& t = downcast<TranslateTransformOperation>(other);
</ins><span class="cx"> return m_x == t.m_x && m_y == t.m_y && m_z == t.m_z;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> if (blendToIdentity)
</span><span class="cx"> return TranslateTransformOperation::create(zeroLength.blend(m_x, progress), zeroLength.blend(m_y, progress), zeroLength.blend(m_z, progress), m_type);
</span><span class="cx">
</span><del>- const TranslateTransformOperation* fromOp = toTranslateTransformOperation(from);
</del><ins>+ const TranslateTransformOperation* fromOp = downcast<TranslateTransformOperation>(from);
</ins><span class="cx"> Length fromX = fromOp ? fromOp->m_x : zeroLength;
</span><span class="cx"> Length fromY = fromOp ? fromOp->m_y : zeroLength;
</span><span class="cx"> Length fromZ = fromOp ? fromOp->m_z : zeroLength;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTranslateTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -82,8 +82,8 @@
</span><span class="cx"> OperationType m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-TRANSFORMOPERATION_TYPE_CASTS(TranslateTransformOperation, isTranslateTransformOperationType());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_TRANSFORMOPERATION(WebCore::TranslateTransformOperation, isTranslateTransformOperationType())
+
</ins><span class="cx"> #endif // TranslateTransformOperation_h
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-10-15 Chris Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for TransformOperation subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137731
+
+ Reviewed by Darin Adler.
+
+ Use is<>() / downcast<>() for TransformOperation subclasses and clean
+ up the surrounding code.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (IPC::ArgumentCoder<TransformOperations>::encode):
+
</ins><span class="cx"> 2014-10-15 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Allow some Kerberos related paths in sandbox
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (174738 => 174739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2014-10-15 19:04:08 UTC (rev 174738)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2014-10-15 19:15:16 UTC (rev 174739)
</span><span class="lines">@@ -171,8 +171,7 @@
</span><span class="cx"> void ArgumentCoder<TransformOperations>::encode(ArgumentEncoder& encoder, const TransformOperations& transformOperations)
</span><span class="cx"> {
</span><span class="cx"> encoder << static_cast<uint32_t>(transformOperations.size());
</span><del>- for (size_t i = 0; i < transformOperations.size(); ++i) {
- const TransformOperation* operation = transformOperations.at(i);
</del><ins>+ for (const auto& operation : transformOperations.operations()) {
</ins><span class="cx"> encoder.encodeEnum(operation->type());
</span><span class="cx">
</span><span class="cx"> switch (operation->type()) {
</span><span class="lines">@@ -180,43 +179,51 @@
</span><span class="cx"> case TransformOperation::SCALE_Y:
</span><span class="cx"> case TransformOperation::SCALE:
</span><span class="cx"> case TransformOperation::SCALE_Z:
</span><del>- case TransformOperation::SCALE_3D:
- encoder << toScaleTransformOperation(operation)->x();
- encoder << toScaleTransformOperation(operation)->y();
- encoder << toScaleTransformOperation(operation)->z();
</del><ins>+ case TransformOperation::SCALE_3D: {
+ const auto& scaleOperation = downcast<ScaleTransformOperation>(*operation);
+ encoder << scaleOperation.x();
+ encoder << scaleOperation.y();
+ encoder << scaleOperation.z();
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case TransformOperation::TRANSLATE_X:
</span><span class="cx"> case TransformOperation::TRANSLATE_Y:
</span><span class="cx"> case TransformOperation::TRANSLATE:
</span><span class="cx"> case TransformOperation::TRANSLATE_Z:
</span><del>- case TransformOperation::TRANSLATE_3D:
- ArgumentCoder<Length>::encode(encoder, toTranslateTransformOperation(operation)->x());
- ArgumentCoder<Length>::encode(encoder, toTranslateTransformOperation(operation)->y());
- ArgumentCoder<Length>::encode(encoder, toTranslateTransformOperation(operation)->z());
</del><ins>+ case TransformOperation::TRANSLATE_3D: {
+ const auto& translateOperation = downcast<TranslateTransformOperation>(*operation);
+ ArgumentCoder<Length>::encode(encoder, translateOperation.x());
+ ArgumentCoder<Length>::encode(encoder, translateOperation.y());
+ ArgumentCoder<Length>::encode(encoder, translateOperation.z());
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case TransformOperation::ROTATE:
</span><span class="cx"> case TransformOperation::ROTATE_X:
</span><span class="cx"> case TransformOperation::ROTATE_Y:
</span><del>- case TransformOperation::ROTATE_3D:
- encoder << toRotateTransformOperation(operation)->x();
- encoder << toRotateTransformOperation(operation)->y();
- encoder << toRotateTransformOperation(operation)->z();
- encoder << toRotateTransformOperation(operation)->angle();
</del><ins>+ case TransformOperation::ROTATE_3D: {
+ const auto& rotateOperation = downcast<RotateTransformOperation>(*operation);
+ encoder << rotateOperation.x();
+ encoder << rotateOperation.y();
+ encoder << rotateOperation.z();
+ encoder << rotateOperation.angle();
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case TransformOperation::SKEW_X:
</span><span class="cx"> case TransformOperation::SKEW_Y:
</span><del>- case TransformOperation::SKEW:
- encoder << toSkewTransformOperation(operation)->angleX();
- encoder << toSkewTransformOperation(operation)->angleY();
</del><ins>+ case TransformOperation::SKEW: {
+ const auto& skewOperation = downcast<SkewTransformOperation>(*operation);
+ encoder << skewOperation.angleX();
+ encoder << skewOperation.angleY();
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case TransformOperation::MATRIX:
</span><del>- ArgumentCoder<TransformationMatrix>::encode(encoder, toMatrixTransformOperation(operation)->matrix());
</del><ins>+ ArgumentCoder<TransformationMatrix>::encode(encoder, downcast<MatrixTransformOperation>(*operation).matrix());
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::MATRIX_3D:
</span><del>- ArgumentCoder<TransformationMatrix>::encode(encoder, toMatrix3DTransformOperation(operation)->matrix());
</del><ins>+ ArgumentCoder<TransformationMatrix>::encode(encoder, downcast<Matrix3DTransformOperation>(*operation).matrix());
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::PERSPECTIVE:
</span><del>- ArgumentCoder<Length>::encode(encoder, toPerspectiveTransformOperation(operation)->perspective());
</del><ins>+ ArgumentCoder<Length>::encode(encoder, downcast<PerspectiveTransformOperation>(*operation).perspective());
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::IDENTITY:
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>