[8u] RFR backport of 8213119: [macos] java/awt/GraphicsDevice/CheckDisplayModes.java fails

[Verghese, Clive]

Hi Andrew,

Thank you. 

Regards,
Clive Verghese

On 12/16/19, 11:08 AM, "Andrew John Hughes" <gnu.andrew at redhat.com> wrote:

    
    
    On 06/12/2019 23:03, Verghese, Clive wrote:
    > Hi,
    > 
    > I would like to request backport of JDK-8213119 to 8u.
    > 
    > Bug: https://bugs.openjdk.java.net/browse/JDK-8213119
    > Original: https://hg.openjdk.java.net/jdk/jdk/rev/85d7af399ef5
    > Webrev: http://cr.openjdk.java.net/~alvdavi/webrevs/8213119/webrev.8u.00/
    > 
    > The patch is marked as 8u241but not yet in openjdk8u 242.
    > 
    > Patch did not apply cleanly, minor modifications were required. Other than the mismatch in Copyrights, the following hunks did not apply cleanly.
    > 
    > In file “test/java/awt/GraphicsDevice/CheckDisplayModes.java”, hunk 2 did not apply cleanly.
    > In file “macosx/native/sun/awt/CGraphicsDevice.m”, hunk 2 did not apply cleanly.
    > The test was not present in ProblemList.txt.
    > 
    > Validated that the test is running successfully.
    > 
    > Regards,
    > Clive Verghese
    > 
    
    I see some odd whitespace differences between this patch and the 11u
    version:
    
    @@ -26,7 +25,7 @@
     -        if (thisBpp != bpp || (int)CGDisplayModeGetHeight(cRef) != h
    || (int)CGDisplayModeGetWidth(cRef) != w) {
     +        int thisH = (int)CGDisplayModeGetHeight(cRef);
     +        int thisW = (int)CGDisplayModeGetWidth(cRef);
    -+        if (thisBpp != bpp || thisH != h || thisW != w) {
    ++        if (thisBpp != bpp || thisH != h || thisW != w) {
                  // One of the key parameters does not match
                  continue;
              }
    
    so instead I did a clean backport and pushed that:
    
    https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/8e8e54a1f0e3
    
    Thanks,
    -- 
    Andrew :)
    
    Senior Free Java Software Engineer
    Red Hat, Inc. (http://www.redhat.com)
    
    PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
    Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222
    https://keybase.io/gnu_andrew