From 6d676e1e6d48ddc0b893eac767653f6ef0d08bb6 Mon Sep 17 00:00:00 2001 From: anthony Date: Thu, 1 Oct 2009 15:06:16 +0400 Subject: [PATCH] 6862611: Reg testcase closed/java/awt/Component/NativeInLightShow/NativeInLightShow.html fails Summary: The recursiveShowHeavyweightChildren() must be invoked unconditionally in mixOnShowing() Reviewed-by: art, dcherepanov --- src/share/classes/java/awt/Container.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/share/classes/java/awt/Container.java b/src/share/classes/java/awt/Container.java index 4f51dabce..e3372409c 100644 --- a/src/share/classes/java/awt/Container.java +++ b/src/share/classes/java/awt/Container.java @@ -4111,16 +4111,16 @@ public class Container extends Component { mixingLog.fine("this = " + this); } - if (!isMixingNeeded()) { - return; - } - boolean isLightweight = isLightweight(); if (isLightweight && isRecursivelyVisibleUpToHeavyweightContainer()) { recursiveShowHeavyweightChildren(); } + if (!isMixingNeeded()) { + return; + } + if (!isLightweight || (isLightweight && hasHeavyweightDescendants())) { recursiveApplyCurrentShape(); } -- GitLab