Changeset 202195 in webkit
- Timestamp:
- Jun 17, 2016 8:29:49 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r202194 r202195 1 2016-06-17 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r202068, r202115, and r202128. 4 https://bugs.webkit.org/show_bug.cgi?id=158896 5 6 The new test is very unstable, timing out frequently 7 (Requested by ap on #webkit). 8 9 Reverted changesets: 10 11 "decompose4 return value is unchecked, leading to potentially 12 uninitialized data." 13 https://bugs.webkit.org/show_bug.cgi?id=158761 14 http://trac.webkit.org/changeset/202068 15 16 "[mac] LayoutTest transforms/undecomposable.html is a flaky 17 timeout" 18 https://bugs.webkit.org/show_bug.cgi?id=158816 19 http://trac.webkit.org/changeset/202115 20 21 "[mac] LayoutTest transforms/undecomposable.html is a flaky 22 timeout" 23 https://bugs.webkit.org/show_bug.cgi?id=158816 24 http://trac.webkit.org/changeset/202128 25 1 26 2016-06-17 Chris Fleizach <cfleizach@apple.com> 2 27 -
trunk/Source/WebCore/ChangeLog
r202194 r202195 1 2016-06-17 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r202068, r202115, and r202128. 4 https://bugs.webkit.org/show_bug.cgi?id=158896 5 6 The new test is very unstable, timing out frequently 7 (Requested by ap on #webkit). 8 9 Reverted changesets: 10 11 "decompose4 return value is unchecked, leading to potentially 12 uninitialized data." 13 https://bugs.webkit.org/show_bug.cgi?id=158761 14 http://trac.webkit.org/changeset/202068 15 16 "[mac] LayoutTest transforms/undecomposable.html is a flaky 17 timeout" 18 https://bugs.webkit.org/show_bug.cgi?id=158816 19 http://trac.webkit.org/changeset/202115 20 21 "[mac] LayoutTest transforms/undecomposable.html is a flaky 22 timeout" 23 https://bugs.webkit.org/show_bug.cgi?id=158816 24 http://trac.webkit.org/changeset/202128 25 1 26 2016-06-17 Chris Fleizach <cfleizach@apple.com> 2 27 -
trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp
r202068 r202195 61 61 toT.blend(fromT, progress); 62 62 TransformationMatrix::Decomposed4Type decomp; 63 if (toT.decompose4(decomp)) {64 if (decomp.perspectiveZ) { 65 double val = -1.0 / decomp.perspectiveZ;66 return PerspectiveTransformOperation::create(Length(clampToPositiveInteger(val), Fixed));67 }63 toT.decompose4(decomp); 64 65 if (decomp.perspectiveZ) { 66 double val = -1.0 / decomp.perspectiveZ; 67 return PerspectiveTransformOperation::create(Length(clampToPositiveInteger(val), Fixed)); 68 68 } 69 69 return PerspectiveTransformOperation::create(Length(0, Fixed)); -
trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp
r202068 r202195 79 79 // Extract the result as a quaternion 80 80 TransformationMatrix::Decomposed4Type decomp; 81 if (!toT.decompose4(decomp)) 82 return RotateTransformOperation::create(m_x, m_y, m_z, m_angle - m_angle * progress, m_type);; 81 toT.decompose4(decomp); 83 82 84 83 // Convert that to Axis/Angle form -
trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
r202068 r202195 366 366 367 367 int i, j; 368 for (i = 0; i < 4; i++) {368 for (i = 0; i < 4; i++) 369 369 for (j = 0; j < 4; j++) 370 370 localMatrix[i][j] /= localMatrix[3][3]; 371 }372 371 373 372 // perspectiveMatrix is used to solve for perspective, but it also provides … … 1543 1542 Decomposed4Type fromDecomp; 1544 1543 Decomposed4Type toDecomp; 1545 if (!from.decompose4(fromDecomp)) 1546 return; 1547 if (!decompose4(toDecomp)) 1548 return; 1544 from.decompose4(fromDecomp); 1545 decompose4(toDecomp); 1549 1546 1550 1547 blendFloat(fromDecomp.scaleX, toDecomp.scaleX, progress); -
trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h
r202068 r202195 273 273 274 274 struct Decomposed4Type { 275 double scaleX { 1 }; 276 double scaleY { 1 }; 277 double scaleZ { 1 }; 278 double skewXY { 0 }; 279 double skewXZ { 0 }; 280 double skewYZ { 0 }; 281 double quaternionX { 0 }; 282 double quaternionY { 0 }; 283 double quaternionZ { 0 }; 284 double quaternionW { 0 }; 285 double translateX { 0 }; 286 double translateY { 0 }; 287 double translateZ { 0 }; 288 double perspectiveX { 0 }; 289 double perspectiveY { 0 }; 290 double perspectiveZ { 0 }; 291 double perspectiveW { 1 }; 275 double scaleX, scaleY, scaleZ; 276 double skewXY, skewXZ, skewYZ; 277 double quaternionX, quaternionY, quaternionZ, quaternionW; 278 double translateX, translateY, translateZ; 279 double perspectiveX, perspectiveY, perspectiveZ, perspectiveW; 292 280 293 281 bool operator==(const Decomposed4Type& other) const
Note: See TracChangeset
for help on using the changeset viewer.