hg: valhalla/valhalla: Merge
david.simms at oracle.com
david.simms at oracle.com
Fri Oct 20 14:23:27 UTC 2017
Changeset: 3cba963b417f
Author: dsimms
Date: 2017-10-20 16:06 +0200
URL: http://hg.openjdk.java.net/valhalla/valhalla/rev/3cba963b417f
Merge
- make/hotspot/copy/Copy-java.base.gmk
- make/jdk/src/classes/build/tools/generatenimbus/ObjectFactory.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java
- src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp
- src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h
- src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/AlternateSubstSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/AnchorTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/AnchorTables.h
- src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/ArabicLayoutEngine.h
- src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.cpp
- src/java.desktop/share/native/libfontmanager/layout/ArabicShaping.h
- src/java.desktop/share/native/libfontmanager/layout/AttachmentPosnSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/CanonData.cpp
- src/java.desktop/share/native/libfontmanager/layout/CanonShaping.cpp
- src/java.desktop/share/native/libfontmanager/layout/CanonShaping.h
- src/java.desktop/share/native/libfontmanager/layout/CharSubstitutionFilter.h
- src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/ClassDefinitionTables.h
- src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertion.h
- src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.cpp
- src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphInsertionProc2.h
- src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.cpp
- src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc.h
- src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.cpp
- src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstProc2.h
- src/java.desktop/share/native/libfontmanager/layout/ContextualGlyphSubstitution.h
- src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/ContextualSubstSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/CoverageTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/CoverageTables.h
- src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/CursiveAttachmentSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/DefaultCharMapper.h
- src/java.desktop/share/native/libfontmanager/layout/DeviceTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/DeviceTables.h
- src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/ExtensionSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/Features.cpp
- src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.cpp
- src/java.desktop/share/native/libfontmanager/layout/GDEFMarkFilter.h
- src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.h
- src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp
- src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.h
- src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/GlyphDefinitionTables.h
- src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.cpp
- src/java.desktop/share/native/libfontmanager/layout/GlyphIterator.h
- src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/GlyphLookupTables.h
- src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.cpp
- src/java.desktop/share/native/libfontmanager/layout/GlyphPositionAdjustments.h
- src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/GlyphPositioningTables.h
- src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.cpp
- src/java.desktop/share/native/libfontmanager/layout/GlyphPosnLookupProc.h
- src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.cpp
- src/java.desktop/share/native/libfontmanager/layout/GlyphSubstLookupProc.h
- src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/GlyphSubstitutionTables.h
- src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/HanLayoutEngine.h
- src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/HangulLayoutEngine.h
- src/java.desktop/share/native/libfontmanager/layout/ICUFeatures.h
- src/java.desktop/share/native/libfontmanager/layout/IndicClassTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/IndicLayoutEngine.h
- src/java.desktop/share/native/libfontmanager/layout/IndicRearrangement.h
- src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.cpp
- src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.h
- src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.cpp
- src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.h
- src/java.desktop/share/native/libfontmanager/layout/IndicReordering.cpp
- src/java.desktop/share/native/libfontmanager/layout/IndicReordering.h
- src/java.desktop/share/native/libfontmanager/layout/KernTable.cpp
- src/java.desktop/share/native/libfontmanager/layout/KernTable.h
- src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/KhmerLayoutEngine.h
- src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.cpp
- src/java.desktop/share/native/libfontmanager/layout/KhmerReordering.h
- src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.cpp
- src/java.desktop/share/native/libfontmanager/layout/LEFontInstance.h
- src/java.desktop/share/native/libfontmanager/layout/LEGlyphFilter.h
- src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.cpp
- src/java.desktop/share/native/libfontmanager/layout/LEGlyphStorage.h
- src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.cpp
- src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h
- src/java.desktop/share/native/libfontmanager/layout/LELanguages.h
- src/java.desktop/share/native/libfontmanager/layout/LEScripts.h
- src/java.desktop/share/native/libfontmanager/layout/LEStandalone.h
- src/java.desktop/share/native/libfontmanager/layout/LESwaps.h
- src/java.desktop/share/native/libfontmanager/layout/LETableReference.h
- src/java.desktop/share/native/libfontmanager/layout/LETypes.h
- src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/LayoutEngine.h
- src/java.desktop/share/native/libfontmanager/layout/LayoutTables.h
- src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp
- src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.h
- src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp
- src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.h
- src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/LigatureSubstSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/LigatureSubstitution.h
- src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp
- src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.h
- src/java.desktop/share/native/libfontmanager/layout/LookupTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/LookupTables.h
- src/java.desktop/share/native/libfontmanager/layout/Lookups.cpp
- src/java.desktop/share/native/libfontmanager/layout/Lookups.h
- src/java.desktop/share/native/libfontmanager/layout/MPreFixups.cpp
- src/java.desktop/share/native/libfontmanager/layout/MPreFixups.h
- src/java.desktop/share/native/libfontmanager/layout/MarkArrays.cpp
- src/java.desktop/share/native/libfontmanager/layout/MarkArrays.h
- src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/MarkToBasePosnSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/MarkToLigaturePosnSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/MarkToMarkPosnSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/MirroredCharData.cpp
- src/java.desktop/share/native/libfontmanager/layout/MorphStateTables.h
- src/java.desktop/share/native/libfontmanager/layout/MorphTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/MorphTables.h
- src/java.desktop/share/native/libfontmanager/layout/MorphTables2.cpp
- src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/MultipleSubstSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubst.h
- src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.cpp
- src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc.h
- src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.cpp
- src/java.desktop/share/native/libfontmanager/layout/NonContextualGlyphSubstProc2.h
- src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/OpenTypeLayoutEngine.h
- src/java.desktop/share/native/libfontmanager/layout/OpenTypeTables.h
- src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.cpp
- src/java.desktop/share/native/libfontmanager/layout/OpenTypeUtilities.h
- src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/PairPositioningSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.cpp
- src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguage.h
- src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.cpp
- src/java.desktop/share/native/libfontmanager/layout/ScriptAndLanguageTags.h
- src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.cpp
- src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor.h
- src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.cpp
- src/java.desktop/share/native/libfontmanager/layout/SegmentArrayProcessor2.h
- src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.cpp
- src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor.h
- src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.cpp
- src/java.desktop/share/native/libfontmanager/layout/SegmentSingleProcessor2.h
- src/java.desktop/share/native/libfontmanager/layout/ShapingTypeData.cpp
- src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.cpp
- src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor.h
- src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.cpp
- src/java.desktop/share/native/libfontmanager/layout/SimpleArrayProcessor2.h
- src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/SinglePositioningSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.cpp
- src/java.desktop/share/native/libfontmanager/layout/SingleSubstitutionSubtables.h
- src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.cpp
- src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor.h
- src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.cpp
- src/java.desktop/share/native/libfontmanager/layout/SingleTableProcessor2.h
- src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.cpp
- src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor.h
- src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.cpp
- src/java.desktop/share/native/libfontmanager/layout/StateTableProcessor2.h
- src/java.desktop/share/native/libfontmanager/layout/StateTables.h
- src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.cpp
- src/java.desktop/share/native/libfontmanager/layout/SubstitutionLookups.h
- src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.cpp
- src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor.h
- src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.cpp
- src/java.desktop/share/native/libfontmanager/layout/SubtableProcessor2.h
- src/java.desktop/share/native/libfontmanager/layout/SunLayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/ThaiLayoutEngine.h
- src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.cpp
- src/java.desktop/share/native/libfontmanager/layout/ThaiShaping.h
- src/java.desktop/share/native/libfontmanager/layout/ThaiStateTables.cpp
- src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.cpp
- src/java.desktop/share/native/libfontmanager/layout/TibetanLayoutEngine.h
- src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.cpp
- src/java.desktop/share/native/libfontmanager/layout/TibetanReordering.h
- src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.cpp
- src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor.h
- src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.cpp
- src/java.desktop/share/native/libfontmanager/layout/TrimmedArrayProcessor2.h
- src/java.desktop/share/native/libfontmanager/layout/ValueRecords.cpp
- src/java.desktop/share/native/libfontmanager/layout/ValueRecords.h
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
! src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java
- src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java
- src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java
- test/jdk/javax/swing/JTabbedPane/4310381/bug4310381.html
- test/langtools/tools/javac/lib/combo/ReusableContext.java
More information about the valhalla-dev
mailing list