On Sat, 11 Feb 2023 14:11:24 GMT, Kevin Rushforth <k...@openjdk.org> wrote:
> Clean backport. Tested in connection with 4 other WebKit fixes in the > `test-kcr-11.0.19` branch, including a successful CI build. I also verfied > that the native WebKit code is identical to mainline jfx after applying all > patches (excluding a couple of copyright years). As often happens with a very large patch like this one, Skara has not marked it clean even though it is. Here is the diff of the two patches: $ diff 301bbd6409d463c4f789e2b3dcb6b2ea200d7373.patch 65c73e5ab15ef095a09b95b5a012fbe3636a1cfd.patch 1c1 < commit 301bbd6409d463c4f789e2b3dcb6b2ea200d7373 --- > commit 65c73e5ab15ef095a09b95b5a012fbe3636a1cfd 167546c167546 < index 23efcd5441..17752cafb9 100644 --- > index acd7c980f3..4d716d6ca7 100644 342135c342135 < index afbd76f473..d6559d19c1 100644 --- > index 4ad0097a28..1802773ccd 100644 342176c342176 < @@ -649,10 +649,10 @@ void GraphicsContextJava::strokeRect(const FloatRect& rect, float lineWidth) --- > @@ -645,10 +645,10 @@ void GraphicsContextJava::strokeRect(const FloatRect& > rect, float lineWidth) 342190c342190 < @@ -742,10 +742,10 @@ void GraphicsContextJava::strokePath(const Path& path) --- > @@ -738,10 +738,10 @@ void GraphicsContextJava::strokePath(const Path& path) 342204c342204 < @@ -869,26 +869,26 @@ void GraphicsContextJava::fillPath(const Path& path) --- > @@ -865,26 +865,26 @@ void GraphicsContextJava::fillPath(const Path& path) 342240c342240 < @@ -993,37 +993,37 @@ AffineTransform GraphicsContextJava::getCTM(IncludeDeviceScale) const --- > @@ -989,37 +989,37 @@ AffineTransform > GraphicsContextJava::getCTM(IncludeDeviceScale) const 342292c342292 < @@ -1036,6 +1036,8 @@ void GraphicsContextJava::fillRoundedRectImpl(const FloatRoundedRect& rect, cons --- > @@ -1032,6 +1032,8 @@ void GraphicsContextJava::fillRoundedRectImpl(const > FloatRoundedRect& rect, cons 342302c342302 < index a27102d804..6ce99ab62f 100644 --- > index 526ee45a1f..209790bcae 100644 447690c447690 < index 10832859f7..4dc5171f39 100644 --- > index 5cea56639d..d0a174e233 100644 There are no differences in the two patches, either in the diffs themselves or in the surrounding context. The line numbers are different because the mainline patch was done on top of the fix for [JDK-8298167](https://bugs.openjdk.org/browse/JDK-8298167), which added (unconflicting) code to `GraphicsContextJava.cpp`, whereas the backport patch was not. This isn't what is causing Skara to fail to mark this as clean, though. Rather the failure of Skara to mark this as clean is another instance of [SKARA-1332](https://bugs.openjdk.org/browse/SKARA-1332). I am manually marking it clean. ------------- PR: https://git.openjdk.org/jfx11u/pull/132
