1,2c1,2
< --- old/modules/graphics/src/main/java/javafx/stage/Screen.java	2016-03-30 23:38:06.000000000 -0700
< +++ new/modules/graphics/src/main/java/javafx/stage/Screen.java	2016-03-30 23:38:05.000000000 -0700
---
> --- old/modules/graphics/src/main/java/javafx/stage/Screen.java	2016-04-05 16:32:34.000000000 -0700
> +++ new/modules/graphics/src/main/java/javafx/stage/Screen.java	2016-04-05 16:32:34.000000000 -0700
136,137c136,137
< --- old/modules/graphics/src/main/java/javafx/stage/Window.java	2016-03-30 23:38:07.000000000 -0700
< +++ new/modules/graphics/src/main/java/javafx/stage/Window.java	2016-03-30 23:38:07.000000000 -0700
---
> --- old/modules/graphics/src/main/java/javafx/stage/Window.java	2016-04-05 16:32:35.000000000 -0700
> +++ new/modules/graphics/src/main/java/javafx/stage/Window.java	2016-04-05 16:32:35.000000000 -0700
442,443c442,443
< --- old/modules/graphics/src/main/java/javafx/scene/layout/Region.java	2016-03-30 23:38:09.000000000 -0700
< +++ new/modules/graphics/src/main/java/javafx/scene/layout/Region.java	2016-03-30 23:38:08.000000000 -0700
---
> --- old/modules/graphics/src/main/java/javafx/scene/layout/Region.java	2016-04-05 16:32:36.000000000 -0700
> +++ new/modules/graphics/src/main/java/javafx/scene/layout/Region.java	2016-04-05 16:32:36.000000000 -0700
1079,1080c1079,1080
< --- old/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java	2016-03-30 23:38:10.000000000 -0700
< +++ new/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java	2016-03-30 23:38:10.000000000 -0700
---
> --- old/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java	2016-04-05 16:32:38.000000000 -0700
> +++ new/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java	2016-04-05 16:32:38.000000000 -0700
1092,1093c1092,1093
< --- old/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java	2016-03-30 23:38:11.000000000 -0700
< +++ new/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java	2016-03-30 23:38:11.000000000 -0700
---
> --- old/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java	2016-04-05 16:32:39.000000000 -0700
> +++ new/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java	2016-04-05 16:32:39.000000000 -0700
1171,1172c1171,1172
< --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java	2016-03-30 23:38:13.000000000 -0700
< +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java	2016-03-30 23:38:13.000000000 -0700
---
> --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java	2016-04-05 16:32:40.000000000 -0700
> +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java	2016-04-05 16:32:40.000000000 -0700
1313,1314c1313,1314
< --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java	2016-03-30 23:38:14.000000000 -0700
< +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java	2016-03-30 23:38:14.000000000 -0700
---
> --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java	2016-04-05 16:32:41.000000000 -0700
> +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java	2016-04-05 16:32:41.000000000 -0700
1332,1333c1332,1333
< --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java	2016-03-30 23:38:15.000000000 -0700
< +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java	2016-03-30 23:38:15.000000000 -0700
---
> --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java	2016-04-05 16:32:43.000000000 -0700
> +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java	2016-04-05 16:32:42.000000000 -0700
1366,1367c1366,1367
< --- old/modules/controls/src/main/java/javafx/scene/chart/Chart.java	2016-03-30 23:38:16.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/chart/Chart.java	2016-03-30 23:38:16.000000000 -0700
---
> --- old/modules/controls/src/main/java/javafx/scene/chart/Chart.java	2016-04-05 16:32:44.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/chart/Chart.java	2016-04-05 16:32:44.000000000 -0700
1449,1450c1449,1450
< --- old/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	2016-03-30 23:38:17.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	2016-03-30 23:38:17.000000000 -0700
---
> --- old/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	2016-04-05 16:32:45.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	2016-04-05 16:32:45.000000000 -0700
1477,1478c1477,1478
< --- old/modules/controls/src/main/java/javafx/scene/control/Control.java	2016-03-30 23:38:19.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/control/Control.java	2016-03-30 23:38:19.000000000 -0700
---
> --- old/modules/controls/src/main/java/javafx/scene/control/Control.java	2016-04-05 16:32:46.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/control/Control.java	2016-04-05 16:32:46.000000000 -0700
1490,1491c1490,1491
< --- old/modules/controls/src/main/java/javafx/scene/control/DialogPane.java	2016-03-30 23:38:20.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/control/DialogPane.java	2016-03-30 23:38:20.000000000 -0700
---
> --- old/modules/controls/src/main/java/javafx/scene/control/DialogPane.java	2016-04-05 16:32:47.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/control/DialogPane.java	2016-04-05 16:32:47.000000000 -0700
1528,1529c1528,1529
< --- old/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java	2016-03-30 23:38:22.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java	2016-03-30 23:38:22.000000000 -0700
---
> --- old/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java	2016-04-05 16:32:49.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java	2016-04-05 16:32:48.000000000 -0700
1541,1542c1541,1542
< --- old/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java	2016-03-30 23:38:23.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java	2016-03-30 23:38:23.000000000 -0700
---
> --- old/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java	2016-04-05 16:32:50.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java	2016-04-05 16:32:50.000000000 -0700
1566,1567c1566,1567
< --- old/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java	2016-03-30 23:38:25.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java	2016-03-30 23:38:24.000000000 -0700
---
> --- old/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java	2016-04-05 16:32:51.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java	2016-04-05 16:32:51.000000000 -0700
1600,1601c1600,1601
< --- old/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java	2016-03-30 23:38:26.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java	2016-03-30 23:38:26.000000000 -0700
---
> --- old/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java	2016-04-05 16:32:52.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java	2016-04-05 16:32:52.000000000 -0700
1616,1618c1616,1618
< --- old/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java	2016-03-30 23:38:27.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java	2016-03-30 23:38:27.000000000 -0700
< @@ -361,7 +361,7 @@
---
> --- old/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java	2016-04-05 16:32:53.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java	2016-04-05 16:32:53.000000000 -0700
> @@ -363,7 +363,7 @@
1627,1628c1627,1628
< --- old/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java	2016-03-30 23:38:28.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java	2016-03-30 23:38:28.000000000 -0700
---
> --- old/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java	2016-04-05 16:32:55.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java	2016-04-05 16:32:55.000000000 -0700
1652,1654c1652,1654
< --- old/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java	2016-03-30 23:38:29.000000000 -0700
< +++ new/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java	2016-03-30 23:38:29.000000000 -0700
< @@ -1848,9 +1848,9 @@
---
> --- old/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java	2016-04-05 16:32:56.000000000 -0700
> +++ new/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java	2016-04-05 16:32:56.000000000 -0700
> @@ -1825,9 +1825,9 @@
1666c1666
< @@ -2239,8 +2239,8 @@
---
> @@ -2216,8 +2216,8 @@
1677c1677
< @@ -2431,8 +2431,8 @@
---
> @@ -2408,8 +2408,8 @@
1688,1689c1688,1689
< --- old/modules/graphics/src/main/java/com/sun/glass/events/WindowEvent.java	2016-03-30 23:38:30.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/events/WindowEvent.java	2016-03-30 23:38:30.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/events/WindowEvent.java	2016-04-05 16:32:58.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/events/WindowEvent.java	2016-04-05 16:32:57.000000000 -0700
1707,1708c1707,1708
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/Application.java	2016-03-30 23:38:32.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Application.java	2016-03-30 23:38:31.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/Application.java	2016-04-05 16:32:59.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Application.java	2016-04-05 16:32:59.000000000 -0700
1739,1740c1739,1740
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/Pixels.java	2016-03-30 23:38:33.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Pixels.java	2016-03-30 23:38:33.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/Pixels.java	2016-04-05 16:33:00.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Pixels.java	2016-04-05 16:33:00.000000000 -0700
1807,1808c1807,1808
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java	2016-03-30 23:38:34.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java	2016-03-30 23:38:34.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java	2016-04-05 16:33:01.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java	2016-04-05 16:33:01.000000000 -0700
2056,2057c2056,2057
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/Window.java	2016-03-30 23:38:35.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Window.java	2016-03-30 23:38:35.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/Window.java	2016-04-05 16:33:02.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Window.java	2016-04-05 16:33:02.000000000 -0700
2183,2184c2183,2184
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java	2016-03-30 23:38:37.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java	2016-03-30 23:38:37.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java	2016-04-05 16:33:03.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java	2016-04-05 16:33:03.000000000 -0700
2196,2197c2196,2197
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkPixels.java	2016-03-30 23:38:38.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkPixels.java	2016-03-30 23:38:38.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkPixels.java	2016-04-05 16:33:05.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkPixels.java	2016-04-05 16:33:04.000000000 -0700
2209,2210c2209,2210
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java	2016-03-30 23:38:40.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java	2016-03-30 23:38:39.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java	2016-04-05 16:33:06.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java	2016-04-05 16:33:06.000000000 -0700
2222,2223c2222,2223
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosPixels.java	2016-03-30 23:38:41.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosPixels.java	2016-03-30 23:38:41.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosPixels.java	2016-04-05 16:33:07.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosPixels.java	2016-04-05 16:33:07.000000000 -0700
2235,2236c2235,2236
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java	2016-03-30 23:38:42.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java	2016-03-30 23:38:42.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java	2016-04-05 16:33:08.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java	2016-04-05 16:33:08.000000000 -0700
2248,2249c2248,2249
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensPixels.java	2016-03-30 23:38:44.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensPixels.java	2016-03-30 23:38:43.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensPixels.java	2016-04-05 16:33:09.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensPixels.java	2016-04-05 16:33:09.000000000 -0700
2261,2262c2261,2262
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java	2016-03-30 23:38:45.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java	2016-03-30 23:38:45.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java	2016-04-05 16:33:11.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java	2016-04-05 16:33:10.000000000 -0700
2274,2275c2274,2275
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacPixels.java	2016-03-30 23:38:46.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacPixels.java	2016-03-30 23:38:46.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacPixels.java	2016-04-05 16:33:12.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacPixels.java	2016-04-05 16:33:12.000000000 -0700
2287,2288c2287,2288
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacView.java	2016-03-30 23:38:47.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacView.java	2016-03-30 23:38:47.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacView.java	2016-04-05 16:33:13.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacView.java	2016-04-05 16:33:13.000000000 -0700
2356,2357c2356,2357
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java	2016-03-30 23:38:48.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java	2016-03-30 23:38:48.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java	2016-04-05 16:33:15.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java	2016-04-05 16:33:14.000000000 -0700
2423,2424c2423,2424
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java	2016-03-30 23:38:50.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java	2016-03-30 23:38:50.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java	2016-04-05 16:33:16.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java	2016-04-05 16:33:16.000000000 -0700
2501,2502c2501,2502
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonoclePixels.java	2016-03-30 23:38:51.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonoclePixels.java	2016-03-30 23:38:51.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonoclePixels.java	2016-04-05 16:33:17.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonoclePixels.java	2016-04-05 16:33:17.000000000 -0700
2514,2515c2514,2515
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java	2016-03-30 23:38:52.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java	2016-03-30 23:38:52.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java	2016-04-05 16:33:18.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java	2016-04-05 16:33:18.000000000 -0700
2582,2583c2582,2583
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinPixels.java	2016-03-30 23:38:54.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinPixels.java	2016-03-30 23:38:53.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinPixels.java	2016-04-05 16:33:20.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinPixels.java	2016-04-05 16:33:19.000000000 -0700
2595,2596c2595,2596
< --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java	2016-03-30 23:38:55.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java	2016-03-30 23:38:55.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java	2016-04-05 16:33:21.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java	2016-04-05 16:33:21.000000000 -0700
2617,2618c2617,2618
< --- old/modules/graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java	2016-03-30 23:38:56.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java	2016-03-30 23:38:56.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java	2016-04-05 16:33:22.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java	2016-04-05 16:33:22.000000000 -0700
2628,2629c2628,2629
< --- old/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	2016-03-30 23:38:57.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	2016-03-30 23:38:57.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	2016-04-05 16:33:23.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	2016-04-05 16:33:23.000000000 -0700
2649,2650c2649,2650
< --- old/modules/graphics/src/main/java/com/sun/javafx/sg/prism/CacheFilter.java	2016-03-30 23:38:59.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/sg/prism/CacheFilter.java	2016-03-30 23:38:59.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/sg/prism/CacheFilter.java	2016-04-05 16:33:24.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/sg/prism/CacheFilter.java	2016-04-05 16:33:24.000000000 -0700
2694,2695c2694,2695
< --- old/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java	2016-03-30 23:39:00.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java	2016-03-30 23:39:00.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java	2016-04-05 16:33:26.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java	2016-04-05 16:33:26.000000000 -0700
2717,2718c2717,2718
< --- old/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java	2016-03-30 23:39:01.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java	2016-03-30 23:39:01.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java	2016-04-05 16:33:27.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java	2016-04-05 16:33:27.000000000 -0700
2745,2746c2745,2746
< --- old/modules/graphics/src/main/java/com/sun/javafx/stage/WindowPeerListener.java	2016-03-30 23:39:03.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/stage/WindowPeerListener.java	2016-03-30 23:39:02.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/stage/WindowPeerListener.java	2016-04-05 16:33:29.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/stage/WindowPeerListener.java	2016-04-05 16:33:29.000000000 -0700
2759,2760c2759,2760
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/AppletWindow.java	2016-03-30 23:39:04.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/AppletWindow.java	2016-03-30 23:39:04.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/AppletWindow.java	2016-04-05 16:33:30.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/AppletWindow.java	2016-04-05 16:33:30.000000000 -0700
2771,2772c2771,2772
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java	2016-03-30 23:39:05.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java	2016-03-30 23:39:05.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java	2016-04-05 16:33:31.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java	2016-04-05 16:33:31.000000000 -0700
2782,2783c2782,2783
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java	2016-03-30 23:39:07.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java	2016-03-30 23:39:06.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java	2016-04-05 16:33:32.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java	2016-04-05 16:33:32.000000000 -0700
2806,2807c2806,2807
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/TKStageListener.java	2016-03-30 23:39:08.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/TKStageListener.java	2016-03-30 23:39:07.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/TKStageListener.java	2016-04-05 16:33:33.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/TKStageListener.java	2016-04-05 16:33:33.000000000 -0700
2823,2824c2823,2824
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java	2016-03-30 23:39:09.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java	2016-03-30 23:39:09.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java	2016-04-05 16:33:34.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java	2016-04-05 16:33:34.000000000 -0700
2897,2898c2897,2898
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java	2016-03-30 23:39:10.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java	2016-03-30 23:39:10.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java	2016-04-05 16:33:35.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java	2016-04-05 16:33:35.000000000 -0700
2954,2955c2954,2955
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedState.java	2016-03-30 23:39:11.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedState.java	2016-03-30 23:39:11.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedState.java	2016-04-05 16:33:37.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedState.java	2016-04-05 16:33:36.000000000 -0700
2968,2969c2968,2969
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java	2016-03-30 23:39:12.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java	2016-03-30 23:39:12.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java	2016-04-05 16:33:38.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java	2016-04-05 16:33:37.000000000 -0700
2992,2993c2992,2993
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java	2016-03-30 23:39:13.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java	2016-03-30 23:39:13.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java	2016-04-05 16:33:39.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java	2016-04-05 16:33:38.000000000 -0700
3073,3074c3073,3074
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java	2016-03-30 23:39:15.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java	2016-03-30 23:39:14.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java	2016-04-05 16:33:40.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java	2016-04-05 16:33:40.000000000 -0700
3264,3265c3264,3265
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassWindowEventHandler.java	2016-03-30 23:39:16.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassWindowEventHandler.java	2016-03-30 23:39:16.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassWindowEventHandler.java	2016-04-05 16:33:41.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassWindowEventHandler.java	2016-04-05 16:33:41.000000000 -0700
3327,3328c3327,3328
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java	2016-03-30 23:39:17.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java	2016-03-30 23:39:17.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java	2016-04-05 16:33:42.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java	2016-04-05 16:33:42.000000000 -0700
3366,3367c3366,3367
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java	2016-03-30 23:39:18.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java	2016-03-30 23:39:18.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java	2016-04-05 16:33:43.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java	2016-04-05 16:33:43.000000000 -0700
3449,3450c3449,3450
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewPainter.java	2016-03-30 23:39:19.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewPainter.java	2016-03-30 23:39:19.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewPainter.java	2016-04-05 16:33:44.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewPainter.java	2016-04-05 16:33:44.000000000 -0700
3517,3518c3517,3518
< --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java	2016-03-30 23:39:21.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java	2016-03-30 23:39:20.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java	2016-04-05 16:33:45.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java	2016-04-05 16:33:45.000000000 -0700
3680,3681c3680,3681
< --- old/modules/graphics/src/main/java/com/sun/prism/Graphics.java	2016-03-30 23:39:22.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/Graphics.java	2016-03-30 23:39:22.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/Graphics.java	2016-04-05 16:33:46.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/Graphics.java	2016-04-05 16:33:46.000000000 -0700
3692,3693c3692,3693
< --- old/modules/graphics/src/main/java/com/sun/prism/Presentable.java	2016-03-30 23:39:23.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/Presentable.java	2016-03-30 23:39:23.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/Presentable.java	2016-04-05 16:33:48.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/Presentable.java	2016-04-05 16:33:47.000000000 -0700
3702,3703c3702,3703
< --- old/modules/graphics/src/main/java/com/sun/prism/PresentableState.java	2016-03-30 23:39:24.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/PresentableState.java	2016-03-30 23:39:24.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/PresentableState.java	2016-04-05 16:33:49.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/PresentableState.java	2016-04-05 16:33:48.000000000 -0700
3800,3801c3800,3801
< --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DContext.java	2016-03-30 23:39:25.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DContext.java	2016-03-30 23:39:25.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DContext.java	2016-04-05 16:33:50.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DContext.java	2016-04-05 16:33:50.000000000 -0700
3829,3830c3829,3830
< --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java	2016-03-30 23:39:26.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java	2016-03-30 23:39:26.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java	2016-04-05 16:33:51.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java	2016-04-05 16:33:51.000000000 -0700
3840,3841c3840,3841
< --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DSwapChain.java	2016-03-30 23:39:27.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DSwapChain.java	2016-03-30 23:39:27.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DSwapChain.java	2016-04-05 16:33:52.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DSwapChain.java	2016-04-05 16:33:52.000000000 -0700
3896,3897c3896,3897
< --- old/modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java	2016-03-30 23:39:29.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java	2016-03-30 23:39:28.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java	2016-04-05 16:33:53.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java	2016-04-05 16:33:53.000000000 -0700
3926,3927c3926,3927
< --- old/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java	2016-03-30 23:39:30.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java	2016-03-30 23:39:30.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java	2016-04-05 16:33:54.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java	2016-04-05 16:33:54.000000000 -0700
3986,3987c3986,3987
< --- old/modules/graphics/src/main/java/com/sun/prism/impl/BaseGraphics.java	2016-03-30 23:39:31.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/impl/BaseGraphics.java	2016-03-30 23:39:31.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/impl/BaseGraphics.java	2016-04-05 16:33:55.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/impl/BaseGraphics.java	2016-04-05 16:33:55.000000000 -0700
4022,4023c4022,4023
< --- old/modules/graphics/src/main/java/com/sun/prism/impl/QueuedPixelSource.java	2016-03-30 23:39:32.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/impl/QueuedPixelSource.java	2016-03-30 23:39:32.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/impl/QueuedPixelSource.java	2016-04-05 16:33:56.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/impl/QueuedPixelSource.java	2016-04-05 16:33:56.000000000 -0700
4057,4058c4057,4058
< --- old/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPresentable.java	2016-03-30 23:39:33.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPresentable.java	2016-03-30 23:39:33.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPresentable.java	2016-04-05 16:33:57.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPresentable.java	2016-04-05 16:33:57.000000000 -0700
4083,4084c4083,4084
< --- old/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java	2016-03-30 23:39:34.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java	2016-03-30 23:39:34.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java	2016-04-05 16:33:58.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java	2016-04-05 16:33:58.000000000 -0700
4119,4120c4119,4120
< --- old/modules/graphics/src/main/java/com/sun/prism/null3d/DummySwapChain.java	2016-03-30 23:39:35.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/null3d/DummySwapChain.java	2016-03-30 23:39:35.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/null3d/DummySwapChain.java	2016-04-05 16:33:59.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/null3d/DummySwapChain.java	2016-04-05 16:33:59.000000000 -0700
4136,4137c4136,4137
< --- old/modules/graphics/src/main/java/com/sun/prism/sw/SWGraphics.java	2016-03-30 23:39:37.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/sw/SWGraphics.java	2016-03-30 23:39:36.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/sw/SWGraphics.java	2016-04-05 16:34:01.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/sw/SWGraphics.java	2016-04-05 16:34:00.000000000 -0700
4171,4172c4171,4172
< --- old/modules/graphics/src/main/java/com/sun/prism/sw/SWPresentable.java	2016-03-30 23:39:38.000000000 -0700
< +++ new/modules/graphics/src/main/java/com/sun/prism/sw/SWPresentable.java	2016-03-30 23:39:37.000000000 -0700
---
> --- old/modules/graphics/src/main/java/com/sun/prism/sw/SWPresentable.java	2016-04-05 16:34:02.000000000 -0700
> +++ new/modules/graphics/src/main/java/com/sun/prism/sw/SWPresentable.java	2016-04-05 16:34:01.000000000 -0700
4199,4200c4199,4200
< --- old/modules/graphics/src/main/java/javafx/scene/layout/BorderPane.java	2016-03-30 23:39:39.000000000 -0700
< +++ new/modules/graphics/src/main/java/javafx/scene/layout/BorderPane.java	2016-03-30 23:39:39.000000000 -0700
---
> --- old/modules/graphics/src/main/java/javafx/scene/layout/BorderPane.java	2016-04-05 16:34:03.000000000 -0700
> +++ new/modules/graphics/src/main/java/javafx/scene/layout/BorderPane.java	2016-04-05 16:34:03.000000000 -0700
4277,4278c4277,4278
< --- old/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java	2016-03-30 23:39:40.000000000 -0700
< +++ new/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java	2016-03-30 23:39:40.000000000 -0700
---
> --- old/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java	2016-04-05 16:34:04.000000000 -0700
> +++ new/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java	2016-04-05 16:34:04.000000000 -0700
4362,4363c4362,4363
< --- old/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java	2016-03-30 23:39:41.000000000 -0700
< +++ new/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java	2016-03-30 23:39:41.000000000 -0700
---
> --- old/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java	2016-04-05 16:34:05.000000000 -0700
> +++ new/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java	2016-04-05 16:34:05.000000000 -0700
4604,4605c4604,4605
< --- old/modules/graphics/src/main/java/javafx/scene/layout/HBox.java	2016-03-30 23:39:42.000000000 -0700
< +++ new/modules/graphics/src/main/java/javafx/scene/layout/HBox.java	2016-03-30 23:39:42.000000000 -0700
---
> --- old/modules/graphics/src/main/java/javafx/scene/layout/HBox.java	2016-04-05 16:34:06.000000000 -0700
> +++ new/modules/graphics/src/main/java/javafx/scene/layout/HBox.java	2016-04-05 16:34:06.000000000 -0700
4711,4712c4711,4712
< --- old/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java	2016-03-30 23:39:44.000000000 -0700
< +++ new/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java	2016-03-30 23:39:44.000000000 -0700
---
> --- old/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java	2016-04-05 16:34:07.000000000 -0700
> +++ new/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java	2016-04-05 16:34:07.000000000 -0700
4820,4821c4820,4821
< --- old/modules/graphics/src/main/java/javafx/scene/layout/VBox.java	2016-03-30 23:39:45.000000000 -0700
< +++ new/modules/graphics/src/main/java/javafx/scene/layout/VBox.java	2016-03-30 23:39:45.000000000 -0700
---
> --- old/modules/graphics/src/main/java/javafx/scene/layout/VBox.java	2016-04-05 16:34:09.000000000 -0700
> +++ new/modules/graphics/src/main/java/javafx/scene/layout/VBox.java	2016-04-05 16:34:08.000000000 -0700
4919,4920c4919,4920
< --- old/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java	2016-03-30 23:39:47.000000000 -0700
< +++ new/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java	2016-03-30 23:39:47.000000000 -0700
---
> --- old/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java	2016-04-05 16:34:10.000000000 -0700
> +++ new/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java	2016-04-05 16:34:09.000000000 -0700
5013,5015c5013,5015
< --- old/modules/graphics/src/main/native-font/fontpath.c	2016-03-30 23:39:48.000000000 -0700
< +++ new/modules/graphics/src/main/native-font/fontpath.c	2016-03-30 23:39:48.000000000 -0700
< @@ -735,15 +735,19 @@
---
> --- old/modules/graphics/src/main/native-font/fontpath.c	2016-04-05 16:34:11.000000000 -0700
> +++ new/modules/graphics/src/main/native-font/fontpath.c	2016-04-05 16:34:11.000000000 -0700
> @@ -735,15 +735,20 @@
5031c5031,5032
< +        return (-ncmetrics.lfMessageFont.lfHeight) * 96.0f / dpiY;
---
> +        return (-ncmetrics.lfMessageFont.lfHeight)
> +             * ((float) USER_DEFAULT_SCREEN_DPI) / dpiY;
5038,5039c5039,5040
< --- old/modules/graphics/src/main/native-glass/gtk/glass_general.cpp	2016-03-30 23:39:50.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/gtk/glass_general.cpp	2016-03-30 23:39:49.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/gtk/glass_general.cpp	2016-04-05 16:34:12.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/gtk/glass_general.cpp	2016-04-05 16:34:12.000000000 -0700
5049,5050c5050,5051
< --- old/modules/graphics/src/main/native-glass/gtk/glass_screen.cpp	2016-03-30 23:39:51.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/gtk/glass_screen.cpp	2016-03-30 23:39:51.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/gtk/glass_screen.cpp	2016-04-05 16:34:13.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/gtk/glass_screen.cpp	2016-04-05 16:34:13.000000000 -0700
5072,5073c5073,5074
< --- old/modules/graphics/src/main/native-glass/ios/GlassScreen.m	2016-03-30 23:39:52.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/ios/GlassScreen.m	2016-03-30 23:39:52.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/ios/GlassScreen.m	2016-04-05 16:34:14.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/ios/GlassScreen.m	2016-04-05 16:34:14.000000000 -0700
5107,5108c5108,5109
< --- old/modules/graphics/src/main/native-glass/lens/LensScreen.c	2016-03-30 23:39:54.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/lens/LensScreen.c	2016-03-30 23:39:53.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/lens/LensScreen.c	2016-04-05 16:34:15.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/lens/LensScreen.c	2016-04-05 16:34:15.000000000 -0700
5139,5140c5140,5141
< --- old/modules/graphics/src/main/native-glass/mac/GlassApplication.m	2016-03-30 23:39:55.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/mac/GlassApplication.m	2016-03-30 23:39:55.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/mac/GlassApplication.m	2016-04-05 16:34:16.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/mac/GlassApplication.m	2016-04-05 16:34:16.000000000 -0700
5150,5151c5151,5152
< --- old/modules/graphics/src/main/native-glass/mac/GlassRobot.m	2016-03-30 23:39:56.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/mac/GlassRobot.m	2016-03-30 23:39:56.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/mac/GlassRobot.m	2016-04-05 16:34:17.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/mac/GlassRobot.m	2016-04-05 16:34:17.000000000 -0700
5161,5162c5162,5163
< --- old/modules/graphics/src/main/native-glass/mac/GlassScreen.m	2016-03-30 23:39:57.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/mac/GlassScreen.m	2016-03-30 23:39:57.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/mac/GlassScreen.m	2016-04-05 16:34:18.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/mac/GlassScreen.m	2016-04-05 16:34:18.000000000 -0700
5202,5203c5203,5204
< --- old/modules/graphics/src/main/native-glass/mac/GlassView.h	2016-03-30 23:39:58.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/mac/GlassView.h	2016-03-30 23:39:58.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/mac/GlassView.h	2016-04-05 16:34:19.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/mac/GlassView.h	2016-04-05 16:34:19.000000000 -0700
5213,5214c5214,5215
< --- old/modules/graphics/src/main/native-glass/mac/GlassView.m	2016-03-30 23:39:59.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/mac/GlassView.m	2016-03-30 23:39:59.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/mac/GlassView.m	2016-04-05 16:34:20.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/mac/GlassView.m	2016-04-05 16:34:20.000000000 -0700
5269,5270c5270,5271
< --- old/modules/graphics/src/main/native-glass/mac/GlassView2D.m	2016-03-30 23:40:01.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/mac/GlassView2D.m	2016-03-30 23:40:01.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/mac/GlassView2D.m	2016-04-05 16:34:21.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/mac/GlassView2D.m	2016-04-05 16:34:21.000000000 -0700
5289,5290c5290,5291
< --- old/modules/graphics/src/main/native-glass/mac/GlassView3D.m	2016-03-30 23:40:02.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/mac/GlassView3D.m	2016-03-30 23:40:02.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/mac/GlassView3D.m	2016-04-05 16:34:22.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/mac/GlassView3D.m	2016-04-05 16:34:22.000000000 -0700
5311,5312c5312,5313
< --- old/modules/graphics/src/main/native-glass/mac/GlassWindow.m	2016-03-30 23:40:03.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/mac/GlassWindow.m	2016-03-30 23:40:03.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/mac/GlassWindow.m	2016-04-05 16:34:24.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/mac/GlassWindow.m	2016-04-05 16:34:23.000000000 -0700
5322,5323c5323,5324
< --- old/modules/graphics/src/main/native-glass/win/GlassApplication.cpp	2016-03-30 23:40:05.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/win/GlassApplication.cpp	2016-03-30 23:40:04.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/win/GlassApplication.cpp	2016-04-05 16:34:25.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/win/GlassApplication.cpp	2016-04-05 16:34:24.000000000 -0700
5349,5351c5350,5352
< --- old/modules/graphics/src/main/native-glass/win/GlassApplication.h	2016-03-30 23:40:06.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/win/GlassApplication.h	2016-03-30 23:40:05.000000000 -0700
< @@ -105,22 +105,15 @@
---
> --- old/modules/graphics/src/main/native-glass/win/GlassApplication.h	2016-04-05 16:34:26.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/win/GlassApplication.h	2016-04-05 16:34:26.000000000 -0700
> @@ -105,22 +105,17 @@
5375c5376,5378
< +        return IsUIScaleOverridden() ? overrideUIScale : dpi / 96.0f;
---
> +        return IsUIScaleOverridden()
> +            ? overrideUIScale
> +            : dpi / ((float) USER_DEFAULT_SCREEN_DPI);
5379,5380c5382,5383
< --- old/modules/graphics/src/main/native-glass/win/GlassScreen.cpp	2016-03-30 23:40:07.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/win/GlassScreen.cpp	2016-03-30 23:40:07.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/win/GlassScreen.cpp	2016-04-05 16:34:27.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/win/GlassScreen.cpp	2016-04-05 16:34:27.000000000 -0700
5510,5511c5513,5514
< --- old/modules/graphics/src/main/native-glass/win/GlassWindow.cpp	2016-03-30 23:40:08.000000000 -0700
< +++ new/modules/graphics/src/main/native-glass/win/GlassWindow.cpp	2016-03-30 23:40:08.000000000 -0700
---
> --- old/modules/graphics/src/main/native-glass/win/GlassWindow.cpp	2016-04-05 16:34:28.000000000 -0700
> +++ new/modules/graphics/src/main/native-glass/win/GlassWindow.cpp	2016-04-05 16:34:28.000000000 -0700
5528,5529c5531,5532
< +    jfloat xScale = xDPI / 96.0f;
< +    jfloat yScale = yDPI / 96.0f;
---
> +    jfloat xScale = xDPI / ((float) USER_DEFAULT_SCREEN_DPI);
> +    jfloat yScale = yDPI / ((float) USER_DEFAULT_SCREEN_DPI);
5622,5623c5625,5626
< --- old/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java	2016-03-30 23:40:09.000000000 -0700
< +++ new/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java	2016-03-30 23:40:09.000000000 -0700
---
> --- old/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java	2016-04-05 16:34:29.000000000 -0700
> +++ new/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java	2016-04-05 16:34:29.000000000 -0700
5714,5715c5717,5718
< --- old/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java	2016-03-30 23:40:10.000000000 -0700
< +++ new/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java	2016-03-30 23:40:10.000000000 -0700
---
> --- old/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java	2016-04-05 16:34:30.000000000 -0700
> +++ new/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java	2016-04-05 16:34:30.000000000 -0700
5731,5732c5734,5735
< --- old/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java	2016-03-30 23:40:11.000000000 -0700
< +++ new/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java	2016-03-30 23:40:11.000000000 -0700
---
> --- old/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java	2016-04-05 16:34:31.000000000 -0700
> +++ new/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java	2016-04-05 16:34:31.000000000 -0700
5773,5774c5776,5777
< --- old/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java	2016-03-30 23:40:12.000000000 -0700
< +++ new/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java	2016-03-30 23:40:12.000000000 -0700
---
> --- old/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java	2016-04-05 16:34:32.000000000 -0700
> +++ new/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java	2016-04-05 16:34:32.000000000 -0700
5980,5981c5983,5984
< --- old/modules/swt/src/main/java/javafx/embed/swt/FXCanvas.java	2016-03-30 23:40:13.000000000 -0700
< +++ new/modules/swt/src/main/java/javafx/embed/swt/FXCanvas.java	2016-03-30 23:40:13.000000000 -0700
---
> --- old/modules/swt/src/main/java/javafx/embed/swt/FXCanvas.java	2016-04-05 16:34:33.000000000 -0700
> +++ new/modules/swt/src/main/java/javafx/embed/swt/FXCanvas.java	2016-04-05 16:34:33.000000000 -0700
6000,6001c6003,6004
< --- old/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismGraphicsManager.java	2016-03-30 23:40:14.000000000 -0700
< +++ new/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismGraphicsManager.java	2016-03-30 23:40:14.000000000 -0700
---
> --- old/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismGraphicsManager.java	2016-04-05 16:34:34.000000000 -0700
> +++ new/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismGraphicsManager.java	2016-04-05 16:34:34.000000000 -0700
6014a6018,6035
> --- old/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java	2016-04-05 16:34:36.000000000 -0700
> +++ new/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java	2016-04-05 16:34:35.000000000 -0700
> @@ -35,6 +35,7 @@
>  import javax.swing.JMenuItem;
>  import javax.swing.JPopupMenu;
>  import javax.swing.SwingUtilities;
> +import org.junit.Ignore;
>  import org.junit.Test;
>  import test.robot.testharness.VisualTestBase;
>  
> @@ -57,6 +58,7 @@
>  
>      private volatile boolean popped;
>  
> +    @Ignore("JDK-8153542")
>      @Test(timeout=5000)
>      public void test() throws Exception {
>          runAndWait(() -> {