--- a/jdk/src/share/classes/javax/swing/text/JTextComponent.java	Wed Apr 21 18:12:21 2010 +0400
+++ b/jdk/src/share/classes/javax/swing/text/JTextComponent.java	Thu Apr 29 18:38:25 2010 +0400
@@ -2069,9 +2069,9 @@
      *   width to match its own
      */
     public boolean getScrollableTracksViewportWidth() {
-        JViewport port = SwingUtilities.getParentViewport(this);
-        if (port != null) {
-            return port.getWidth() > getPreferredSize().width;
+        Container parent = SwingUtilities.getUnwrappedParent(this);
+        if (parent instanceof JViewport) {
+            return parent.getWidth() > getPreferredSize().width;
         }
         return false;
     }
@@ -2090,9 +2090,9 @@
      *   to match its own
      */
     public boolean getScrollableTracksViewportHeight() {
-        JViewport port = SwingUtilities.getParentViewport(this);
-        if (port != null) {
-            return (port.getHeight() > getPreferredSize().height);
+        Container parent = SwingUtilities.getUnwrappedParent(this);
+        if (parent instanceof JViewport) {
+            return parent.getHeight() > getPreferredSize().height;
         }
         return false;
     }