Changeset 190793 in webkit


Ignore:
Timestamp:
Oct 9, 2015 7:21:54 AM (9 years ago)
Author:
matthew_hanson@apple.com
Message:

Merge r190438. rdar://problem/22865007

Location:
branches/safari-601.1.46-branch/LayoutTests
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-601.1.46-branch/LayoutTests/ChangeLog

    r190792 r190793  
     12015-10-08  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Merge r190438. rdar://problem/22865007
     4
     5    2015-10-01  Brent Fulgham  <bfulgham@apple.com>
     6
     7            Unreviewed test fix after r190434.
     8
     9            One test was not updated to pass the new required interruption type
     10            argument to 'internals.beginMediaSessionInterruption'.
     11
     12            * webaudio/audiocontext-state-interrupted-expected.txt:
     13            * webaudio/audiocontext-state-interrupted.html:
     14
    1152015-10-08  Matthew Hanson  <matthew_hanson@apple.com>
    216
    … …  
    8498        Roll out r190434.
    8599
    86 2015-10-02  Babak Shafiei  <bshafiei@apple.com>
    87 
    88         Merge r190438.
    89 
    90     2015-10-01  Brent Fulgham  <bfulgham@apple.com>
    91 
    92             Unreviewed test fix after r190434.
    93 
    94             One test was not updated to pass the new required interruption type
    95             argument to 'internals.beginMediaSessionInterruption'.
    96 
    97             * webaudio/audiocontext-state-interrupted-expected.txt:
    98             * webaudio/audiocontext-state-interrupted.html:
     1002015-10-08  Matthew Hanson  <matthew_hanson@apple.com>
     101
     102        Merge r190479. rdar://problem/22865007
     103
     104    2015-10-02  Babak Shafiei  <bshafiei@apple.com>
     105
     106            Merge r190438.
     107
     108        2015-10-01  Brent Fulgham  <bfulgham@apple.com>
     109
     110                Unreviewed test fix after r190434.
     111
     112                One test was not updated to pass the new required interruption type
     113                argument to 'internals.beginMediaSessionInterruption'.
     114
     115                * webaudio/audiocontext-state-interrupted-expected.txt:
     116                * webaudio/audiocontext-state-interrupted.html:
    99117
    1001182015-10-08  Matthew Hanson  <matthew_hanson@apple.com>

  • branches/safari-601.1.46-branch/LayoutTests/webaudio/audiocontext-state-interrupted-expected.txt

    r190537 r190793  
    99
    1010Test 1: resume() while interrupted is resolved after the interruption ends.
    11 internals.beginMediaSessionInterruption()
     11internals.beginMediaSessionInterruption("System")
    1212EVENT statechange
    1313PASS context.state is "interrupted"
    … …  
    2121
    2222Test 2: resume() while interrupted will cause interruption to end.
    23 internals.beginMediaSessionInterruption()
     23internals.beginMediaSessionInterruption("System")
    2424EVENT statechange
    2525PASS context.state is "interrupted"
    … …  
    3030
    3131Test 3: running AudioContexts will not resume after an interruption ends.
    32 internals.beginMediaSessionInterruption()
     32internals.beginMediaSessionInterruption("System")
    3333EVENT statechange
    3434PASS context.state is "interrupted"
    … …  
    3838
    3939Test 4: resume() while interrupted will not resume playback after an interruption.
    40 internals.beginMediaSessionInterruption()
     40internals.beginMediaSessionInterruption("System")
    4141EVENT statechange
    4242PASS context.state is "interrupted"

  • branches/safari-601.1.46-branch/LayoutTests/webaudio/audiocontext-state-interrupted.html

    r190537 r190793  
    4444    context.onstatechange = firstInterruptionStarted;
    4545    if (window.internals)
    46         evalAndLog('internals.beginMediaSessionInterruption()');
     46        evalAndLog('internals.beginMediaSessionInterruption("System")');
    4747
    4848}
    … …  
    7575    context.onstatechange = secondInterruptionStarted;
    7676    if (window.internals)
    77         evalAndLog('internals.beginMediaSessionInterruption()');
     77        evalAndLog('internals.beginMediaSessionInterruption("System")');
    7878}
    7979
    … …  
    9999    context.onstatechange = thirdInterruptionStarted;
    100100    if (window.internals)
    101         evalAndLog('internals.beginMediaSessionInterruption()');
     101        evalAndLog('internals.beginMediaSessionInterruption("System")');
    102102}
    103103
    … …  
    120120    context.onstatechange = fourthInterruptionStarted;
    121121    if (window.internals)
    122         evalAndLog('internals.beginMediaSessionInterruption()');
     122        evalAndLog('internals.beginMediaSessionInterruption("System")');
    123123}
    124124
Note: See TracChangeset for help on using the changeset viewer.