Skip to content

Commit

Permalink
8334124: Rendering issues with CSS "text-shadow" in WebView
Browse files Browse the repository at this point in the history
Reviewed-by: kcr, jbhaskar
  • Loading branch information
Schmidor authored and Jay Bhaskar committed Sep 1, 2024
1 parent ca70a07 commit e0ceafb
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1025,6 +1025,11 @@ void GraphicsContextJava::didUpdateState(GraphicsContextState& state)
if (dropShadowOpt.has_value()) {
const auto& dropShadow = dropShadowOpt.value();
setPlatformShadow(dropShadow.offset,dropShadow.radius, dropShadow.color);
} else {
float clr = 0.0f;
platformContext()->rq().freeSpace(32)
<< (jint)com_sun_webkit_graphics_GraphicsDecoder_SETSHADOW
<< clr << clr << clr << clr << clr << clr << clr;
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/*
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

package test.javafx.scene.web;

import com.sun.webkit.WebPage;
import com.sun.webkit.WebPageShim;
import javafx.scene.web.WebEngineShim;
import org.junit.Test;

import java.awt.Color;
import java.awt.image.BufferedImage;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

public class ShadowTest extends TestBase {
/**
* @test
* @bug 8334124
* summary
* Paints an text with a red shadow, and another text without shadow.
* Checks by red pixel count if the shadow exists and only exists on the first text.
*/
@Test public void testShadow() {
loadContent("<html>\n" +
"<body style='margin: 0px;'>\n" +
"<p style='text-shadow:5px 5px 0 #FF0000;height: 100px;'>text</p>\n" +
"<p style='height: 100px'>text</p>\n" +
"</body>\n" +
"</html>");
submit(() -> {
final WebPage webPage = WebEngineShim.getPage(getEngine());
assertNotNull(webPage);
final BufferedImage img = WebPageShim.paint(webPage, 0, 0, 800, 600);
assertNotNull(img);

int redShadowCnt = 0;
int noShadowCnt = 0;
for (int x = 0; x < 100; x++) {
for (int y = 0; y < 200; y++) {
Color pixelColor = new Color(img.getRGB(x, y), true);
if (isColorsSimilar(Color.RED, pixelColor, 1)) {
if (y < 100) {
redShadowCnt++;
} else {
noShadowCnt++;
}
}
}
}

assertTrue("no shadow found", redShadowCnt > 0);
assertTrue("wrong shadow found", noShadowCnt == 0);
});
}
}

7 comments on commit e0ceafb

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jaybhaskar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jfx23u

@openjdk
Copy link

@openjdk openjdk bot commented on e0ceafb Sep 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jaybhaskar the backport was successfully created on the branch backport-jaybhaskar-e0ceafb7-master in my personal fork of openjdk/jfx23u. To create a pull request with this backport targeting openjdk/jfx23u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e0ceafb7 from the openjdk/jfx repository.

The commit being backported was authored by Oliver Schmidtmer on 1 Sep 2024 and was reviewed by Kevin Rushforth and Jay Bhaskar.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jfx23u:

$ git fetch https://github.com/openjdk-bots/jfx23u.git backport-jaybhaskar-e0ceafb7-master:backport-jaybhaskar-e0ceafb7-master
$ git checkout backport-jaybhaskar-e0ceafb7-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jfx23u.git backport-jaybhaskar-e0ceafb7-master

@johanvos
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jfx17u

@openjdk
Copy link

@openjdk openjdk bot commented on e0ceafb Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johanvos the backport was successfully created on the branch backport-johanvos-e0ceafb7-master in my personal fork of openjdk/jfx17u. To create a pull request with this backport targeting openjdk/jfx17u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e0ceafb7 from the openjdk/jfx repository.

The commit being backported was authored by Oliver Schmidtmer on 1 Sep 2024 and was reviewed by Kevin Rushforth and Jay Bhaskar.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jfx17u:

$ git fetch https://github.com/openjdk-bots/jfx17u.git backport-johanvos-e0ceafb7-master:backport-johanvos-e0ceafb7-master
$ git checkout backport-johanvos-e0ceafb7-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jfx17u.git backport-johanvos-e0ceafb7-master

@johanvos
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jfx21u

@openjdk
Copy link

@openjdk openjdk bot commented on e0ceafb Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johanvos the backport was successfully created on the branch backport-johanvos-e0ceafb7-master in my personal fork of openjdk/jfx21u. To create a pull request with this backport targeting openjdk/jfx21u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e0ceafb7 from the openjdk/jfx repository.

The commit being backported was authored by Oliver Schmidtmer on 1 Sep 2024 and was reviewed by Kevin Rushforth and Jay Bhaskar.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jfx21u:

$ git fetch https://github.com/openjdk-bots/jfx21u.git backport-johanvos-e0ceafb7-master:backport-johanvos-e0ceafb7-master
$ git checkout backport-johanvos-e0ceafb7-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jfx21u.git backport-johanvos-e0ceafb7-master

Please sign in to comment.