@@ -638,10 +638,10 @@ const get_scr_orientation = (METRIC) => new Promise(resolve => {
638638 // NOTE: a screen.orientation.addEventListener('change'.. event
639639 // does not detect css changes, but a resize event does, which
640640 // is the only one we use, so treat css as truthy
641- let oData = { 'screen ' : { } , 'window' : { } } , oDisplay = { } , lieCount = 0
641+ let oData = { 'device ' : { } , 'window' : { } } , oDisplay = { }
642642 // matchmedia: sorted names
643643 let oTests = {
644- 'screen ' : { '-moz-device-orientation' : '#cssOm' , 'device-aspect-ratio' : '#cssDAR' } ,
644+ 'device ' : { '-moz-device-orientation' : '#cssOm' , 'device-aspect-ratio' : '#cssDAR' } ,
645645 'window' : { 'aspect-ratio' : '#cssAR' , 'orientation' : '#cssO' }
646646 }
647647 let l = 'landscape' , p = 'portrait' , q = '(orientation: ' , s = 'square' , a = 'aspect-ratio'
@@ -669,7 +669,7 @@ const get_scr_orientation = (METRIC) => new Promise(resolve => {
669669 if ( runST ) { value = undefined } else if ( runSL ) { value += '_fake' }
670670 if ( value == undefined ) { throw zErrType + 'undefined' } // we expect values (in gecko)
671671 } catch ( e ) {
672- log_error ( 1 , METRIC + '_' + item , e )
672+ log_error ( 1 , METRIC + '_' + type + '_' + item , e )
673673 value = zErr
674674 isErr = true
675675 }
@@ -680,17 +680,17 @@ const get_scr_orientation = (METRIC) => new Promise(resolve => {
680680 let isLies = ( ! isErr && ! isErrCss && value !== cssvalue )
681681 oDisplay [ METRIC + '_' + item ] = { 'value' : value , 'lies' : isLies }
682682 if ( isSmart && isLies ) {
683- log_known ( 1 , METRIC + '_' + item , value )
683+ log_known ( 1 , METRIC + '_' + type + '_' + item , value )
684684 value = zLIE
685- lieCount ++
686685 }
687686 oData [ type ] [ item ] = value
688687 oData [ type ] [ cssitem ] = cssvalue
689688 }
690689 }
691- // try and get a valid css value
692- let check = oData . screen [ '-moz-device-orientation_css' ]
693- if ( zErr == check ) { check = oData . screen [ 'device-aspect-ratio_css' ] }
690+
691+ // device: try and get a valid css value
692+ let check = oData . device [ '-moz-device-orientation_css' ]
693+ if ( zErr == check ) { check = oData . device [ 'device-aspect-ratio_css' ] }
694694 if ( 'square' == check ) { check = 'portrait' }
695695
696696 // screen
@@ -720,50 +720,51 @@ const get_scr_orientation = (METRIC) => new Promise(resolve => {
720720 // check mozOrientation + .type matches css
721721 // note: we can't check the angle, it could be anything - see Piero tablet tests
722722 if ( 'string' == expected && value . split ( '-' ) [ 0 ] !== check ) {
723- log_known ( 1 , METRIC + '_ ' + item , value )
723+ log_known ( 1 , METRIC + '_device_ ' + item , value )
724724 isLies = true
725- lieCount ++
726725 }
727726 }
728727 } catch ( e ) {
729- log_error ( 1 , METRIC + '_ ' + item , e )
728+ log_error ( 1 , METRIC + '_device_ ' + item , e )
730729 value = zErr
731730 }
732731 oDisplay [ METRIC + '_' + item ] = { 'value' : value , 'lies' : isLies }
733- oData [ 'screen ' ] [ item ] = isLies ? zLIE : value
732+ oData [ 'device ' ] [ item ] = isLies ? zLIE : value
734733 } )
735734
736735 // https://searchfox.org/mozilla-central/source/testing/web-platform/tests/screen-orientation/orientation-reading.html
737736 // see expectedAnglesLandscape + expectedAnglesPortrait
738- // harden
739- // ToDo: 2 x css match | 2 x matchmedia match | 2 x mozOrientation + .type match
740- // this is done with aGood below, but for non-RFP, we could check
741- // and update oDisplay and oData and lieCount
742-
743- for ( const k of Object . keys ( oDisplay ) ) {
744- addDisplay ( 1 , k , oDisplay [ k ] [ 'value' ] , '' , '' , oDisplay [ k ] [ 'lies' ] )
737+ // display, data
738+ for ( const k of Object . keys ( oDisplay ) ) { addDisplay ( 1 , k , oDisplay [ k ] [ 'value' ] , '' , '' , oDisplay [ k ] [ 'lies' ] ) }
739+ for ( const k of Object . keys ( oData ) ) {
740+ // objects are already sorted
741+ let data = oData [ k ]
742+ let hash = mini ( data )
743+ addData ( 1 , METRIC + '_' + k , oData [ k ] , hash )
744+ if ( 'device' == k ) {
745+ // device health check
746+ // FF132+: 1607032 + 1918202 | FF133+: 1922204 | backported to BB
747+ // RFP is always primary | on android the angle of 0 vs 90 is reversed
748+
749+ // type | angle | orientation (css) + aspect ratio (css)
750+ let oGood = {
751+ 'a1de035c' : 'landscape-primary | 0 | landscape' ,
752+ 'ccc8dc6d' : 'portrait-primary | 90 | portrait' ,
753+ 'fb6084ad' : 'portrait-primary | 90 | portrait | square' ,
754+ }
755+ if ( 'android' == isOS ) {
756+ oGood = {
757+ '813838a9' : 'landscape-primary | 90 | landscape' ,
758+ '360dd99a' : 'portrait-primary | 0 | portrait' ,
759+ 'fdc0295a' : 'portrait-primary | 0 | portrait | square' ,
760+ }
761+ }
762+ let display = undefined !== oGood [ hash ] ? oGood [ hash ] : hash
763+ addDisplay ( 1 , METRIC + '_' + k + '_summary' , display )
764+ addDisplay ( 1 , METRIC + '_' + k , '' , '' , ( undefined !== oGood [ hash ] ? rfp_green : rfp_red ) )
765+ }
745766 }
746767
747- // objects are already sorted
748- let hash = mini ( oData )
749- // FF132+: 1607032 + 1918202 | FF133+: 1922204 | backported to TB
750- // all seven metrics should always return one of 3 hashes
751- // landscape, portrait, portrait but square
752- // RFP is always primary | on android the angle of 0 vs 90 is reversed
753- let aGood = [
754- '7a1ec766' , // 0 landscape
755- '5c281761' , // 90 portrait
756- 'a55cb95d' , // 90 portrait/square
757- ]
758- if ( 'android' == isOS ) {
759- aGood = [
760- 'bd9328e9' , // 90 landscape
761- 'df6d41d8' , // 0 portrait
762- 'e6c593d4' , // 0 portrait/square
763- ]
764- }
765- addDisplay ( 1 , METRIC , '' , '' , ( aGood . includes ( hash ) ? orientation_green : orientation_red ) )
766- addData ( 1 , METRIC , oData , hash )
767768 return resolve ( )
768769} )
769770
0 commit comments