<!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>[169320] 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/169320">169320</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-05-25 11:09:16 -0700 (Sun, 25 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add type-checked casts for TransformOperations
<http://webkit.org/b/133217>
Reviewed by Simon Fraser.
Source/WebCore:
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::validateTransformOperations):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::getTransformFunctionValue):
- Switch to type-checked casts.
* platform/graphics/transforms/IdentityTransformOperation.h:
* platform/graphics/transforms/Matrix3DTransformOperation.h:
* platform/graphics/transforms/MatrixTransformOperation.h:
* platform/graphics/transforms/PerspectiveTransformOperation.h:
* platform/graphics/transforms/RotateTransformOperation.h:
* platform/graphics/transforms/ScaleTransformOperation.h:
* platform/graphics/transforms/SkewTransformOperation.h:
* platform/graphics/transforms/TranslateTransformOperation.h:
- Add 'final' to class declaration.
- Add 'override' to overridden methods.
- Add type-checked cast via TRANSFORMOPERATION_TYPE_CASTS macro.
- Move implementation of operator==(const TransformOperation&)
from header to source file so it is able to use a type-checked
cast, and switch back to using a reference instead of a
pointer.
- Add or update ASSERT in private constructor to check for
correct OperationType in classes that represent multiple
types.
* platform/graphics/transforms/Matrix3DTransformOperation.cpp:
(WebCore::Matrix3DTransformOperation::operator==): Added.
* platform/graphics/transforms/MatrixTransformOperation.cpp:
(WebCore::Matrix3DTransformOperation::operator==): Added.
(WebCore::MatrixTransformOperation::blend):
- Switch to type-checked casts and use a reference.
* platform/graphics/transforms/PerspectiveTransformOperation.cpp:
(WebCore::Matrix3DTransformOperation::operator==): Added.
(WebCore::PerspectiveTransformOperation::blend):
* platform/graphics/transforms/RotateTransformOperation.cpp:
(WebCore::Matrix3DTransformOperation::operator==): Added.
(WebCore::RotateTransformOperation::blend):
* platform/graphics/transforms/ScaleTransformOperation.cpp:
(WebCore::Matrix3DTransformOperation::operator==): Added.
(WebCore::ScaleTransformOperation::blend):
* platform/graphics/transforms/SkewTransformOperation.cpp:
(WebCore::Matrix3DTransformOperation::operator==): Added.
(WebCore::SkewTransformOperation::blend):
* platform/graphics/transforms/TranslateTransformOperation.cpp:
(WebCore::Matrix3DTransformOperation::operator==): Added.
(WebCore::TranslateTransformOperation::blend):
- Switch to type-checked casts.
* platform/graphics/transforms/TransformOperation.h:
(WebCore::TransformOperation::isRotateTransformOperationType):
(WebCore::TransformOperation::isScaleTransformOperationType):
(WebCore::TransformOperation::isSkewTransformOperationType):
(WebCore::TransformOperation::isTranslateTransformOperationType):
- Add type-checking methods used in constructors and type-checked
casts.
- Define TRANSFORMOPERATION_TYPE_CASTS macro used by subclasses.
Source/WebKit2:
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(IPC::ArgumentCoder<TransformOperations>::encode):
- Switch to type-checked casts.</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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/ChangeLog 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -1,5 +1,71 @@
</span><span class="cx"> 2014-05-25 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><ins>+ Add type-checked casts for TransformOperations
+ <http://webkit.org/b/133217>
+
+ Reviewed by Simon Fraser.
+
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::validateTransformOperations):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::getTransformFunctionValue):
+ - Switch to type-checked casts.
+
+ * platform/graphics/transforms/IdentityTransformOperation.h:
+ * platform/graphics/transforms/Matrix3DTransformOperation.h:
+ * platform/graphics/transforms/MatrixTransformOperation.h:
+ * platform/graphics/transforms/PerspectiveTransformOperation.h:
+ * platform/graphics/transforms/RotateTransformOperation.h:
+ * platform/graphics/transforms/ScaleTransformOperation.h:
+ * platform/graphics/transforms/SkewTransformOperation.h:
+ * platform/graphics/transforms/TranslateTransformOperation.h:
+ - Add 'final' to class declaration.
+ - Add 'override' to overridden methods.
+ - Add type-checked cast via TRANSFORMOPERATION_TYPE_CASTS macro.
+ - Move implementation of operator==(const TransformOperation&)
+ from header to source file so it is able to use a type-checked
+ cast, and switch back to using a reference instead of a
+ pointer.
+ - Add or update ASSERT in private constructor to check for
+ correct OperationType in classes that represent multiple
+ types.
+
+ * platform/graphics/transforms/Matrix3DTransformOperation.cpp:
+ (WebCore::Matrix3DTransformOperation::operator==): Added.
+
+ * platform/graphics/transforms/MatrixTransformOperation.cpp:
+ (WebCore::Matrix3DTransformOperation::operator==): Added.
+ (WebCore::MatrixTransformOperation::blend):
+ - Switch to type-checked casts and use a reference.
+
+ * platform/graphics/transforms/PerspectiveTransformOperation.cpp:
+ (WebCore::Matrix3DTransformOperation::operator==): Added.
+ (WebCore::PerspectiveTransformOperation::blend):
+ * platform/graphics/transforms/RotateTransformOperation.cpp:
+ (WebCore::Matrix3DTransformOperation::operator==): Added.
+ (WebCore::RotateTransformOperation::blend):
+ * platform/graphics/transforms/ScaleTransformOperation.cpp:
+ (WebCore::Matrix3DTransformOperation::operator==): Added.
+ (WebCore::ScaleTransformOperation::blend):
+ * platform/graphics/transforms/SkewTransformOperation.cpp:
+ (WebCore::Matrix3DTransformOperation::operator==): Added.
+ (WebCore::SkewTransformOperation::blend):
+ * platform/graphics/transforms/TranslateTransformOperation.cpp:
+ (WebCore::Matrix3DTransformOperation::operator==): Added.
+ (WebCore::TranslateTransformOperation::blend):
+ - Switch to type-checked casts.
+
+ * platform/graphics/transforms/TransformOperation.h:
+ (WebCore::TransformOperation::isRotateTransformOperationType):
+ (WebCore::TransformOperation::isScaleTransformOperationType):
+ (WebCore::TransformOperation::isSkewTransformOperationType):
+ (WebCore::TransformOperation::isTranslateTransformOperationType):
+ - Add type-checking methods used in constructors and type-checked
+ casts.
+ - Define TRANSFORMOPERATION_TYPE_CASTS macro used by subclasses.
+
+2014-05-25 David Kilzer <ddkilzer@apple.com>
+
</ins><span class="cx"> Crash in WebCore::TextResourceDecoder::checkForCSSCharset
</span><span class="cx"> <http://webkit.org/b/133257>
</span><span class="cx"> <rdar://problem/17027109>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -516,14 +516,14 @@
</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 = static_cast<RotateTransformOperation*>(firstVal.operations().at(j).get())->angle();
</del><ins>+ lastRotAngle = toRotateTransformOperation(firstVal.operations().at(j).get())->angle();
</ins><span class="cx">
</span><span class="cx"> if (maxRotAngle < 0)
</span><span class="cx"> maxRotAngle = fabs(lastRotAngle);
</span><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 : (static_cast<RotateTransformOperation*>(val.operations().at(j).get())->angle());
</del><ins>+ double rotAngle = val.operations().isEmpty() ? 0 : (toRotateTransformOperation(val.operations().at(j).get())->angle());
</ins><span class="cx"> double diffAngle = fabs(rotAngle - lastRotAngle);
</span><span class="cx"> if (diffAngle > maxRotAngle)
</span><span class="cx"> maxRotAngle = diffAngle;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-05-25 18:09:16 UTC (rev 169320)
</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(static_cast<const RotateTransformOperation*>(transformOp)->angle())) : 0;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(deg2rad(toRotateTransformOperation(transformOp)->angle())) : 0;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::SCALE_X:
</span><del>- value = transformOp ? narrowPrecisionToFloat(static_cast<const ScaleTransformOperation*>(transformOp)->x()) : 1;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(toScaleTransformOperation(transformOp)->x()) : 1;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::SCALE_Y:
</span><del>- value = transformOp ? narrowPrecisionToFloat(static_cast<const ScaleTransformOperation*>(transformOp)->y()) : 1;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(toScaleTransformOperation(transformOp)->y()) : 1;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::SCALE_Z:
</span><del>- value = transformOp ? narrowPrecisionToFloat(static_cast<const ScaleTransformOperation*>(transformOp)->z()) : 1;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(toScaleTransformOperation(transformOp)->z()) : 1;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::TRANSLATE_X:
</span><del>- value = transformOp ? narrowPrecisionToFloat(static_cast<const TranslateTransformOperation*>(transformOp)->x(size)) : 0;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(toTranslateTransformOperation(transformOp)->x(size)) : 0;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::TRANSLATE_Y:
</span><del>- value = transformOp ? narrowPrecisionToFloat(static_cast<const TranslateTransformOperation*>(transformOp)->y(size)) : 0;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(toTranslateTransformOperation(transformOp)->y(size)) : 0;
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::TRANSLATE_Z:
</span><del>- value = transformOp ? narrowPrecisionToFloat(static_cast<const TranslateTransformOperation*>(transformOp)->z(size)) : 0;
</del><ins>+ value = transformOp ? narrowPrecisionToFloat(toTranslateTransformOperation(transformOp)->z(size)) : 0;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="lines">@@ -158,17 +158,21 @@
</span><span class="cx"> {
</span><span class="cx"> switch (transformType) {
</span><span class="cx"> case TransformOperation::SCALE:
</span><del>- case TransformOperation::SCALE_3D:
- value.setX(transformOp ? narrowPrecisionToFloat(static_cast<const ScaleTransformOperation*>(transformOp)->x()) : 1);
- value.setY(transformOp ? narrowPrecisionToFloat(static_cast<const ScaleTransformOperation*>(transformOp)->y()) : 1);
- value.setZ(transformOp ? narrowPrecisionToFloat(static_cast<const ScaleTransformOperation*>(transformOp)->z()) : 1);
</del><ins>+ case TransformOperation::SCALE_3D: {
+ const ScaleTransformOperation* scaleTransformOp = toScaleTransformOperation(transformOp);
+ value.setX(scaleTransformOp ? narrowPrecisionToFloat(scaleTransformOp->x()) : 1);
+ value.setY(scaleTransformOp ? narrowPrecisionToFloat(scaleTransformOp->y()) : 1);
+ value.setZ(scaleTransformOp ? narrowPrecisionToFloat(scaleTransformOp->z()) : 1);
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case TransformOperation::TRANSLATE:
</span><del>- case TransformOperation::TRANSLATE_3D:
- value.setX(transformOp ? narrowPrecisionToFloat(static_cast<const TranslateTransformOperation*>(transformOp)->x(size)) : 0);
- value.setY(transformOp ? narrowPrecisionToFloat(static_cast<const TranslateTransformOperation*>(transformOp)->y(size)) : 0);
- value.setZ(transformOp ? narrowPrecisionToFloat(static_cast<const TranslateTransformOperation*>(transformOp)->z(size)) : 0);
</del><ins>+ case TransformOperation::TRANSLATE_3D: {
+ const TranslateTransformOperation* translateTransformOp = toTranslateTransformOperation(transformOp);
+ value.setX(translateTransformOp ? narrowPrecisionToFloat(translateTransformOp->x(size)) : 0);
+ value.setY(translateTransformOp ? narrowPrecisionToFloat(translateTransformOp->y(size)) : 0);
+ value.setZ(translateTransformOp ? narrowPrecisionToFloat(translateTransformOp->z(size)) : 0);
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsIdentityTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class IdentityTransformOperation : public TransformOperation {
</del><ins>+class IdentityTransformOperation final : public TransformOperation {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<IdentityTransformOperation> create()
</span><span class="cx"> {
</span><span class="lines">@@ -37,21 +37,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isIdentity() const { return true; }
- virtual OperationType type() const { return IDENTITY; }
- virtual bool isSameType(const TransformOperation& o) const { return o.type() == IDENTITY; }
</del><ins>+ virtual bool isIdentity() const override { return true; }
+ virtual OperationType type() const override { return IDENTITY; }
+ virtual bool isSameType(const TransformOperation& o) const override { return o.type() == IDENTITY; }
</ins><span class="cx">
</span><del>- virtual bool operator==(const TransformOperation& o) const
</del><ins>+ virtual bool operator==(const TransformOperation& o) const override
</ins><span class="cx"> {
</span><span class="cx"> return isSameType(o);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool apply(TransformationMatrix&, const FloatSize&) const
</del><ins>+ virtual bool apply(TransformationMatrix&, const FloatSize&) const override
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual PassRefPtr<TransformOperation> blend(const TransformOperation*, double, bool = false)
</del><ins>+ virtual PassRefPtr<TransformOperation> blend(const TransformOperation*, double, bool = false) override
</ins><span class="cx"> {
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="lines">@@ -62,6 +62,8 @@
</span><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TRANSFORMOPERATION_TYPE_CASTS(IdentityTransformOperation, type() == TransformOperation::IDENTITY);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -30,6 +30,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool Matrix3DTransformOperation::operator==(const TransformOperation& o) const
+{
+ if (!isSameType(o))
+ return false;
+ const Matrix3DTransformOperation& m = toMatrix3DTransformOperation(o);
+ return m_matrix == m.m_matrix;
+}
+
</ins><span class="cx"> PassRefPtr<TransformOperation> Matrix3DTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span><span class="cx"> {
</span><span class="cx"> if (from && !from->isSameType(*this))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsMatrix3DTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Matrix3DTransformOperation : public TransformOperation {
</del><ins>+class Matrix3DTransformOperation final : public TransformOperation {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<Matrix3DTransformOperation> create(const TransformationMatrix& matrix)
</span><span class="cx"> {
</span><span class="lines">@@ -40,26 +40,20 @@
</span><span class="cx"> TransformationMatrix matrix() const {return m_matrix; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isIdentity() const { return m_matrix.isIdentity(); }
</del><ins>+ virtual bool isIdentity() const override { return m_matrix.isIdentity(); }
</ins><span class="cx">
</span><del>- virtual OperationType type() const { return MATRIX_3D; }
- virtual bool isSameType(const TransformOperation& o) const { return o.type() == MATRIX_3D; }
</del><ins>+ virtual OperationType type() const override { return MATRIX_3D; }
+ virtual bool isSameType(const TransformOperation& o) const override { return o.type() == MATRIX_3D; }
</ins><span class="cx">
</span><del>- virtual bool operator==(const TransformOperation& o) const
- {
- if (!isSameType(o))
- return false;
- const Matrix3DTransformOperation* m = static_cast<const Matrix3DTransformOperation*>(&o);
- return m_matrix == m->m_matrix;
- }
</del><ins>+ virtual bool operator==(const TransformOperation&) const override;
</ins><span class="cx">
</span><del>- virtual bool apply(TransformationMatrix& transform, const FloatSize&) const
</del><ins>+ virtual bool apply(TransformationMatrix& transform, const FloatSize&) const override
</ins><span class="cx"> {
</span><span class="cx"> transform.multiply(TransformationMatrix(m_matrix));
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false);
</del><ins>+ virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
</ins><span class="cx">
</span><span class="cx"> Matrix3DTransformOperation(const TransformationMatrix& mat)
</span><span class="cx"> {
</span><span class="lines">@@ -69,6 +63,8 @@
</span><span class="cx"> TransformationMatrix m_matrix;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TRANSFORMOPERATION_TYPE_CASTS(Matrix3DTransformOperation, type() == TransformOperation::MATRIX_3D);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -26,6 +26,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool MatrixTransformOperation::operator==(const TransformOperation& o) const
+{
+ if (!isSameType(o))
+ return false;
+ const MatrixTransformOperation& m = toMatrixTransformOperation(o);
+ 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;
+}
+
</ins><span class="cx"> PassRefPtr<TransformOperation> MatrixTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span><span class="cx"> {
</span><span class="cx"> if (from && !from->isSameType(*this))
</span><span class="lines">@@ -36,8 +44,8 @@
</span><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 = static_cast<const MatrixTransformOperation*>(from);
- fromT.setMatrix(m->m_a, m->m_b, m->m_c, m->m_d, m->m_e, m->m_f);
</del><ins>+ const MatrixTransformOperation& m = toMatrixTransformOperation(*from);
+ fromT.setMatrix(m.m_a, m.m_b, m.m_c, m.m_d, m.m_e, m.m_f);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (blendToIdentity)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsMatrixTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MatrixTransformOperation : public TransformOperation {
</del><ins>+class MatrixTransformOperation final : public TransformOperation {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<MatrixTransformOperation> create(double a, double b, double c, double d, double e, double f)
</span><span class="cx"> {
</span><span class="lines">@@ -45,28 +45,21 @@
</span><span class="cx"> TransformationMatrix matrix() const { return TransformationMatrix(m_a, m_b, m_c, m_d, m_e, m_f); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isIdentity() const { return m_a == 1 && m_b == 0 && m_c == 0 && m_d == 1 && m_e == 0 && m_f == 0; }
</del><ins>+ virtual bool isIdentity() const override { return m_a == 1 && m_b == 0 && m_c == 0 && m_d == 1 && m_e == 0 && m_f == 0; }
</ins><span class="cx">
</span><del>- virtual OperationType type() const { return MATRIX; }
- virtual bool isSameType(const TransformOperation& o) const { return o.type() == MATRIX; }
</del><ins>+ virtual OperationType type() const override { return MATRIX; }
+ virtual bool isSameType(const TransformOperation& o) const override { return o.type() == MATRIX; }
</ins><span class="cx">
</span><del>- virtual bool operator==(const TransformOperation& o) const
- {
- if (!isSameType(o))
- return false;
</del><ins>+ virtual bool operator==(const TransformOperation&) const override;
</ins><span class="cx">
</span><del>- const MatrixTransformOperation* m = static_cast<const MatrixTransformOperation*>(&o);
- 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;
- }
-
- virtual bool apply(TransformationMatrix& transform, const FloatSize&) const
</del><ins>+ virtual bool apply(TransformationMatrix& transform, const FloatSize&) const override
</ins><span class="cx"> {
</span><span class="cx"> TransformationMatrix matrix(m_a, m_b, m_c, m_d, m_e, m_f);
</span><span class="cx"> transform.multiply(matrix);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false);
</del><ins>+ virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
</ins><span class="cx">
</span><span class="cx"> MatrixTransformOperation(double a, double b, double c, double d, double e, double f)
</span><span class="cx"> : m_a(a)
</span><span class="lines">@@ -96,6 +89,8 @@
</span><span class="cx"> double m_f;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TRANSFORMOPERATION_TYPE_CASTS(MatrixTransformOperation, type() == TransformOperation::MATRIX);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -31,6 +31,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool PerspectiveTransformOperation::operator==(const TransformOperation& o) const
+{
+ if (!isSameType(o))
+ return false;
+ const PerspectiveTransformOperation& p = toPerspectiveTransformOperation(o);
+ return m_p == p.m_p;
+}
+
</ins><span class="cx"> PassRefPtr<TransformOperation> PerspectiveTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span><span class="cx"> {
</span><span class="cx"> if (from && !from->isSameType(*this))
</span><span class="lines">@@ -42,7 +50,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 = static_cast<const PerspectiveTransformOperation*>(from);
</del><ins>+ const PerspectiveTransformOperation* fromOp = toPerspectiveTransformOperation(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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class PerspectiveTransformOperation : public TransformOperation {
</del><ins>+class PerspectiveTransformOperation final : public TransformOperation {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<PerspectiveTransformOperation> create(const Length& p)
</span><span class="cx"> {
</span><span class="lines">@@ -42,25 +42,19 @@
</span><span class="cx"> Length perspective() const { return m_p; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isIdentity() const { return !floatValueForLength(m_p, 1); }
- virtual OperationType type() const { return PERSPECTIVE; }
- virtual bool isSameType(const TransformOperation& o) const { return o.type() == PERSPECTIVE; }
</del><ins>+ virtual bool isIdentity() const override { return !floatValueForLength(m_p, 1); }
+ virtual OperationType type() const override { return PERSPECTIVE; }
+ virtual bool isSameType(const TransformOperation& o) const override { return o.type() == PERSPECTIVE; }
</ins><span class="cx">
</span><del>- virtual bool operator==(const TransformOperation& o) const
- {
- if (!isSameType(o))
- return false;
- const PerspectiveTransformOperation* p = static_cast<const PerspectiveTransformOperation*>(&o);
- return m_p == p->m_p;
- }
</del><ins>+ virtual bool operator==(const TransformOperation&) const override;
</ins><span class="cx">
</span><del>- virtual bool apply(TransformationMatrix& transform, const FloatSize&) const
</del><ins>+ virtual bool apply(TransformationMatrix& transform, const FloatSize&) const override
</ins><span class="cx"> {
</span><span class="cx"> transform.applyPerspective(floatValueForLength(m_p, 1));
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false);
</del><ins>+ virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
</ins><span class="cx">
</span><span class="cx"> PerspectiveTransformOperation(const Length& p)
</span><span class="cx"> : m_p(p)
</span><span class="lines">@@ -71,6 +65,8 @@
</span><span class="cx"> Length m_p;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TRANSFORMOPERATION_TYPE_CASTS(PerspectiveTransformOperation, type() == TransformOperation::PERSPECTIVE);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -28,6 +28,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool RotateTransformOperation::operator==(const TransformOperation& o) const
+{
+ if (!isSameType(o))
+ return false;
+ const RotateTransformOperation& r = toRotateTransformOperation(o);
+ return m_x == r.m_x && m_y == r.m_y && m_z == r.m_z && m_angle == r.m_angle;
+}
+
</ins><span class="cx"> PassRefPtr<TransformOperation> RotateTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span><span class="cx"> {
</span><span class="cx"> if (from && !from->isSameType(*this))
</span><span class="lines">@@ -36,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 = static_cast<const RotateTransformOperation*>(from);
</del><ins>+ const RotateTransformOperation* fromOp = toRotateTransformOperation(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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class RotateTransformOperation : public TransformOperation {
</del><ins>+class RotateTransformOperation final : public TransformOperation {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<RotateTransformOperation> create(double angle, OperationType type)
</span><span class="cx"> {
</span><span class="lines">@@ -47,26 +47,20 @@
</span><span class="cx"> double angle() const { return m_angle; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isIdentity() const { return m_angle == 0; }
</del><ins>+ virtual bool isIdentity() const override { return m_angle == 0; }
</ins><span class="cx">
</span><del>- virtual OperationType type() const { return m_type; }
- virtual bool isSameType(const TransformOperation& o) const { return o.type() == m_type; }
</del><ins>+ virtual OperationType type() const override { return m_type; }
+ virtual bool isSameType(const TransformOperation& o) const override { return o.type() == m_type; }
</ins><span class="cx">
</span><del>- virtual bool operator==(const TransformOperation& o) const
- {
- if (!isSameType(o))
- return false;
- const RotateTransformOperation* r = static_cast<const RotateTransformOperation*>(&o);
- return m_x == r->m_x && m_y == r->m_y && m_z == r->m_z && m_angle == r->m_angle;
- }
</del><ins>+ virtual bool operator==(const TransformOperation&) const override;
</ins><span class="cx">
</span><del>- virtual bool apply(TransformationMatrix& transform, const FloatSize& /*borderBoxSize*/) const
</del><ins>+ virtual bool apply(TransformationMatrix& transform, const FloatSize& /*borderBoxSize*/) const override
</ins><span class="cx"> {
</span><span class="cx"> transform.rotate3d(m_x, m_y, m_z, m_angle);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false);
</del><ins>+ virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
</ins><span class="cx">
</span><span class="cx"> RotateTransformOperation(double x, double y, double z, double angle, OperationType type)
</span><span class="cx"> : m_x(x)
</span><span class="lines">@@ -75,7 +69,7 @@
</span><span class="cx"> , m_angle(angle)
</span><span class="cx"> , m_type(type)
</span><span class="cx"> {
</span><del>- ASSERT(type == ROTATE_X || type == ROTATE_Y || type == ROTATE_Z || type == ROTATE_3D);
</del><ins>+ ASSERT(isRotateTransformOperationType());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double m_x;
</span><span class="lines">@@ -85,6 +79,8 @@
</span><span class="cx"> OperationType m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TRANSFORMOPERATION_TYPE_CASTS(RotateTransformOperation, isRotateTransformOperationType());
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -26,6 +26,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool ScaleTransformOperation::operator==(const TransformOperation& o) const
+{
+ if (!isSameType(o))
+ return false;
+ const ScaleTransformOperation& s = toScaleTransformOperation(o);
+ return m_x == s.m_x && m_y == s.m_y && m_z == s.m_z;
+}
+
</ins><span class="cx"> PassRefPtr<TransformOperation> ScaleTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span><span class="cx"> {
</span><span class="cx"> if (from && !from->isSameType(*this))
</span><span class="lines">@@ -36,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 = static_cast<const ScaleTransformOperation*>(from);
</del><ins>+ const ScaleTransformOperation* fromOp = toScaleTransformOperation(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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class ScaleTransformOperation : public TransformOperation {
</del><ins>+class ScaleTransformOperation final : public TransformOperation {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<ScaleTransformOperation> create(double sx, double sy, OperationType type)
</span><span class="cx"> {
</span><span class="lines">@@ -46,26 +46,20 @@
</span><span class="cx"> double z() const { return m_z; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isIdentity() const { return m_x == 1 && m_y == 1 && m_z == 1; }
</del><ins>+ virtual bool isIdentity() const override { return m_x == 1 && m_y == 1 && m_z == 1; }
</ins><span class="cx">
</span><del>- virtual OperationType type() const { return m_type; }
- virtual bool isSameType(const TransformOperation& o) const { return o.type() == m_type; }
</del><ins>+ virtual OperationType type() const override { return m_type; }
+ virtual bool isSameType(const TransformOperation& o) const override { return o.type() == m_type; }
</ins><span class="cx">
</span><del>- virtual bool operator==(const TransformOperation& o) const
- {
- if (!isSameType(o))
- return false;
- const ScaleTransformOperation* s = static_cast<const ScaleTransformOperation*>(&o);
- return m_x == s->m_x && m_y == s->m_y && m_z == s->m_z;
- }
</del><ins>+ virtual bool operator==(const TransformOperation&) const override;
</ins><span class="cx">
</span><del>- virtual bool apply(TransformationMatrix& transform, const FloatSize&) const
</del><ins>+ virtual bool apply(TransformationMatrix& transform, const FloatSize&) const override
</ins><span class="cx"> {
</span><span class="cx"> transform.scale3d(m_x, m_y, m_z);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false);
</del><ins>+ virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
</ins><span class="cx">
</span><span class="cx"> ScaleTransformOperation(double sx, double sy, double sz, OperationType type)
</span><span class="cx"> : m_x(sx)
</span><span class="lines">@@ -73,7 +67,7 @@
</span><span class="cx"> , m_z(sz)
</span><span class="cx"> , m_type(type)
</span><span class="cx"> {
</span><del>- ASSERT(type == SCALE_X || type == SCALE_Y || type == SCALE_Z || type == SCALE || type == SCALE_3D);
</del><ins>+ ASSERT(isScaleTransformOperationType());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double m_x;
</span><span class="lines">@@ -82,6 +76,8 @@
</span><span class="cx"> OperationType m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TRANSFORMOPERATION_TYPE_CASTS(ScaleTransformOperation, isScaleTransformOperationType());
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -26,6 +26,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool SkewTransformOperation::operator==(const TransformOperation& o) const
+{
+ if (!isSameType(o))
+ return false;
+ const SkewTransformOperation& s = toSkewTransformOperation(o);
+ return m_angleX == s.m_angleX && m_angleY == s.m_angleY;
+}
+
</ins><span class="cx"> PassRefPtr<TransformOperation> SkewTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span><span class="cx"> {
</span><span class="cx"> if (from && !from->isSameType(*this))
</span><span class="lines">@@ -34,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 = static_cast<const SkewTransformOperation*>(from);
</del><ins>+ const SkewTransformOperation* fromOp = toSkewTransformOperation(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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class SkewTransformOperation : public TransformOperation {
</del><ins>+class SkewTransformOperation final : public TransformOperation {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<SkewTransformOperation> create(double angleX, double angleY, OperationType type)
</span><span class="cx"> {
</span><span class="lines">@@ -40,31 +40,26 @@
</span><span class="cx"> double angleY() const { return m_angleY; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isIdentity() const { return m_angleX == 0 && m_angleY == 0; }
- virtual OperationType type() const { return m_type; }
- virtual bool isSameType(const TransformOperation& o) const { return o.type() == m_type; }
</del><ins>+ virtual bool isIdentity() const override { return m_angleX == 0 && m_angleY == 0; }
+ virtual OperationType type() const override { return m_type; }
+ virtual bool isSameType(const TransformOperation& o) const override { return o.type() == m_type; }
</ins><span class="cx">
</span><del>- virtual bool operator==(const TransformOperation& o) const
- {
- if (!isSameType(o))
- return false;
- const SkewTransformOperation* s = static_cast<const SkewTransformOperation*>(&o);
- return m_angleX == s->m_angleX && m_angleY == s->m_angleY;
- }
</del><ins>+ virtual bool operator==(const TransformOperation&) const override;
</ins><span class="cx">
</span><del>- virtual bool apply(TransformationMatrix& transform, const FloatSize&) const
</del><ins>+ virtual bool apply(TransformationMatrix& transform, const FloatSize&) const override
</ins><span class="cx"> {
</span><span class="cx"> transform.skew(m_angleX, m_angleY);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false);
</del><ins>+ virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
</ins><span class="cx">
</span><span class="cx"> SkewTransformOperation(double angleX, double angleY, OperationType type)
</span><span class="cx"> : m_angleX(angleX)
</span><span class="cx"> , m_angleY(angleY)
</span><span class="cx"> , m_type(type)
</span><span class="cx"> {
</span><ins>+ ASSERT(isSkewTransformOperationType());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double m_angleX;
</span><span class="lines">@@ -72,6 +67,8 @@
</span><span class="cx"> OperationType m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TRANSFORMOPERATION_TYPE_CASTS(SkewTransformOperation, isSkewTransformOperationType());
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TransformOperation.h 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformOperation.h 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -79,8 +79,31 @@
</span><span class="cx"> opType == MATRIX_3D ||
</span><span class="cx"> opType == PERSPECTIVE;
</span><span class="cx"> }
</span><ins>+
+ bool isRotateTransformOperationType() const
+ {
+ return type() == ROTATE_X || type() == ROTATE_Y || type() == ROTATE_Z || type() == ROTATE || type() == ROTATE_3D;
+ }
+
+ bool isScaleTransformOperationType() const
+ {
+ return type() == SCALE_X || type() == SCALE_Y || type() == SCALE_Z || type() == SCALE || type() == SCALE_3D;
+ }
+
+ bool isSkewTransformOperationType() const
+ {
+ return type() == SKEW_X || type() == SKEW_Y || type() == SKEW;
+ }
+
+ bool isTranslateTransformOperationType() const
+ {
+ return type() == TRANSLATE_X || type() == TRANSLATE_Y || type() == TRANSLATE_Z || type() == TRANSLATE || type() == TRANSLATE_3D;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+#define TRANSFORMOPERATION_TYPE_CASTS(ToValueTypeName, predicate) \
+ TYPE_CASTS_BASE(ToValueTypeName, WebCore::TransformOperation, value, value->predicate, value.predicate)
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -25,6 +25,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool TranslateTransformOperation::operator==(const TransformOperation& o) const
+{
+ if (!isSameType(o))
+ return false;
+ const TranslateTransformOperation& t = toTranslateTransformOperation(o);
+ return m_x == t.m_x && m_y == t.m_y && m_z == t.m_z;
+}
+
</ins><span class="cx"> PassRefPtr<TransformOperation> TranslateTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
</span><span class="cx"> {
</span><span class="cx"> if (from && !from->isSameType(*this))
</span><span class="lines">@@ -34,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 = static_cast<const TranslateTransformOperation*>(from);
</del><ins>+ const TranslateTransformOperation* fromOp = toTranslateTransformOperation(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 (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class TranslateTransformOperation : public TransformOperation {
</del><ins>+class TranslateTransformOperation final : public TransformOperation {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<TranslateTransformOperation> create(const Length& tx, const Length& ty, OperationType type)
</span><span class="cx"> {
</span><span class="lines">@@ -52,26 +52,20 @@
</span><span class="cx"> Length z() const { return m_z; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isIdentity() const { return !floatValueForLength(m_x, 1) && !floatValueForLength(m_y, 1) && !floatValueForLength(m_z, 1); }
</del><ins>+ virtual bool isIdentity() const override { return !floatValueForLength(m_x, 1) && !floatValueForLength(m_y, 1) && !floatValueForLength(m_z, 1); }
</ins><span class="cx">
</span><del>- virtual OperationType type() const { return m_type; }
- virtual bool isSameType(const TransformOperation& o) const { return o.type() == m_type; }
</del><ins>+ virtual OperationType type() const override { return m_type; }
+ virtual bool isSameType(const TransformOperation& o) const override { return o.type() == m_type; }
</ins><span class="cx">
</span><del>- virtual bool operator==(const TransformOperation& o) const
- {
- if (!isSameType(o))
- return false;
- const TranslateTransformOperation* t = static_cast<const TranslateTransformOperation*>(&o);
- return m_x == t->m_x && m_y == t->m_y && m_z == t->m_z;
- }
</del><ins>+ virtual bool operator==(const TransformOperation&) const override;
</ins><span class="cx">
</span><del>- virtual bool apply(TransformationMatrix& transform, const FloatSize& borderBoxSize) const
</del><ins>+ virtual bool apply(TransformationMatrix& transform, const FloatSize& borderBoxSize) const override
</ins><span class="cx"> {
</span><span class="cx"> transform.translate3d(x(borderBoxSize), y(borderBoxSize), z(borderBoxSize));
</span><span class="cx"> return m_x.isPercentNotCalculated() || m_y.isPercentNotCalculated();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false);
</del><ins>+ virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
</ins><span class="cx">
</span><span class="cx"> TranslateTransformOperation(const Length& tx, const Length& ty, const Length& tz, OperationType type)
</span><span class="cx"> : m_x(tx)
</span><span class="lines">@@ -79,7 +73,7 @@
</span><span class="cx"> , m_z(tz)
</span><span class="cx"> , m_type(type)
</span><span class="cx"> {
</span><del>- ASSERT(type == TRANSLATE_X || type == TRANSLATE_Y || type == TRANSLATE_Z || type == TRANSLATE || type == TRANSLATE_3D);
</del><ins>+ ASSERT(isTranslateTransformOperationType());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Length m_x;
</span><span class="lines">@@ -88,6 +82,8 @@
</span><span class="cx"> OperationType m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TRANSFORMOPERATION_TYPE_CASTS(TranslateTransformOperation, isTranslateTransformOperationType());
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // TranslateTransformOperation_h
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-05-25 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><ins>+ Add type-checked casts for TransformOperations
+ <http://webkit.org/b/133217>
+
+ Reviewed by Simon Fraser.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (IPC::ArgumentCoder<TransformOperations>::encode):
+ - Switch to type-checked casts.
+
+2014-05-25 David Kilzer <ddkilzer@apple.com>
+
</ins><span class="cx"> Use type-checking FilterOperation casts in CoordinatedGraphicsArgumentCoders.cpp
</span><span class="cx"> <http://webkit.org/b/133203>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (169319 => 169320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2014-05-25 18:00:09 UTC (rev 169319)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2014-05-25 18:09:16 UTC (rev 169320)
</span><span class="lines">@@ -186,42 +186,42 @@
</span><span class="cx"> case TransformOperation::SCALE:
</span><span class="cx"> case TransformOperation::SCALE_Z:
</span><span class="cx"> case TransformOperation::SCALE_3D:
</span><del>- encoder << static_cast<const ScaleTransformOperation*>(operation)->x();
- encoder << static_cast<const ScaleTransformOperation*>(operation)->y();
- encoder << static_cast<const ScaleTransformOperation*>(operation)->z();
</del><ins>+ encoder << toScaleTransformOperation(operation)->x();
+ encoder << toScaleTransformOperation(operation)->y();
+ encoder << toScaleTransformOperation(operation)->z();
</ins><span class="cx"> break;
</span><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><span class="cx"> case TransformOperation::TRANSLATE_3D:
</span><del>- ArgumentCoder<Length>::encode(encoder, static_cast<const TranslateTransformOperation*>(operation)->x());
- ArgumentCoder<Length>::encode(encoder, static_cast<const TranslateTransformOperation*>(operation)->y());
- ArgumentCoder<Length>::encode(encoder, static_cast<const TranslateTransformOperation*>(operation)->z());
</del><ins>+ ArgumentCoder<Length>::encode(encoder, toTranslateTransformOperation(operation)->x());
+ ArgumentCoder<Length>::encode(encoder, toTranslateTransformOperation(operation)->y());
+ ArgumentCoder<Length>::encode(encoder, toTranslateTransformOperation(operation)->z());
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::ROTATE:
</span><span class="cx"> case TransformOperation::ROTATE_X:
</span><span class="cx"> case TransformOperation::ROTATE_Y:
</span><span class="cx"> case TransformOperation::ROTATE_3D:
</span><del>- encoder << static_cast<const RotateTransformOperation*>(operation)->x();
- encoder << static_cast<const RotateTransformOperation*>(operation)->y();
- encoder << static_cast<const RotateTransformOperation*>(operation)->z();
- encoder << static_cast<const RotateTransformOperation*>(operation)->angle();
</del><ins>+ encoder << toRotateTransformOperation(operation)->x();
+ encoder << toRotateTransformOperation(operation)->y();
+ encoder << toRotateTransformOperation(operation)->z();
+ encoder << toRotateTransformOperation(operation)->angle();
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::SKEW_X:
</span><span class="cx"> case TransformOperation::SKEW_Y:
</span><span class="cx"> case TransformOperation::SKEW:
</span><del>- encoder << static_cast<const SkewTransformOperation*>(operation)->angleX();
- encoder << static_cast<const SkewTransformOperation*>(operation)->angleY();
</del><ins>+ encoder << toSkewTransformOperation(operation)->angleX();
+ encoder << toSkewTransformOperation(operation)->angleY();
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::MATRIX:
</span><del>- ArgumentCoder<TransformationMatrix>::encode(encoder, static_cast<const MatrixTransformOperation*>(operation)->matrix());
</del><ins>+ ArgumentCoder<TransformationMatrix>::encode(encoder, toMatrixTransformOperation(operation)->matrix());
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::MATRIX_3D:
</span><del>- ArgumentCoder<TransformationMatrix>::encode(encoder, static_cast<const Matrix3DTransformOperation*>(operation)->matrix());
</del><ins>+ ArgumentCoder<TransformationMatrix>::encode(encoder, toMatrix3DTransformOperation(operation)->matrix());
</ins><span class="cx"> break;
</span><span class="cx"> case TransformOperation::PERSPECTIVE:
</span><del>- ArgumentCoder<Length>::encode(encoder, static_cast<const PerspectiveTransformOperation*>(operation)->perspective());
</del><ins>+ ArgumentCoder<Length>::encode(encoder, toPerspectiveTransformOperation(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>