Transferred from the Adobe Open Source Subversion Repository

Revision: 6391
Author:   smgilson@adobe.com
Date:     2009-04-29T20:04:20.789717Z

Log Message:
-----------
ASDoc updates

QE Notes: None
Doc Notes: None
Bugs: -
Checkintests: passed

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/DataGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/events/TextOperationEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/events/VideoEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/SkinnableContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/Group.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/ItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/events/RendererExistenceEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/GroupBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/events/ElementExistenceEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/SkinnableDataContainer.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1280606 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/components/SkinnableContainer.as
+++ frameworks/projects/spark/src/spark/components/SkinnableContainer.as
@@ -159,8 +159,8 @@
  *    autoLayout="true"
  *    clipAndEnableScrolling="false"
  *    creationPolicy="auto"
- *    horizontalScrollPosition"null"
- *    layout"VerticalLayout"
+ *    horizontalScrollPosition="null"
+ *    layout="VerticalLayout"
  *    verticalScrollPosition="null"
  *
  *    Events


Transferred from the Adobe Open Source Subversion Repository

Revision: 23246
Author:   cframpto@adobe.com
Date:     2011-12-20T17:40:08.069454Z

Log Message:
-----------
Rollback 23243.  If comment followed header it was stripped as well.

Modified Paths:
--------------
2361 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1251603 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/automation/src/mx/automation/events/TextSelectionEvent.as
+++ frameworks/projects/automation/src/mx/automation/events/TextSelectionEvent.as
@@ -1,3 +1,13 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2009 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////

 package mx.automation.events
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 23246
Author:   cframpto@adobe.com
Date:     2011-12-20T17:40:08.069454Z

Log Message:
-----------
Rollback 23243.  If comment followed header it was stripped as well.

Modified Paths:
--------------
2361 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1260474 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/framework/src/mx/effects/effectClasses/PropertyChanges.as
+++ frameworks/projects/framework/src/mx/effects/effectClasses/PropertyChanges.as
@@ -1,3 +1,13 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2005-2007 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////

 package mx.effects.effectClasses
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 6972
Author:   hmuller@adobe.com
Date:     2009-05-15T21:31:32.832389Z

Log Message:
-----------
Added useVirtualLayout (default false) to ListBase, and made the same property default true
in List.  Also: ItemRenderers will no longer enter the hover state on rollover if a mouse
button is down.

QE Notes:
Doc Notes:
Bugs: sdk-19327, sdk-20552
Reviewer: Deepa

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/ItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/ListBase.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1282270 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as
+++ frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as
@@ -452,14 +452,23 @@
            dispatchEvent(new Event(eventName));
     }

+    private function anyButtonDown(event:MouseEvent):Boolean
+    {
+        var type:String = event.type;
+        return event.buttonDown || (type == "middleMouseDown") || (type == "rightMouseDown");
+    }
+
     /**
      *  @private
      *  Mouse rollOver event handler.
      */
     protected function itemRenderer_rollOverHandler(event:MouseEvent):void
     {
-        hovered = true;
-        currentState = getCurrentRendererState();
+        if (!anyButtonDown(event))
+        {
+            hovered = true;
+            currentState = getCurrentRendererState();
+        }
     }

     /**


Transferred from the Adobe Open Source Subversion Repository

Revision: 11660
Author:   rfrishbe@adobe.com
Date:     2009-11-11T18:42:54.860139Z

Log Message:
-----------
Change IItemRendererOwner’s updateRenderer() method definition to:

/**
 *  Updates the renderer for re-use. This first prepares the item
 *  renderer for re-use by clearing out any stale properties
 *  as well as updating it with new properties.
 *
 *
The last thing this method should do is set the data property
 *  on the renderer.

 *
 *  @param renderer The item renderer.
 *  @param itemIndex The index of the data in the data provider
 *  @param data The data object this item renderer is representing
 *
 *  @langversion 3.0
 *  @playerversion Flash 10
 *  @playerversion AIR 1.5
 *  @productversion Flex 4
 */
function updateRenderer(renderer:IVisualElement, itemIndex:int, data:Object):void;

Before, it only took one parameter, the renderer.  Now it takes 3.

The reason for this change is to make the code a little cleaner in terms of the separation between DataGroup and List.  Now DataGroup won’t do any work if the mx_internal _rendererUpdateDelegate is set.  If it is set (to a List for instance), then _rendererUpdateDelegate.updateRenderer(renderer, itemIndex, data) will be called.  This makes the updateRenderer() pass more clear because it’s all done in the rendererUpdateDelegate (rather than splitting it in DataGroup and ListBase).  It also makes it easier to get the ordering of properties correctly as we want the “data” property to be the last set property as part of the “item renderer contract”.

As part of this change, DataGroup is the default _rendererUpdateDelegate, and because of this it now implements IItemRendererOwner.  The only other method on IItemRendererOwner besides updateRenderer() is itemToLabel().  DataGroup already had a private itemToLabel() method, so I’m just making it public.

Also, I'm making label and itemIndex bindable to the "dataChange" event now.

QE notes: Please test that the data property is the last thing set
Doc notes: You could update the documentation around item renderers to mention that the data property should be the last thing set.
Bugs: SDK-19870, SDK-24086
Reviewer: Deepa
Tests run: checkintest, mustella list, listdragdrop, dropdownlist, combobox, buttonbar
Is noteworthy for integration: Yes

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/IItemRendererOwner.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/SkinnableDataContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ListItemDragProxy.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/DataGroup.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1282297 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as
+++ frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as
@@ -193,6 +193,8 @@
      */
     private var _itemIndex:int;

+    [Bindable("dataChange")]
+
     /**
      *  @inheritDoc
      *
@@ -350,7 +352,7 @@
      */
     private var _label:String = "";

