hg: jdk7u/jdk7u-osx/jdk: 7124627: Please sync up changes from workspace macosx-port into the jdk7u-osx

[alexander.zuev at oracle.com]

Changeset: 0c57f87f454d
Author:    kizune
Date:      2011-12-23 22:01 +0300
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-osx/jdk/rev/0c57f87f454d

7124627: Please sync up changes from workspace macosx-port into the jdk7u-osx
Reviewed-by: art, anthony, dcherepanov, alexp

! make/com/apple/osx/Makefile
! make/com/apple/osxui/Makefile
! make/javax/sound/FILES_c.gmk
! make/sun/Makefile
! make/sun/lwawt/FILES_c_macosx.gmk
! make/sun/lwawt/FILES_export_macosx.gmk
! make/sun/lwawt/Makefile
+ make/sun/osxapp/Makefile
! make/sun/splashscreen/Makefile
! src/macosx/classes/com/apple/laf/AquaFocus.java
! src/macosx/classes/com/apple/laf/AquaPainter.java
! src/macosx/classes/com/apple/laf/AquaScrollBarUI.java
! src/macosx/classes/com/apple/laf/AquaSpinnerUI.java
! src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
! src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java
! src/macosx/classes/sun/awt/CGraphicsConfig.java
! src/macosx/classes/sun/awt/CGraphicsEnvironment.java
! src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
! src/macosx/classes/sun/java2d/opengl/CGLLayer.java
! src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
! src/macosx/classes/sun/lwawt/LWButtonPeer.java
! src/macosx/classes/sun/lwawt/LWCanvasPeer.java
! src/macosx/classes/sun/lwawt/LWCheckboxPeer.java
! src/macosx/classes/sun/lwawt/LWChoicePeer.java
! src/macosx/classes/sun/lwawt/LWComponentPeer.java
! src/macosx/classes/sun/lwawt/LWContainerPeer.java
! src/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java
! src/macosx/classes/sun/lwawt/LWLabelPeer.java
! src/macosx/classes/sun/lwawt/LWListPeer.java
! src/macosx/classes/sun/lwawt/LWPanelPeer.java
+ src/macosx/classes/sun/lwawt/LWRepaintArea.java
! src/macosx/classes/sun/lwawt/LWScrollBarPeer.java
! src/macosx/classes/sun/lwawt/LWScrollPanePeer.java
! src/macosx/classes/sun/lwawt/LWTextAreaPeer.java
! src/macosx/classes/sun/lwawt/LWTextComponentPeer.java
! src/macosx/classes/sun/lwawt/LWTextFieldPeer.java
! src/macosx/classes/sun/lwawt/LWToolkit.java
! src/macosx/classes/sun/lwawt/LWWindowPeer.java
! src/macosx/classes/sun/lwawt/PlatformWindow.java
! src/macosx/classes/sun/lwawt/macosx/CCursorManager.java
! src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
! src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java
! src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
! src/macosx/classes/sun/lwawt/macosx/CInputMethod.java
! src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java
! src/macosx/classes/sun/lwawt/macosx/CPlatformView.java
! src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
! src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
! src/macosx/classes/sun/lwawt/macosx/CRobot.java
! src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
! src/macosx/classes/sun/lwawt/macosx/CWrapper.java
! src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
! src/macosx/classes/sun/lwawt/macosx/event/NSEvent.java
- src/macosx/native/com/sun/media/sound/CARingBuffer.cpp
- src/macosx/native/com/sun/media/sound/CARingBuffer.h
+ src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiIn.c
+ src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiOut.c
+ src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.c
+ src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.h
! src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_PCM.cpp
+ src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Ports.cpp
+ src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Utils.cpp
! src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Utils.h
- src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOS_MidiIn.c
- src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOS_MidiOut.c
- src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOS_MidiUtils.c
- src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOS_MidiUtils.h
! src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/StructOffsetResolver.java
! src/macosx/native/sun/awt/AWTView.m
! src/macosx/native/sun/awt/AWTWindow.h
! src/macosx/native/sun/awt/AWTWindow.m
- src/macosx/native/sun/awt/AWT_debug.h
! src/macosx/native/sun/awt/CDragSource.m
! src/macosx/native/sun/awt/CDropTarget.m
! src/macosx/native/sun/awt/CDropTargetContextPeer.m
! src/macosx/native/sun/awt/CRobot.m
! src/macosx/native/sun/awt/CTrayIcon.h
! src/macosx/native/sun/awt/CTrayIcon.m
! src/macosx/native/sun/awt/CWrapper.m
- src/macosx/native/sun/awt/NSApplicationAWT.h
- src/macosx/native/sun/awt/NSApplicationAWT.m
- src/macosx/native/sun/awt/PropertiesUtilities.h
- src/macosx/native/sun/awt/PropertiesUtilities.m
- src/macosx/native/sun/awt/ThreadUtilities.h
- src/macosx/native/sun/awt/ThreadUtilities.m
! src/macosx/native/sun/awt/awt.m
! src/macosx/native/sun/awt/splashscreen/splashscreen_config.h
! src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m
! src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.h
! src/macosx/native/sun/java2d/opengl/CGLLayer.h
! src/macosx/native/sun/java2d/opengl/CGLLayer.m
! src/macosx/native/sun/java2d/opengl/CGLSurfaceData.h
! src/macosx/native/sun/java2d/opengl/CGLSurfaceData.m
+ src/macosx/native/sun/osxapp/AWT_debug.h
+ src/macosx/native/sun/osxapp/NSApplicationAWT.h
+ src/macosx/native/sun/osxapp/NSApplicationAWT.m
+ src/macosx/native/sun/osxapp/PropertiesUtilities.h
+ src/macosx/native/sun/osxapp/PropertiesUtilities.m
+ src/macosx/native/sun/osxapp/QueuingApplicationDelegate.h
+ src/macosx/native/sun/osxapp/QueuingApplicationDelegate.m
+ src/macosx/native/sun/osxapp/ThreadUtilities.h
+ src/macosx/native/sun/osxapp/ThreadUtilities.m
! src/share/bin/java.c
! src/share/classes/java/awt/KeyboardFocusManager.java
! src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java
! src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
! src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
! src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
! src/share/classes/javax/swing/plaf/basic/BasicTextUI.java
! src/share/classes/sun/awt/AWTAccessor.java
! src/share/classes/sun/awt/SunToolkit.java
! src/share/classes/sun/java2d/opengl/OGLBlitLoops.java
! src/share/classes/sun/java2d/opengl/OGLSurfaceData.java
! src/share/native/com/sun/media/sound/DirectAudioDevice.c
! src/share/native/com/sun/media/sound/Utilities.h
! src/share/native/sun/awt/splashscreen/splashscreen_impl.h
! src/solaris/bin/java_md.c
! src/solaris/native/java/net/PlainDatagramSocketImpl.c
+ src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig
! src/solaris/native/sun/awt/awt_LoadLibrary.c