Changeset 207259 in webkit

Timestamp:

Oct 12, 2016 4:02:19 PM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r205197. rdar://problem/28481424

Location:

branches/safari-602.2.14.0-branch

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/transforms/TransformationMatrix.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp (added)

branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-12  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r205197. rdar://problem/28481424
+
+    2016-08-30  Brent Fulgham  <bfulgham@apple.com>
+
+            Use of uninitialised memory in TransformationMatrx::blend4()
+            https://bugs.webkit.org/show_bug.cgi?id=134621
+            <rdar://problem/27337539>
+
+            Reviewed by Dean Jackson.
+
+            Change is based on the Blink change (patch by <alancutter@chromium.org>):
+            <https://src.chromium.org/viewvc/blink?revision=177453&view=revision>
+
+            TransformationMatrix::blend() was attempting to blend between non-invertable
+            matricies. This resulted in garbage stack variables being used.
+            This patch ensures that blend() will fall back to a 50% step interpolation
+            when one of the sides are not invertable.
+
+            Tested by new TransformationMatrix test in TestWebKitAPI.
+
+            * platform/graphics/transforms/TransformationMatrix.cpp:
+            (WebCore::TransformationMatrix::blend2): Properly handle failure in the
+            decompose method calls.
+            (WebCore::TransformationMatrix::blend4): Ditto.
+
 2016-10-12  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp

@@ -1502 +1502 @@
     Decomposed2Type fromDecomp;
     Decomposed2Type toDecomp;
-    from.decompose2(fromDecomp);
-    decompose2(toDecomp);
+    if (!from.decompose2(fromDecomp) || !decompose2(toDecomp)) {
+        if (progress < 0.5)
+            *this = from;
+        return;
+    }
 
     // If x-axis of one is flipped, and y-axis of the other, convert to an unflipped rotation.
@@ -1542 +1545 @@
     Decomposed4Type fromDecomp;
     Decomposed4Type toDecomp;
-    from.decompose4(fromDecomp);
-    decompose4(toDecomp);
+    if (!from.decompose4(fromDecomp) || !decompose4(toDecomp)) {
+        if (progress < 0.5)
+            *this = from;
+        return;
+    }
 
     blendFloat(fromDecomp.scaleX, toDecomp.scaleX, progress);

branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h

@@ -295 +295 @@
     void recompose4(const Decomposed4Type&);
 
-    void blend(const TransformationMatrix& from, double progress);
+    WEBCORE_EXPORT void blend(const TransformationMatrix& from, double progress);
     void blend2(const TransformationMatrix& from, double progress);
     void blend4(const TransformationMatrix& from, double progress);

branches/safari-602.2.14.0-branch/Tools/ChangeLog

@@ +1 @@
+2016-10-12  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r205197. rdar://problem/28481424
+
+    2016-08-30  Brent Fulgham  <bfulgham@apple.com>
+
+            Use of uninitialised memory in TransformationMatrx::blend4()
+            https://bugs.webkit.org/show_bug.cgi?id=134621
+            <rdar://problem/27337539>
+
+            Reviewed by Dean Jackson.
+
+            Change is based on the Blink change (patch by <alancutter@chromium.org>):
+            <https://src.chromium.org/viewvc/blink?revision=177453&view=revision>
+
+            * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+            * TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp: Added.
+            (TestWebKitAPI::TEST):
+
 2016-09-28  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602.2.14.0-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -148 +148 @@
                 76E182DF154767E600F1FADD /* auto-submitting-form.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 76E182DE15475A8300F1FADD /* auto-submitting-form.html */; };
                 7A1458FC1AD5C07000E06772 /* mouse-button-listener.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7A1458FB1AD5C03500E06772 /* mouse-button-listener.html */; };
+                7AD3FE8E1D76131200B169A4 /* TransformationMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AD3FE8D1D75FB8D00B169A4 /* TransformationMatrix.cpp */; };
                 7AE9E5091AE5AE8B00CF874B /* test.pdf in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7AE9E5081AE5AE8B00CF874B /* test.pdf */; };
                 7C3965061CDD74F90094DBB8 /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C3965051CDD74F90094DBB8 /* Color.cpp */; };
@@ -903 +904 @@
                 7AA021BA1AB09EA70052953F /* DateMath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateMath.cpp; sourceTree = "<group>"; };
                 7AA6A1511AAC0B31002B2ED3 /* WorkQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueue.cpp; sourceTree = "<group>"; };
+                7AD3FE8D1D75FB8D00B169A4 /* TransformationMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformationMatrix.cpp; sourceTree = "<group>"; };
                 7AE9E5081AE5AE8B00CF874B /* test.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = test.pdf; sourceTree = "<group>"; };
                 7C3965051CDD74F90094DBB8 /* Color.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Color.cpp; sourceTree = "<group>"; };
@@ -1376 +1378 @@
                                 41973B5C1AF22875006C7B36 /* SharedBuffer.cpp */,
                                 CDC2C7141797089D00E627FB /* TimeRanges.cpp */,
+                                7AD3FE8D1D75FB8D00B169A4 /* TransformationMatrix.cpp */,
                                 440A1D3814A0103A008A66F2 /* URL.cpp */,
                                 7C3965051CDD74F90094DBB8 /* Color.cpp */,
@@ -2431 +2434 @@
                         files = (
                                 2E7765CD16C4D80A00BA2BB1 /* mainIOS.mm in Sources */,
+                                7AD3FE8E1D76131200B169A4 /* TransformationMatrix.cpp in Sources */,
                                 2E7765CF16C4D81100BA2BB1 /* mainMac.mm in Sources */,
                         );