-    [Bindable("textChanged")]
+    [Bindable("dataChange")]

     /**
      *  @inheritDoc
@@ -375,9 +377,7 @@
         // Push the label down into the labelDisplay,
         // if it exists
         if (labelDisplay)
-            labelDisplay.text = _label;
-
-        dispatchEvent(new FlexEvent("textChanged"));
+            labelDisplay.text = _label;
     }

     //--------------------------------------------------------------------------


Better amber.

Better amber.

git-svn-id: 41360ad359616a519dfba9f2f48af1afe653c9f7@11 be230a1c-449f-4488-b524-6273046f66f0

--- src/as/client/ClientApp.as
+++ src/as/client/ClientApp.as
@@ -82,7 +82,7 @@
         contextMenu.hideBuiltInItems();
         contextMenu.customItems = [ ];
         var captions :Array = [ "White", "Green", "Amber" ];
-        var colors :Array = [ 0xFFFFFF, 0x00FF00, 0xFFFF00 ];
+        var colors :Array = [ 0xFFFFFF, 0x00FF00, 0xFFAF00 ];
         var setColor :Function = function (caption :String) :void {
             _prefs.setProperty("color", caption);
             for (var kk :int = 0; kk < captions.length; kk++) {


Transferred from the Adobe Open Source Subversion Repository

Revision: 5770
Author:   gruehle@adobe.com
Date:     2009-03-30T20:58:54.529722Z

Log Message:
-----------
Add [Alternative] metadata to the Halo components that have a Gumbo replacement.

Bugs: SDK-20190
QA notes: none
Doc notes: Additional ASDoc comments added for many of the classes. These should all be reviewed.
Reviewer: Chet

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TileList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/RadioButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/HSlider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ButtonBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Zoom.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ToggleButtonBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/HBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/ViewStack.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/RadioButtonGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/ControlBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Cubic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/VSlider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Fade.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Button.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/RemoveChildAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/TweenEffect.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextArea.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/WipeRight.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Sine.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/VBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Glow.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/CheckBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Application.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Quartic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Box.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/WipeLeft.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/HScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/ApplicationControlBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Linear.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Quintic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Tween.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Tile.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Quadratic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Panel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextInput.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/AddChildAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ComboBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/WipeDown.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/VScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Rotate.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/SetPropertyAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Canvas.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Resize.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Label.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Blur.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/LinkBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Move.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Text.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/HorizontalList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/WipeUp.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1260271 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/framework/src/mx/effects/Move.as
+++ frameworks/projects/framework/src/mx/effects/Move.as
@@ -13,6 +13,8 @@
 {

 import mx.effects.effectClasses.MoveInstance;
+
+[Alternative(replacement="spark.effects.Move", since="4.0")]

 /**
  *  The Move effect changes the position of a component


Fixed a bug in the AS3 wrapper that caused the en/decoder to be instantiated with every call to encode. Added noise suppression options to the AS3 wrapper.

--- src/org/ilbc/codec/ILBCCodec.as
+++ src/org/ilbc/codec/ILBCCodec.as
@@ -1,6 +1,6 @@
 package org.ilbc.codec {

-	import cmodule.iLBC.CLibInit;
+	import cmodule.iLBC_webrtcb64.CLibInit;
 	import org.ilbc.event.ILBCEvent;

 	import flash.events.EventDispatcher;
@@ -21,8 +21,25 @@
 	 */
 	public class ILBCCodec extends EventDispatcher {

+		/**
+		 * iLBC processes data in chunks of 240 shorts, 1 byte.
+		 * Flash records data as floats, which are 4 bytes.
+		 * Base64 prefers muliples of 3, so we multiply by that here.
+		 *
+		 * 240 shorts * 4 (for sizeof( float )) * 3 (Base64 preference), leads to the "optimal" number here, results in no padding.
+		 */
+		public static const PREFERRED_MIN_CHUNK_SIZE:int = 2880;
+
+		public static const NOISE_SUPPRESSION_OFF:int = 0;
+		public static const NOISE_SUPPRESSION_MILD:int = 1;
+		public static const NOISE_SUPPRESSION_MEDIUM:int = 2;
+		public static const NOISE_SUPPRESSION_AGGRESSIVE:int = 3;
+
 		public var encodedData:ByteArray;
 		public var decodedData:ByteArray;
+
+		private var isLastEncoding:Boolean;
+		private var isLastDecoding:Boolean;

 		private var ilbcCodec:Object;
 		private var initTime:int;
@@ -39,6 +56,7 @@
 		 */
 		private function init():void {
 			initTime = -1;
+			ilbcCodec = (new cmodule.iLBC_webrtcb64.CLibInit).init();
 		}

 		// ------------------------
@@ -50,7 +68,6 @@
 		 */
 		private function start() : void {
 			initTime = getTimer();
-			ilbcCodec = (new cmodule.iLBC.CLibInit).init();
 		}

 		/**
@@ -69,17 +86,14 @@
 		 * Called when encoding has finished.
 		 */
 		private function encodingCompleteHandler(event:*):void {
-			trace("ILBCCodec.encodingCompleteHandler(event):", event);
-
 			encodedData.position = 0;
-			dispatchEvent( new ILBCEvent(ILBCEvent.ENCODING_COMPLETE, encodedData, getElapsedTime()) );
+			dispatchEvent( new ILBCEvent(ILBCEvent.ENCODING_COMPLETE, encodedData, getElapsedTime(), isLastEncoding) );
 		}

 		/**
 		 * Called when the encoding task notifies progress.
 		 */
 		private function encodingProgressHandler(progress:int):void {
-			trace("ILBCCodec.encodingProgressHandler(event):", progress);
 			dispatchEvent( new ProgressEvent(ProgressEvent.PROGRESS, false, false, progress, 100));
 		}

@@ -87,10 +101,8 @@
 		 * Called when decoding has finished.
 		 */
 		private function decodingCompleteHandler(event:*):void {
-			trace("ILBCCodec.decodingCompleteHandler(event):", event);
-
 			decodedData.position = 0;
-			dispatchEvent( new ILBCEvent(ILBCEvent.DECODING_COMPLETE, decodedData, getElapsedTime()) );
+			dispatchEvent( new ILBCEvent(ILBCEvent.DECODING_COMPLETE, decodedData, getElapsedTime(), isLastDecoding) );
 		}

@@ -98,7 +110,6 @@
 		 * Called when the decoding task notifies progress.
 		 */
 		private function decodingProgressHandler(progress:int):void {
-			trace("ILBCCodec.decodingProgressHandler(event):", progress);
 			dispatchEvent( new ProgressEvent(ProgressEvent.PROGRESS, false, false, progress, 100));
 		}

@@ -108,9 +119,17 @@

 		/**
 		 * Encodes an (16 bit 8kHz) audio stream to iLBC.
+		 *
+		 * @param data The audio stream to encode.
+		 * @param isLast Whether or not this is the last piece of the
+		 * 	(chunked) audio data to encode.
+		 * @param noiseCancellationLevel (Optional) The noise suppression level to use while encoding the stream.
+		 * 	Allowed values are defined as constants at the top of this class. The default value is medium suppression.
 		 */
-		public function encode(data:ByteArray):void {
+		public function encode(data:ByteArray, isLast:Boolean = false, noiseSuppressionLevel:int = 2):void {
 			trace("ILBCCodec.encode(data):", data.length);
+
+			isLastEncoding = isLast;

 			encodedData = new ByteArray();
 			encodedData.endian = Endian.LITTLE_ENDIAN;
@@ -118,14 +137,17 @@

 			start();

-			ilbcCodec.encode(encodingCompleteHandler, encodingProgressHandler, decodedData, encodedData, decodedData.length, 10);
+			ilbcCodec.encode(encodingCompleteHandler, encodingProgressHandler, decodedData, encodedData, decodedData.length, 10, noiseSuppressionLevel);
 		}

 		/**
 		 * Decodes an iLBC encoded audio stream (16 bit 8kHz).
 		 */
-		public function decode(data:ByteArray):void {
+		public function decode(data:ByteArray, isLast:Boolean = false):void {
 			trace("ILBCCodec.decode(data):", data.length);
+
+
+			isLastDecoding = isLast;

 			encodedData = data;
 			decodedData = new ByteArray();
@@ -136,6 +158,38 @@
 			ilbcCodec.decode(decodingCompleteHandler, decodingProgressHandler, encodedData, decodedData, encodedData.length, 10);
 		}

+		/**
+		 * Resets the encoder.
+		 * Should be called when finished with encoding an entire stream.
+		 *
+		 * NOTE: When this isn't called it could cause a memory leak.
+		 */
+		public function resetEncoder():void {
+			trace("ILBCCodec.resetEncoder()");
+			try {
+				ilbcCodec.resetEncoder();
+			} catch(e:Error) {
+				trace("ERROR RESETTING ENCODER");
+				trace(e.getStackTrace());
+			}
+		}
+
+		/**
+		 * Resets the decoder.
+		 * Should be called when finished with decoding an entire stream.
+		 *
+		 * NOTE: When this isn't called it could cause a memory leak.
+		 */
+		public function resetDecoder():void {
+			trace("ILBCCodec.resetDecoder()");
+			try {
+				ilbcCodec.resetDecoder();
+			} catch(e:Error) {
+				trace("ERROR RESETTING DECODER");
+				trace(e.getStackTrace());
+			}
+		}
+
 	}

 }


- change: cleanup in Application, removed stale instance fields

git-svn-id: e38e7cdd6ace00d8230583a2d3b43e9a55f5c011@532 bc4816be-ef27-423a-9c4d-fc420be121a2

--- src/reprise/core/Application.as
+++ src/reprise/core/Application.as
@@ -42,12 +42,12 @@
 		protected var m_rootElement : DocumentView;
 		protected var m_currentView : UIObject;
 		protected var m_lastView : UIObject;
-		protected var m_stageCheckTimer : Timer;
+
+		protected var m_appContext:ApplicationContext;
+
+		protected var m_css : CSS;
+
 		protected var m_tooltipManager : TooltipManager;
-		protected var m_appContext:ApplicationContext;
-
-		protected var m_resourceLoader : ResourceLoader;
-		protected var m_css : CSS;
 		protected var m_tooltipContainer : Sprite;


Changed listeners.concat() to slice() which is about 30% faster.

--- src/org/osflash/signals/Signal.as
+++ src/org/osflash/signals/Signal.as
@@ -110,7 +110,7 @@
 			{
 				case 0:
 					// Clone listeners array because add/remove may occur during the dispatch.
-					for each (listener in listeners.concat())
+					for each (listener in listeners.slice())
 					{
 						if (onceListeners[listener]) remove(listener);
 						listener();


Transferred from the Adobe Open Source Subversion Repository

Revision: 23246
Author:   cframpto@adobe.com
Date:     2011-12-20T17:40:08.069454Z

Log Message:
-----------
Rollback 23243.  If comment followed header it was stripped as well.

Modified Paths:
--------------
2361 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1259284 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/framework/src/mx/core/IDeferredInstantiationUIComponent.as
+++ frameworks/projects/framework/src/mx/core/IDeferredInstantiationUIComponent.as
@@ -1,3 +1,13 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2005-2006 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////

 package mx.core
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 23243
Author:   cframpto@adobe.com
Date:     2011-12-20T00:59:57.384047Z

Log Message:
-----------
In frameworks, remove Adobe headers from all files except xml/mxml file types.  There are also a few .txt files that are license files that I didn't touch yet.

Modified Paths:
--------------
2361 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1261254 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorBurnShader.as
+++ frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorBurnShader.as
@@ -1,13 +1,3 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2009 Adobe Systems Incorporated
-//  All Rights Reserved.
-//
-//  NOTICE: Adobe permits you to use, modify, and distribute this file
-//  in accordance with the terms of the license agreement accompanying it.
-//
-////////////////////////////////////////////////////////////////////////////////

 package mx.graphics.shaderClasses
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 23246
Author:   cframpto@adobe.com
Date:     2011-12-20T17:40:08.069454Z

Log Message:
-----------
Rollback 23243.  If comment followed header it was stripped as well.

Modified Paths:
--------------
2361 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1288515 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/sparkskins/src/mx/skins/spark/ProgressIndeterminateSkin.as
+++ frameworks/projects/sparkskins/src/mx/skins/spark/ProgressIndeterminateSkin.as
@@ -1,3 +1,13 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2004-2007 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////

 package mx.skins.spark
 {


Add EOverlayToStoreFlags

Add EOverlayToStoreFlags

--- lib/src/com/amanitadesign/steam/WorkshopConstants.as
+++ lib/src/com/amanitadesign/steam/WorkshopConstants.as
@@ -37,6 +37,10 @@
 		public static const VISIBILITY_FriendsOnly:int = 1;
 		public static const VISIBILITY_Private:int = 2;

+		public static const OVERLAYSTOREFLAG_None:int = 0;
+		public static const OVERLAYSTOREFLAG_AddToCart:int = 1;
+		public static const OVERLAYSTOREFLAG_AddToCartAndShow:int = 2;
+
 		public static const FILEUPDATEHANDLE_Invalid:String = "18446744073709551615"; // 0xffffffffffffffffull
 		public static const UGCHANDLE_Invalid:String = "18446744073709551615"; // 0xffffffffffffffffull
 	}


mod_posteffect.asの修正

mod_posteffect.asの修正

git-svn-id: 667ccd08e5f160307f6512a0947301cac150914e@1285 ceb3ebad-0e53-d446-8596-a45b2b8d79cd

--- package/win32/common/mod_posteffect.as
+++ package/win32/common/mod_posteffect.as
@@ -336,6 +336,8 @@
 *opt_crt
 	crt_curvex=postopt_p1		; X̘pȗ
 	crt_curvey=postopt_p2		; Y̘pȗ
+	gpmatprm1 crt_mat, "u_curvex", crt_curvex
+	gpmatprm1 crt_mat, "u_curvey", crt_curvey
 	return

 *exec_crt


Changed UIObject to make its contentContainer mouse-invisible. Contents of the container won't be affected.

--- src/reprise/ui/UIObject.as
+++ src/reprise/ui/UIObject.as
@@ -846,6 +846,7 @@
 		protected function createDisplayClips() : void
 		{
 			m_contentDisplay = new Sprite();
+			m_contentDisplay.mouseEnabled = false;
 			m_contentDisplay.name = 'content';
 			super.addChild(m_contentDisplay);
 		}


Transferred from the Adobe Open Source Subversion Repository

Revision: 18871
Author:   smgilson@adobe.com
Date:     2010-11-30T20:10:44.561987Z

Log Message:
-----------
Fix ASDoc version tags

QE notes:
Doc notes:
Bugs:
Reviewer:
Tests run: checkintests
Is noteworthy for integration:

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/tabularData/SparkDataGridTabularData.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/skins/spark/SparkDefaultComplexItemRendererAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkScrollBarBaseAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkComboBoxAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/skins/spark/SparkDefaultItemRendererAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/skins/spark/SparkDefaultGridHeaderRendererAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SprakTextAreaAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkItemRendererAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkDataGridAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/components/MobileIconItemRenderer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/skins/spark/SparkDefaultGridItemRendererAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/StyleableTextField.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/components/TabbedViewNavigator.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/styles/metadata/GapStyles.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkButtonBarBaseAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/components/mediaClasses/SparkVolumeBarAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkButtonBarAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SprakSkinnableTextBaseAutomationImpl.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/preloaders/SplashScreen.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/events/ViewNavigatorEvent.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1252059 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkButtonBarAutomationImpl.as
+++ frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkButtonBarAutomationImpl.as
@@ -50,9 +50,9 @@
          *  @param root The SystemManger of the application.
          *
          *  @langversion 3.0
-         *  @playerversion Flash 9
+         *  @playerversion Flash 10
          *  @playerversion AIR 1.5
-         *  @productversion Flex 3
+         *  @productversion Flex 4
          */
         public static function init(root:DisplayObject):void
         {
@@ -70,9 +70,9 @@
          * @param obj ButtonBar object to be automated.
          *
          *  @langversion 3.0
-         *  @playerversion Flash 9
+         *  @playerversion Flash 10
          *  @playerversion AIR 1.5
-         *  @productversion Flex 3
+         *  @productversion Flex 4
          */
         public function SparkButtonBarAutomationImpl(obj:spark.components.ButtonBar)
         {


Transferred from the Adobe Open Source Subversion Repository

Revision: 14483
Author:   smgilson@adobe.com
Date:     2010-03-01T19:01:18.459430Z

Log Message:
-----------
merge 14456: Adding ASDoc version tags classes

QE notes:
Doc notes:
Bugs:
Reviewer:
Tests run: checkintests
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkRangeAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkRadioButtonAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkPanelAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkButtonBaseAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkButtonBarAutomationImpl.as</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_air/src/mx/automation/air/AirFunctionsHelper.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkSkinnableContainerAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/events/SparkValueChangeAutomationEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkButtonBarBaseAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkNavigatorContentAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkDataGroupAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkTrackBaseAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation/src/mx/automation/events/EventDetails.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/events/SparkListItemSelectEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkTabBarAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkButtonBarButtonAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkGroupAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkSkinnableContainerBaseAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/mediaClasses/SparkMuteButtonAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_air/src/mx/automation/air/AirDragManagerAutomationHandler.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/soap/SOAPResult.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkTextBaseAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkTitleWindowAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkTileGroupAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkButtonAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkToggleButtonAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkSpinnerAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/accessibility/AccConst.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkLabelAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkBorderContainerAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkGroupBaseAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkVideoPlayerAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkSkinnableComponentAutomationImpl.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1252156 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkRadioButtonAutomationImpl.as
+++ frameworks/projects/automation_spark/src/spark/automation/delegates/components/SparkRadioButtonAutomationImpl.as
@@ -11,77 +11,92 @@

 package spark.automation.delegates.components
 {
-	import flash.display.DisplayObject;
-	import flash.events.KeyboardEvent;
-	import flash.ui.Keyboard;
-
-	import mx.automation.Automation;
-	import mx.core.mx_internal;
-
-	import spark.automation.delegates.components.supportClasses.SparkButtonBaseAutomationImpl;
-	import spark.components.RadioButton;
-
-	use namespace mx_internal;
-
-	[Mixin]
-	/**
-	 *
-	 *  Defines methods and properties required to perform instrumentation for the
-	 *  RadioButton control.
-	 *
-	 *  @see spark.components.RadioButton
-	 *
-	 */
-	public class SparkRadioButtonAutomationImpl extends SparkButtonBaseAutomationImpl
-	{
-		include "../../../core/Version.as";
-
-		//--------------------------------------------------------------------------
-		//
-		//  Class methods
-		//
-		//--------------------------------------------------------------------------
-
-		/**
-		 *  Registers the delegate class for a component class with automation manager.
-		 *
-		 *  @param root The SystemManger of the application.
-		 */
-		public static function init(root:DisplayObject):void
-		{
-			Automation.registerDelegateClass(spark.components.RadioButton, SparkRadioButtonAutomationImpl);
-		}
-
-		/**
-		 *  Constructor.
-		 * @param obj RadioButton object to be automated.
-		 */
-		public function SparkRadioButtonAutomationImpl(obj:spark.components.RadioButton)
-		{
-			super(obj);
-
-		}
-
-		/**
-		 *  @private
-		 *  Support the use of keyboard within the group.
-		 */
-		override protected function keyDownHandler(event:KeyboardEvent):void
-		{
-			switch (event.keyCode)
-			{
-				case Keyboard.DOWN:
-				case Keyboard.UP:
-				case Keyboard.LEFT:
-				case Keyboard.RIGHT:
-					//for form defaults:
-				case Keyboard.ENTER:
-					recordAutomatableEvent(event);
-					break;
-			}
-		}
-
-
-	}
-
+    import flash.display.DisplayObject;
+    import flash.events.KeyboardEvent;
+    import flash.ui.Keyboard;
+
+    import mx.automation.Automation;
+    import mx.core.mx_internal;
+
+    import spark.automation.delegates.components.supportClasses.SparkButtonBaseAutomationImpl;
+    import spark.components.RadioButton;
+
+    use namespace mx_internal;
+
+    [Mixin]
+    /**
+     *
+     *  Defines methods and properties required to perform instrumentation for the
+     *  RadioButton control.
+     *
+     *  @see spark.components.RadioButton
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.5
+     *  @productversion Flex 4
+     *
+     */
+    public class SparkRadioButtonAutomationImpl extends SparkButtonBaseAutomationImpl
+    {
+        include "../../../core/Version.as";
+
+        //--------------------------------------------------------------------------
+        //
+        //  Class methods
+        //
+        //--------------------------------------------------------------------------
+
+        /**
+         *  Registers the delegate class for a component class with automation manager.
+         *
+         *  @param root The SystemManger of the application.
+         *
+         *  @langversion 3.0
+         *  @playerversion Flash 9
+         *  @playerversion AIR 1.5
+         *  @productversion Flex 4
+         */
+        public static function init(root:DisplayObject):void
+        {
+            Automation.registerDelegateClass(spark.components.RadioButton, SparkRadioButtonAutomationImpl);
+        }
+
+        /**
+         *  Constructor.
+         * @param obj RadioButton object to be automated.
+         *
+         *  @langversion 3.0
+         *  @playerversion Flash 9
+         *  @playerversion AIR 1.5
+         *  @productversion Flex 4
+         */
+        public function SparkRadioButtonAutomationImpl(obj:spark.components.RadioButton)
+        {
+            super(obj);
+
+        }
+
+        /**
+         *  @private
+         *  Support the use of keyboard within the group.
+         */
+        override protected function keyDownHandler(event:KeyboardEvent):void
+        {
+            switch (event.keyCode)
+            {
+                case Keyboard.DOWN:
+                case Keyboard.UP:
+                case Keyboard.LEFT:
+                case Keyboard.RIGHT:
+                    //for form defaults:
+                case Keyboard.ENTER:
+                    recordAutomatableEvent(event);
+                    break;
+            }
+        }
+
+
+    }
+
 }


Transferred from the Adobe Open Source Subversion Repository

Revision: 11039
Author:   chaase@adobe.com
Date:     2009-10-20T23:37:59.923557Z

Log Message:
-----------
Added and corrected ASDocs for the various transformPointToParent() functions. Also modified parameter names to be more correct (and understandable).

QE notes: -
Doc notes: Added ASDocs, fixes bug 23337
Bugs: SDK-23337
Reviewer: Ely
Tests run: checkintests, mustella spark transform effects
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/core/SpriteVisualElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/primitives/supportClasses/GraphicElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flash-integration/src/mx/flash/UIMovieClip.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UIComponent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/AdvancedLayoutFeatures.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1259906 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/framework/src/mx/core/UIComponent.as
+++ frameworks/projects/framework/src/mx/core/UIComponent.as
@@ -12163,30 +12163,41 @@
     }

     /**
-     *  FIXME (chaase) : FLEXDOCS-1031
+     * A utility method to transform a point specified in the local
+     * coordinates of this object to its location in the object's parent's
+     * coordinates. The pre-layout and post-layout result will be set on
+     * the position and postLayoutPosition
+     * parameters, if they are non-null.
+     *
+     * @param localPosition The point to be transformed, specified in the
+     * local coordinates of the object.
+     * @position A Vector3D point that will hold the pre-layout
+     * result. If null, the parameter is ignored.
+     * @postLayoutPosition A Vector3D point that will hold the post-layout
+     * result. If null, the parameter is ignored.
      *
      *  @langversion 3.0
      *  @playerversion Flash 10
      *  @playerversion AIR 1.5
      *  @productversion Flex 4
      */
-    public function transformPointToParent(transformCenter:Vector3D,
+    public function transformPointToParent(localPosition:Vector3D,
                                            position:Vector3D,
                                            postLayoutPosition:Vector3D):void
     {
         if (_layoutFeatures != null)
         {
-            _layoutFeatures.transformPointToParent(true, transformCenter,
+            _layoutFeatures.transformPointToParent(true, localPosition,
                 position, postLayoutPosition);
         }
         else
         {
             if (xformPt == null)
                 xformPt = new Point();
-            if (transformCenter)
+            if (localPosition)
             {
-                xformPt.x = transformCenter.x;
-                xformPt.y = transformCenter.y;
+                xformPt.x = localPosition.x;
+                xformPt.y = localPosition.y;
             }
             else
             {


Transferred from the Adobe Open Source Subversion Repository

Revision: 116
Author:   aharui@adobe.com
Date:     2008-01-08T00:12:58.854280Z

Log Message:
-----------
Fix cursorManager getter performance.

Bugs: SDK-14066
QA:
Doc:

Modified Paths:
--------------
/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UIComponent.as

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1259750 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/framework/src/mx/core/UIComponent.as
+++ frameworks/projects/framework/src/mx/core/UIComponent.as
@@ -2305,8 +2305,10 @@
         while (o)
         {
             if (o is IUIComponent && "cursorManager" in o)
-                if (o["cursorManager"] != null)
-                    return o["cursorManager"];
+			{
+				var cm:ICursorManager = o["cursorManager"];
+                return cm;
+			}

             o = o.parent;
         }


Transferred from the Adobe Open Source Subversion Repository

Revision: 22987
Author:   jszeto@adobe.com
Date:     2011-10-12T23:52:46.424992Z

Log Message:
-----------
Validator backwards compatibility bug

SDK-31809 Validators do not show red errors around input boxes when compiled with Flex 3 compatibility mode

 We added some code during the development of the Spark Form feature to control whether an error border and tooltip are shown. These are controlled by styles. These styles don't exist in Flex 3 compat mode, thus they resolve as false and therefore don't display the border or tooltip.

The fix is to add compatibility flag checks around this code in UIComponent.

QE notes: none
Doc notes: none
Bugs: SDK-31809
Reviewer: Kevin L
Tests run: checkintests, cyclone
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/4.y/frameworks/projects/framework/src/mx/core/UIComponent.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/4.y/frameworks/projects/framework/src/mx/managers/ToolTipManagerImpl.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1260024 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/framework/src/mx/core/UIComponent.as
+++ frameworks/projects/framework/src/mx/core/UIComponent.as
@@ -7062,7 +7062,7 @@
      */
     private function setBorderColorForErrorString():void
     {
-        var showErrorSkin:Boolean = getStyle("showErrorSkin");
+        var showErrorSkin:Boolean = FlexVersion.compatibilityVersion < FlexVersion.VERSION_4_0 || getStyle("showErrorSkin");

         if (showErrorSkin)
         {
@@ -8326,7 +8326,7 @@
         if (errorStringChanged)
         {
             errorStringChanged = false;
-            if (getStyle("showErrorTip"))
+            if (FlexVersion.compatibilityVersion < FlexVersion.VERSION_4_0 || getStyle("showErrorTip"))
                 ToolTipManager.registerErrorString(this, oldErrorString, errorString);

             setBorderColorForErrorString();
@@ -10077,7 +10077,8 @@
         if (focusObj)
         {
             var rectCol:Number;
-            if (errorString && errorString != "" && getStyle("showErrorSkin"))
+            var showErrorSkin:Boolean = FlexVersion.compatibilityVersion < FlexVersion.VERSION_4_0 || getStyle("showErrorSkin");
+            if (errorString && errorString != "" && showErrorSkin)
                 rectCol = getStyle("errorColor");
             else if (FlexVersion.compatibilityVersion < FlexVersion.VERSION_4_0)
                 rectCol = getStyle("themeColor");


Transferred from the Adobe Open Source Subversion Repository

Revision: 19229
Author:   aharui@adobe.com
Date:     2010-12-09T19:16:13.997719Z

Log Message:
-----------
Fix bug around assigning fontContext

QE notes: Five mustella tests need updating
Doc notes: none
Bugs: SDK-27845
Reviewer: Darrell
Tests run: checkintests mustella full run
Is noteworthy for integration: no

Modified Paths:
--------------
/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/core/UIComponent.as

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1260000 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/framework/src/mx/core/UIComponent.as
+++ frameworks/projects/framework/src/mx/core/UIComponent.as
@@ -7472,7 +7472,7 @@

         // Set the font context in non-UIComponent children.
         // UIComponent children use moduleFactory.
-        if (child is IFontContextComponent && !child is UIComponent &&
+        if (child is IFontContextComponent && !(child is UIComponent) &&
             IFontContextComponent(child).fontContext == null)
             IFontContextComponent(child).fontContext = moduleFactory;


Transferred from the Adobe Open Source Subversion Repository

Revision: 14208
Author:   hmuller@adobe.com
Date:     2010-02-17T19:00:35.842613Z

Log Message:
-----------
Merge 4.x revision 14206 to trunk.

Fixed UITextField getMeasuredWidth,Height() methods to compensate for mirroring.

QE notes: As always, this change should have no effect on components that haven't been mirrored
Doc notes:
Bugs:
Reviewer: Carol
Tests run:
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/build.xml</path>
<path kind="dir" action="M">/flex/sdk/trunk/frameworks</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UITextField.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1260071 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/framework/src/mx/core/UITextField.as
+++ frameworks/projects/framework/src/mx/core/UITextField.as
@@ -35,6 +35,7 @@
 import mx.styles.IStyleManager2;
 import mx.styles.StyleManager;
 import mx.styles.StyleProtoChain;
+import mx.utils.MatrixUtil;
 import mx.utils.NameUtil;
 import mx.utils.StringUtil;

@@ -1288,10 +1289,11 @@
         if (!stage || embedFonts)
             return textHeight + TEXT_HEIGHT_PADDING;

-        var m:Matrix = transform.concatenatedMatrix;
+        const m:Matrix = MatrixUtil.getConcatenatedMatrix(this);
+        const sx:Number = ((mirror) ? -1 : +1) * m.a;
+        const sy:Number = m.d

-        return (textHeight * m.a
-                / m.d) + TEXT_HEIGHT_PADDING;
+        return (textHeight * sx / sy) + TEXT_HEIGHT_PADDING;
     }

     //----------------------------------
@@ -1360,13 +1362,15 @@

         // If we use device fonts, then the unscaled width is
         // textWidth * scaleX / scaleY
+
         if (!stage || embedFonts)
             return textWidth + TEXT_WIDTH_PADDING;

-        var m:Matrix = transform.concatenatedMatrix;
+        const m:Matrix = MatrixUtil.getConcatenatedMatrix(this);
+        const sx:Number = ((mirror) ? -1 : +1) * m.a;
+        const sy:Number = m.d

-        return (textWidth * m.a
-                / m.d) + TEXT_WIDTH_PADDING;
+        return (textWidth * sx / sy) + TEXT_WIDTH_PADDING;
     }

     //----------------------------------


Fix issue with multi select and ctrl clicking on start and or of date ranges.

--- frameworks/projects/mx/src/mx/controls/CalendarLayout.as
+++ frameworks/projects/mx/src/mx/controls/CalendarLayout.as
@@ -2039,6 +2039,14 @@

 				selectedRangeCount++;
 			}
+			// remove day at start of range
+			else if (endDate.time == rangeStart.time) {
+				_selectedRanges[n].rangeStart = addSubtractDays(startDate, +1);
+			}
+			// remove day at end of range
+			else if (startDate.time == rangeEnd.time) {
+				_selectedRanges[n].rangeEnd = addSubtractDays(endDate, -1);
+			}
 			// move selection start date if end overlaps
 			else if (endDate >= rangeStart)
 			{


Update default year to 2104

Update default year to 2104

--- frameworks/projects/mx/src/mx/controls/CalendarLayout.as
+++ frameworks/projects/mx/src/mx/controls/CalendarLayout.as
@@ -630,7 +630,7 @@
      */
     private var _proposedDisplayedYear:int = -1;

-    [Inspectable(category="General", defaultValue="2013")]
+    [Inspectable(category="General", defaultValue="2014")]

     /**
      *  @private


Transferred from the Adobe Open Source Subversion Repository

Revision: 23243
Author:   cframpto@adobe.com
Date:     2011-12-20T00:59:57.384047Z

Log Message:
-----------
In frameworks, remove Adobe headers from all files except xml/mxml file types.  There are also a few .txt files that are license files that I didn't touch yet.

Modified Paths:
--------------
2361 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1268163 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/mx/src/mx/controls/HorizontalList.as
+++ frameworks/projects/mx/src/mx/controls/HorizontalList.as
@@ -1,13 +1,3 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2004-2007 Adobe Systems Incorporated
-//  All Rights Reserved.
-//
-//  NOTICE: Adobe permits you to use, modify, and distribute this file
-//  in accordance with the terms of the license agreement accompanying it.
-//
-////////////////////////////////////////////////////////////////////////////////

 package mx.controls
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 14571
Author:   deeptika@adobe.com
Date:     2010-03-04T07:17:40.283901Z

Log Message:
-----------
Merging revision 14570 from 4.x branch
QE notes:
Doc notes:
Bugs:
Reviewer:
Tests run: checkintests
Is noteworthy for integration: No

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation/src/mx/automation/delegates/core/UIComponentAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_air/src/mx/automation/delegates/controls/FlexNativeMenuAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation/src/mx/automation/delegates/controls/SWFLoaderAutomationImpl.as</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/tabularData/SparkListBaseTabularData.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/mx/automation/delegates/core/UIFTETextFieldAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation/src/mx/automation/delegates/core/UITextFieldAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkDropDownListBaseAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_dmv/src/mx/automation/delegates/advancedDataGrid/AdvancedDataGridAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation_spark/src/spark/automation/delegates/components/supportClasses/SparkListBaseAutomationImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation/src/mx/automation/tabularData/OLAPDataGridTabularData.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation/src/mx/automation/codec/RendererPropertyCodec.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation/src/mx/automation/delegates/TextFieldAutomationHelper.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/automation/src/mx/automation/codec/AutomationObjectPropertyCodec.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1251819 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/automation_dmv/src/mx/automation/delegates/advancedDataGrid/AdvancedDataGridAutomationImpl.as
+++ frameworks/projects/automation_dmv/src/mx/automation/delegates/advancedDataGrid/AdvancedDataGridAutomationImpl.as
@@ -401,8 +401,9 @@

 			if (newRowIndex >= view.length)
 			{
-				trace ("Invalid Row Index : " + String(rowIndex) + " - Total Row Count : "
-					+ String (grid1.maxVerticalScrollPosition + view.length));
+				var message:String = "Invalid Row Index : " + String(rowIndex) + " - Total Row Count : "
+					+ String (grid1.maxVerticalScrollPosition + view.length);
+				Automation.automationDebugTracer.traceMessage("AdvancedDataGridAutomationImpl","isGroupeditem()",message);
 			}
 			else
 			{
@@ -462,8 +463,9 @@

 			if (newRowIndex >= view.length)
 			{
-				trace ("Invalid Row Index : " + String(rowIndex) + " - Total Row Count : "
-					+ String (grid1.maxVerticalScrollPosition + view.length));
+				var message:String = "Invalid Row Index : " + String(rowIndex) + " - Total Row Count : "
+					+ String (grid1.maxVerticalScrollPosition + view.length);
+				Automation.automationDebugTracer.traceMessage("AdvancedDataGridAutomationImpl","getGroupedItemChildrenCount()",message);
 			}
 			else
 			{
@@ -576,8 +578,9 @@
 			// check whether the requried row Index is visible
 			if (newRowIndex >= grid1.rowCount)
 			{
-				trace( "Invalid Row Index : " + String(rowIndex) + " - Total Row Count : "
-					+ String (grid1.maxVerticalScrollPosition + grid1.rowCount));
+				var message:String = "Invalid Row Index : " + String(rowIndex) + " - Total Row Count : "
+					+ String (grid1.maxVerticalScrollPosition + grid1.rowCount);
+				Automation.automationDebugTracer.traceMessage("AdvancedDataGridAutomationImpl","getRowData()",message);

 			}
 			else


Fix creating UI elements from the quick menu.

--- Bin/Data/Scripts/Editor/EditorUI.as
+++ Bin/Data/Scripts/Editor/EditorUI.as
@@ -563,6 +563,19 @@
     return true;
 }

+bool PickUIElement()
+{
+    Menu@ menu = GetEventSender();
+    if (menu is null)
+        return false;
+
+    String action = GetActionName(menu.name);
+    if (action.empty)
+        return false;
+
+    return NewUIElement(action);
+}
+
 // When calling items from the quick menu, they have "Create" prepended for clarity. Strip that now to get the object name to create
 String GetActionName(const String&in name)
 {
@@ -570,19 +583,6 @@
         return name.Substring(7);
     else
         return name;
-}
-
-bool PickUIElement()
-{
-    Menu@ menu = GetEventSender();
-    if (menu is null)
-        return false;
-
-    String action = menu.name;
-    if (action.empty)
-        return false;
-
-    return NewUIElement(action);
 }

 void HandleMenuSelected(StringHash eventType, VariantMap& eventData)


implement watch command

implement watch command

--- vivified/core/vivi_initialize.as
+++ vivified/core/vivi_initialize.as
@@ -115,3 +115,38 @@
 };
 Commands.backtrace = Commands.where;
 Commands.bt = Commands.where;
+Commands.watch = function () {
+  var object;
+  var name;
+  if (arguments.length == 1) {
+    name = arguments[0];
+  } else if (arguments.length == 2) {
+    object = arguments[0];
+    name = arguments[1];
+  } else {
+    Commands.error ("usage: watch [object] name");
+    return;
+  }
+  var ret = new Breakpoint ();
+  ret.onSetVariable = function (o, variable, value) {
+    if (object && o != object)
+      return false;
+    if (variable != name)
+      return;
+
+    if (object) {
+      Commands.print ("Breakpoint: variable " + name + " on " + object);
+    } else {
+      Commands.print ("Breakpoint: variable " + name);
+    }
+    Commands.print ("  " + Player.frame);
+    return true;
+  };
+  ret.toString = function () {
+    var s = "watch " + name;
+    if (object)
+      s += " on " + object;
+    return s;
+  };
+  return ret;
+};


GeometryPlotter now requests required detail from StreamedGeometryColumn objects even if they are nested inside other column objects

--- WeaveUI/src/weave/visualization/plotters/GeometryPlotter.as
+++ WeaveUI/src/weave/visualization/plotters/GeometryPlotter.as
@@ -29,6 +29,7 @@
 	import mx.utils.ObjectUtil;

 	import weave.Weave;
+	import weave.api.WeaveAPI;
 	import weave.api.copySessionState;
 	import weave.api.data.IAttributeColumn;
 	import weave.api.data.IColumnWrapper;
@@ -39,7 +40,9 @@
 	import weave.api.setSessionState;
 	import weave.api.ui.IPlotterWithGeometries;
 	import weave.core.LinkableNumber;
+	import weave.core.SessionManager;
 	import weave.core.StageUtils;
+	import weave.core.weave_internal;
 	import weave.data.AttributeColumns.ColorColumn;
 	import weave.data.AttributeColumns.DynamicColumn;
 	import weave.data.AttributeColumns.ReprojectedGeometryColumn;
@@ -252,18 +255,13 @@

 		override public function drawPlot(recordKeys:Array, dataBounds:IBounds2D, screenBounds:IBounds2D, destination:BitmapData):void
 		{
-			var minImportance:Number = getDataAreaPerPixel(dataBounds, screenBounds) * pixellation.value;
-
-			// try to find an internal StreamedGeometryColumn
-			var column:IAttributeColumn = geometryColumn;
-
-			while (!(column is StreamedGeometryColumn) && column is IColumnWrapper)
-				column = (column as IColumnWrapper).internalColumn;
-
-			// if the internal geometry column is a streamed column, request the required detail
-			var streamedColumn:StreamedGeometryColumn = column as StreamedGeometryColumn;
-			if (streamedColumn)
-			{
+			var minImportance:Number = getDataAreaPerPixel(dataBounds, screenBounds) * pixellation.value;
+
+			// find nested StreamedGeometryColumn objects
+			var descendants:Array = (WeaveAPI.SessionManager as SessionManager).weave_internal::getDescendants(geometryColumn, StreamedGeometryColumn);
+			// request the required detail
+			for each (var streamedColumn:StreamedGeometryColumn in descendants)
+			{
 				var requestedDataBounds:IBounds2D = dataBounds;
 				var requestedMinImportance:Number = minImportance;
 				if (requestedDataBounds.isUndefined())// if data bounds is empty
@@ -285,7 +283,7 @@
 				var recordKey:IQualifiedKey = recordKeys[recIndex] as IQualifiedKey;
 				var geoms:Array;

-				var value:* = column.getValueFromKey(recordKey);//geometry.getValueFromKey(recordKey);
+				var value:* = geometryColumn.getValueFromKey(recordKey);
 				if (value is Array)
 					geoms = value;
 				else if (value is GeneralizedGeometry)


Changed to spotlight instead of pointlight, and added logic for right colors


Transferred from the Adobe Open Source Subversion Repository

Revision: 12368
Author:   dsubrama@adobe.com
Date:     2009-12-02T16:37:28.078960Z

Log Message:
-----------
Rename spark.components.supportClasses.Slider to spark.components.supportClasses.SliderBase as well as spark.components.supportClasses.ScrollBar to spark.components.supportClasses.ScrollBarBase. This means the spark manifest entries have also changed (for CSS styling purposes, not for use as mxml tags) (Slider -> SliderBase, ScrollBar -> ScrollBarBase).

Change is PARB approved.

QE notes: Please check-in the updated tests
Doc notes: ASDoc has been updated. If any updates need to happen in livedocs, please do so.
Bugs: SDK-24401
Reviewer: Ryan/Jason
Tests run: Jacob ran a cyclone
Is noteworthy for integration: Yes

Modified Paths:
--------------
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/Slider.as" copyfrom-rev="12283" action="A">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/SliderBase.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/spark/src/spark/accessibility/SliderAccImpl.as" copyfrom-rev="12283" action="A">/flex/sdk/trunk/frameworks/projects/spark/src/spark/accessibility/SliderBaseAccImpl.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ScrollBar.as" copyfrom-rev="12283" action="A">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ScrollBarBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VSlider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/HSlider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/HScrollBar.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/Slider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/spark-manifest.xml</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/spark/src/spark/accessibility/SliderAccImpl.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ScrollerLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/development/eclipse/flex/sparkTest/src/components/CircularScrollBar.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1279317 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/components/HScrollBar.as
+++ frameworks/projects/spark/src/spark/components/HScrollBar.as
@@ -19,7 +19,7 @@
 import mx.events.PropertyChangeEvent;
 import mx.events.ResizeEvent;

-import spark.components.supportClasses.ScrollBar;
+import spark.components.supportClasses.ScrollBarBase;
 import spark.core.IViewport;
 import spark.core.NavigationUnit;

@@ -33,7 +33,7 @@
 [DefaultTriggerEvent("change")]

 /**
- *  The HScrollBar (horizontal ScrollBar) control lets you control
+ *  The HScrollBar (horizontal scrollbar) control lets you control
  *  the portion of data that is displayed when there is too much data
  *  to fit horizontally in a display area.
  *
@@ -88,7 +88,7 @@
  *  @playerversion AIR 1.5
  *  @productversion Flex 4
  */
-public class HScrollBar extends ScrollBar
+public class HScrollBar extends ScrollBarBase
 {
     include "../core/Version.as";

@@ -269,7 +269,7 @@
      *  @param increase Whether the page scroll is up (true) or
      *  down (false).
      *
-     *  @see spark.components.supportClasses.ScrollBar#changeValueByPage()
+     *  @see spark.components.supportClasses.ScrollBarBase#changeValueByPage()
      *  @see spark.components.supportClasses.Range#setValue()
      *  @see spark.core.IViewport
      *  @see spark.core.IViewport#horizontalScrollPosition
@@ -285,7 +285,7 @@
         var oldPageSize:Number;
         if (viewport)
         {
-            // Want to use ScrollBar's changeValueByPage() implementation to get the same
+            // Want to use ScrollBarBase's changeValueByPage() implementation to get the same
             // animated behavior for scrollbars with and without viewports.
             // For now, just change pageSize temporarily and call the superclass
             // implementation.
@@ -350,7 +350,7 @@
         var oldStepSize:Number;
         if (viewport)
         {
-            // Want to use ScrollBar's changeValueByStep() implementation to get the same
+            // Want to use ScrollBarBase's changeValueByStep() implementation to get the same
             // animated behavior for scrollbars with and without viewports.
             // For now, just change pageSize temporarily and call the superclass
             // implementation.