     }
     
     //----------------------------------
-    //  clipContent
-    //----------------------------------
-    
-    /**
-     *  @copy mx.core.IViewport#clipContent
-     */
-    public function get clipContent():Boolean 
-    {
-        return (_layout) ? _layout.clipContent : _layoutProperties.clipContent;
-    }
-
-    /**
-     *  @private
-     */
-    public function set clipContent(value:Boolean):void 
+    //  clipAndEnableScrolling
+    //----------------------------------
+    
+    /**
+     *  @copy mx.core.IViewport#clipAndEnableScrolling
+     */
+    public function get clipAndEnableScrolling():Boolean 
+    {
+        return (_layout) ? _layout.clipAndEnableScrolling : _layoutProperties.clipAndEnableScrolling;
+    }
+
+    /**
+     *  @private
+     */
+    public function set clipAndEnableScrolling(value:Boolean):void 
     {
         if (_layout)
-            _layout.clipContent = value;
+            _layout.clipAndEnableScrolling = value;
         else
-            _layoutProperties.clipContent = value;
-
-        // Clip content affects measured minimum size
+            _layoutProperties.clipAndEnableScrolling = value;
+
+        // clipAndEnableScrolling affects measured minimum size
         invalidateSize();
     }    
     

import mx.core.IFactory;
import mx.core.IViewport;
import mx.core.IVisualElement;
import mx.core.ScrollUnit;
import mx.core.UIComponent;
import mx.core.mx_internal;
import mx.events.CollectionEvent;
import mx.events.FlexEvent;
import mx.events.ItemExistenceChangedEvent;
import mx.events.PropertyChangeEvent;
import mx.events.PropertyChangeEventKind;
import mx.graphics.Graphic;

    /**
     *  @private
     * 
     *  Three properties are delegated to the layout: clipAndEnableScrolling,
     *  verticalScrollPosition, horizontalScrollPosition.
     *  If the layout is reset, we copy the properties from the old
     *  layout to the new one.   If the new layout is null, then we
