# HG changeset patch
# User ssadetsky
# Date 1469778990 -10800
# Node ID b819110f8a53f20d2754553905975f21753ca27a
# Parent  86204eba81aef6295864f270a43c384b4c62fa61
8160246: Regression: 4410243 reproducible with GTK LaF
Reviewed-by: alexsch

diff -r 86204eba81ae -r b819110f8a53 jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Fri Jul 29 10:50:49 2016 +0300
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Fri Jul 29 10:56:30 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -940,9 +940,10 @@
                 rootView.setSize(d.width - i.left - i.right -
                         caretMargin, d.height - i.top - i.bottom);
             }
-            else if (d.width <= 0 || d.height <= 0) {
+            else if (!rootViewInitialized && (d.width <= 0 || d.height <= 0)) {
                 // Probably haven't been layed out yet, force some sort of
                 // initial sizing.
+                rootViewInitialized = true;
                 rootView.setSize(Integer.MAX_VALUE, Integer.MAX_VALUE);
             }
             d.width = (int) Math.min((long) rootView.getPreferredSpan(View.X_AXIS) +
@@ -1346,6 +1347,7 @@
     private static final Position.Bias[] discardBias = new Position.Bias[1];
     private DefaultCaret dropCaret;
     private int caretMargin;
+    private boolean rootViewInitialized;
 
     /**
      * Root view that acts as a gateway between the component
diff -r 86204eba81ae -r b819110f8a53 jdk/test/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java	Fri Jul 29 10:56:30 2016 +0300
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016, 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.
+ *
+ * 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.
+ */
+
+/* @test
+ * @bug 8160246
+ * @summary Regression: 4410243 reproducible with GTK LaF
+ * @run main ScrollFlickerTest
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+
+public class ScrollFlickerTest {
+
+    private static JFrame frame;
+    private static JScrollPane scroll;
+    private static int cnt = 0;
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            frame = new JFrame();
+            frame.setSize(300, 200);
+            frame.getContentPane().setLayout(null);
+            JTextArea text = new JTextArea("Test test test test");
+            text.setLineWrap(true);
+            scroll = new JScrollPane(text);
+            frame.getContentPane().add(scroll);
+            scroll.setBounds(1, 1, 100, 50);
+            frame.setVisible(true);
+        });
+
+        Robot robot = new Robot();
+        robot.waitForIdle();
+        robot.delay(200);
+
+        SwingUtilities.invokeAndWait(() -> {
+            scroll.getViewport().addChangeListener((e) -> cnt++);
+            Insets insets = scroll.getInsets();
+            scroll.setSize(insets.left + insets.right +
+                    scroll.getVerticalScrollBar().getPreferredSize().width, 50);
+            scroll.revalidate();
+        });
+
+        robot.delay(1000);
+
+        SwingUtilities.invokeLater(frame::dispose);
+
+        if (cnt > 2) {
+            throw new RuntimeException("Scroll bar flickers");
+        }
+    }
+}