Changeset 203484 in webkit


Ignore:
Timestamp:
Jul 20, 2016 5:45:39 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r203471.
​https://bugs.webkit.org/show_bug.cgi?id=160003

many iOS-simulator tests are failing (Requested by litherum on
#webkit).

Reverted changeset:

"[iPhone] Playing a video on tudou.com plays only sound, no
video"
​https://bugs.webkit.org/show_bug.cgi?id=159967
​http://trac.webkit.org/changeset/203471

Location:
trunk
Files:
2 added
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r203476 r203484  
     12016-07-20  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r203471.
     4        https://bugs.webkit.org/show_bug.cgi?id=160003
     5
     6        many iOS-simulator tests are failing (Requested by litherum on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "[iPhone] Playing a video on tudou.com plays only sound, no
     12        video"
     13        https://bugs.webkit.org/show_bug.cgi?id=159967
     14        http://trac.webkit.org/changeset/203471
     15
    1162016-07-20  Jiewen Tan  <jiewen_tan@apple.com>
    217

  • trunk/LayoutTests/media/video-playsinline-expected.txt

    r203471 r203484  
    1 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
    2 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
     1RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
    32RUN(video.playsinline = false)
    4 RUN(video.removeAttribute("webkit-playsinline"))
    53EVENT(canplaythrough)
    64RUN(video.play())
    75EVENT(playing)
    86EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
    9 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
    10 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
    11 RUN(video.playsinline = false)
    12 RUN(video.setAttribute("webkit-playsinline"))
     7RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
     8RUN(video.playsinline = true)
    139EVENT(canplaythrough)
    1410RUN(video.play())
    1511EVENT(playing)
    1612EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
    17 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
    18 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
     13RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
    1914RUN(video.playsinline = false)
    20 RUN(video.setAttribute("webkit-playsinline"))
    21 EVENT(canplaythrough)
    22 RUN(video.play())
    23 EVENT(playing)
    24 EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
    25 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
    26 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
    27 RUN(video.playsinline = false)
    28 RUN(video.removeAttribute("webkit-playsinline"))
    29 EVENT(canplaythrough)
    30 RUN(video.play())
    31 EVENT(playing)
    32 EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
    33 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
    34 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
    35 RUN(video.playsinline = true)
    36 RUN(video.setAttribute("webkit-playsinline"))
    3715EVENT(canplaythrough)
    3816RUN(video.play())
    3917EVENT(playing)
    4018EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
    41 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
    42 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
     19RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
    4320RUN(video.playsinline = true)
    44 RUN(video.removeAttribute("webkit-playsinline"))
    45 EVENT(canplaythrough)
    46 RUN(video.play())
    47 EVENT(playing)
    48 EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
    49 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
    50 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
    51 RUN(video.playsinline = true)
    52 RUN(video.setAttribute("webkit-playsinline"))
    53 EVENT(canplaythrough)
    54 RUN(video.play())
    55 EVENT(playing)
    56 EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
    57 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
    58 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
    59 RUN(video.playsinline = true)
    60 RUN(video.removeAttribute("webkit-playsinline"))
    61 EVENT(canplaythrough)
    62 RUN(video.play())
    63 EVENT(playing)
    64 EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
    65 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
    66 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
    67 RUN(video.playsinline = false)
    68 RUN(video.setAttribute("webkit-playsinline"))
    69 EVENT(canplaythrough)
    70 RUN(video.play())
    71 EVENT(playing)
    72 EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
    73 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
    74 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
    75 RUN(video.playsinline = false)
    76 RUN(video.removeAttribute("webkit-playsinline"))
    77 EVENT(canplaythrough)
    78 RUN(video.play())
    79 EVENT(playing)
    80 EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
    81 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
    82 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
    83 RUN(video.playsinline = false)
    84 RUN(video.setAttribute("webkit-playsinline"))
    85 EVENT(canplaythrough)
    86 RUN(video.play())
    87 EVENT(playing)
    88 EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
    89 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
    90 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
    91 RUN(video.playsinline = false)
    92 RUN(video.removeAttribute("webkit-playsinline"))
    93 EVENT(canplaythrough)
    94 RUN(video.play())
    95 EVENT(playing)
    96 EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
    97 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
    98 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
    99 RUN(video.playsinline = true)
    100 RUN(video.setAttribute("webkit-playsinline"))
    101 EVENT(canplaythrough)
    102 RUN(video.play())
    103 EVENT(playing)
    104 EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
    105 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
    106 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
    107 RUN(video.playsinline = true)
    108 RUN(video.removeAttribute("webkit-playsinline"))
    109 EVENT(canplaythrough)
    110 RUN(video.play())
    111 EVENT(playing)
    112 EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
    113 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
    114 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
    115 RUN(video.playsinline = true)
    116 RUN(video.setAttribute("webkit-playsinline"))
    117 EVENT(canplaythrough)
    118 RUN(video.play())
    119 EVENT(playing)
    120 EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
    121 RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
    122 RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
    123 RUN(video.playsinline = true)
    124 RUN(video.removeAttribute("webkit-playsinline"))
    12521EVENT(canplaythrough)
    12622RUN(video.play())

  • trunk/LayoutTests/media/video-playsinline.html

    r203471 r203484  
    1818}
    1919
    20 function testPlaysInline(requiresPlaysInline, requiresWebKitPlaysInline, hasPlaysInline, hasWebKitPlaysInline, expectedDisplayingFullscreen)
     20function testPlaysInline(requiresPlaysInline, hasPlaysInline, expectedDisplayingFullscreen)
    2121{
    22     run('internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(' + requiresPlaysInline + ')');
    23     run('internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(' + requiresWebKitPlaysInline + ')');
     22    run('internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(' + requiresPlaysInline + ')');
    2423    video = media = document.createElement('video');
    2524    document.body.appendChild(video);
    … …  
    2726    video.src = findMediaFile('video', 'content/test');
    2827    run('video.playsinline = ' + hasPlaysInline);
    29     run('video.' + (hasWebKitPlaysInline ? 'set' : 'remove') + 'Attribute("webkit-playsinline")');
    3028    waitForEventOnce('canplaythrough', () => {
    3129        runWithKeyDown(() => {
    … …  
    4240function testRequiresPlaysInlineAndDoesntHaveIt()
    4341{
    44     testPlaysInline(true, true, false, false, true);
    45 }
    46 
    47 function testRequiresPlaysInlineAndDoesntHaveIt2()
    48 {
    49     testPlaysInline(true, true, false, true, false);
    50 }
    51 
    52 function testRequiresPlaysInlineAndDoesntHaveIt3()
    53 {
    54     testPlaysInline(true, false, false, true, true);
    55 }
    56 
    57 function testRequiresPlaysInlineAndDoesntHaveIt4()
    58 {
    59     testPlaysInline(true, false, false, false, true);
     42    testPlaysInline(true, false, true);
    6043}
    6144
    6245function testRequiresPlaysInlineAndDoesHaveIt()
    6346{
    64     testPlaysInline(true, true, true, true, false);
    65 }
    66 
    67 function testRequiresPlaysInlineAndDoesHaveIt2()
    68 {
    69     testPlaysInline(true, true, true, false, false);
    70 }
    71 
    72 function testRequiresPlaysInlineAndDoesHaveIt3()
    73 {
    74     testPlaysInline(true, false, true, true, false);
    75 }
    76 
    77 function testRequiresPlaysInlineAndDoesHaveIt4()
    78 {
    79     testPlaysInline(true, false, true, false, false);
     47    testPlaysInline(true, true, false);
    8048}
    8149
    8250function testDoesNotRequirePlaysInlineAndDoesntHaveIt()
    8351{
    84     testPlaysInline(false, true, false, true, false);
    85 }
    86 
    87 function testDoesNotRequirePlaysInlineAndDoesntHaveIt2()
    88 {
    89     testPlaysInline(false, true, false, false, true);
    90 }
    91 
    92 function testDoesNotRequirePlaysInlineAndDoesntHaveIt3()
    93 {
    94     testPlaysInline(false, false, false, true, false);
    95 }
    96 
    97 function testDoesNotRequirePlaysInlineAndDoesntHaveIt4()
    98 {
    99     testPlaysInline(false, false, false, false, false);
     52    testPlaysInline(false, false, false);
    10053}
    10154
    10255function testDoesNotRequirePlaysInlineAndDoesHaveIt()
    10356{
    104     testPlaysInline(false, true, true, true, false);
    105 }
    106 
    107 function testDoesNotRequirePlaysInlineAndDoesHaveIt2()
    108 {
    109     testPlaysInline(false, true, true, false, true);
    110 }
    111 
    112 function testDoesNotRequirePlaysInlineAndDoesHaveIt3()
    113 {
    114     testPlaysInline(false, false, true, true, false);
    115 }
    116 
    117 function testDoesNotRequirePlaysInlineAndDoesHaveIt4()
    118 {
    119     testPlaysInline(false, false, true, false, false);
     57    testPlaysInline(false, true, false);
    12058}
    12159
    12260var tests = [
    12361    testRequiresPlaysInlineAndDoesntHaveIt,
    124     testRequiresPlaysInlineAndDoesntHaveIt2,
    125     testRequiresPlaysInlineAndDoesntHaveIt3,
    126     testRequiresPlaysInlineAndDoesntHaveIt4,
    12762    testRequiresPlaysInlineAndDoesHaveIt,
    128     testRequiresPlaysInlineAndDoesHaveIt2,
    129     testRequiresPlaysInlineAndDoesHaveIt3,
    130     testRequiresPlaysInlineAndDoesHaveIt4,
    13163    testDoesNotRequirePlaysInlineAndDoesntHaveIt,
    132     testDoesNotRequirePlaysInlineAndDoesntHaveIt2,
    133     testDoesNotRequirePlaysInlineAndDoesntHaveIt3,
    134     testDoesNotRequirePlaysInlineAndDoesntHaveIt4,
    13564    testDoesNotRequirePlaysInlineAndDoesHaveIt,
    136     testDoesNotRequirePlaysInlineAndDoesHaveIt2,
    137     testDoesNotRequirePlaysInlineAndDoesHaveIt3,
    138     testDoesNotRequirePlaysInlineAndDoesHaveIt4
    13965];
    14066

  • trunk/Source/WebCore/ChangeLog

    r203482 r203484  
     12016-07-20  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r203471.
     4        https://bugs.webkit.org/show_bug.cgi?id=160003
     5
     6        many iOS-simulator tests are failing (Requested by litherum on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "[iPhone] Playing a video on tudou.com plays only sound, no
     12        video"
     13        https://bugs.webkit.org/show_bug.cgi?id=159967
     14        http://trac.webkit.org/changeset/203471
     15
    1162016-07-19  Ryosuke Niwa  <rniwa@webkit.org>
    217

  • trunk/Source/WebCore/html/MediaElementSession.cpp

    r203471 r203484  
    456456        return true;
    457457
    458     bool requiresPlaysInline = settings->allowsInlineMediaPlaybackWithPlaysInlineAttribute();
    459     bool requiresWebKitPlaysInline = settings->allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute();
    460 
    461     if (!requiresPlaysInline && !requiresWebKitPlaysInline)
    462         return false;
    463 
    464     bool hasPlaysInline = element.hasAttributeWithoutSynchronization(HTMLNames::playsinlineAttr);
    465     bool hasWebKitPlaysInline = element.hasAttributeWithoutSynchronization(HTMLNames::webkit_playsinlineAttr);
    466 
    467     return !((requiresPlaysInline && hasPlaysInline) || (requiresWebKitPlaysInline && hasWebKitPlaysInline));
     458    return settings->inlineMediaPlaybackRequiresPlaysInlineAttribute() && !(element.hasAttributeWithoutSynchronization(HTMLNames::webkit_playsinlineAttr) || element.hasAttributeWithoutSynchronization(HTMLNames::playsinlineAttr));
    468459}
    469460

  • trunk/Source/WebCore/page/Settings.cpp

    r203471 r203484  
    140140static const bool defaultAllowsInlineMediaPlayback = false;
    141141static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = true;
    142 static const bool defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute = true;
    143 static const bool defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = true;
    144142static const bool defaultVideoPlaybackRequiresUserGesture = true;
    145143static const bool defaultAudioPlaybackRequiresUserGesture = true;
    … …  
    155153static const bool defaultAllowsInlineMediaPlayback = true;
    156154static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = false;
    157 static const bool defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute = false;
    158 static const bool defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = false;
    159155static const bool defaultVideoPlaybackRequiresUserGesture = false;
    160156static const bool defaultAudioPlaybackRequiresUserGesture = false;

  • trunk/Source/WebCore/page/Settings.in

    r203471 r203484  
    133133allowsInlineMediaPlaybackAfterFullscreen initial=true
    134134inlineMediaPlaybackRequiresPlaysInlineAttribute initial=defaultInlineMediaPlaybackRequiresPlaysInlineAttribute
    135 allowsInlineMediaPlaybackWithPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute
    136 allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
    137135allowsPictureInPictureMediaPlayback initial=defaultAllowsPictureInPictureMediaPlayback
    138136mediaControlsScaleWithPageZoom initial=defaultMediaControlsScaleWithPageZoom

  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r203471 r203484  
    109109    , m_allowsInlineMediaPlaybackAfterFullscreen(settings.allowsInlineMediaPlaybackAfterFullscreen())
    110110    , m_inlineMediaPlaybackRequiresPlaysInlineAttribute(settings.inlineMediaPlaybackRequiresPlaysInlineAttribute())
    111     , m_allowsInlineMediaPlaybackWithPlaysInlineAttribute(settings.allowsInlineMediaPlaybackWithPlaysInlineAttribute())
    112     , m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(settings.allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute())
    113111#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
    114112    , m_indexedDBWorkersEnabled(RuntimeEnabledFeatures::sharedFeatures().indexedDBWorkersEnabled())
    … …  
    187185    settings.setAllowsInlineMediaPlaybackAfterFullscreen(m_allowsInlineMediaPlaybackAfterFullscreen);
    188186    settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(m_inlineMediaPlaybackRequiresPlaysInlineAttribute);
    189     settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(m_allowsInlineMediaPlaybackWithPlaysInlineAttribute);
    190     settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute);
    191187    RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
    192188#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
    … …  
    585581}
    586582
    587 void InternalSettings::setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool requires, ExceptionCode& ec)
    588 {
    589     InternalSettingsGuardForSettings();
    590     settings()->setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(requires);
    591 }
    592 
    593 void InternalSettings::setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(bool requires, ExceptionCode& ec)
    594 {
    595     InternalSettingsGuardForSettings();
    596     settings()->setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(requires);
    597 }
    598 
    599583void InternalSettings::setIndexedDBWorkersEnabled(bool enabled, ExceptionCode&)
    600584{

  • trunk/Source/WebCore/testing/InternalSettings.h

    r203471 r203484  
    109109        bool m_allowsInlineMediaPlaybackAfterFullscreen;
    110110        bool m_inlineMediaPlaybackRequiresPlaysInlineAttribute;
    111         bool m_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
    112         bool m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
    113111#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
    114112        bool m_indexedDBWorkersEnabled;
    … …  
    166164    void setAllowsInlineMediaPlaybackAfterFullscreen(bool, ExceptionCode&);
    167165    void setInlineMediaPlaybackRequiresPlaysInlineAttribute(bool, ExceptionCode&);
    168     void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool, ExceptionCode&);
    169     void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(bool, ExceptionCode&);
    170166    void setIndexedDBWorkersEnabled(bool, ExceptionCode&);
    171167    String userInterfaceDirectionPolicy(ExceptionCode&);

  • trunk/Source/WebCore/testing/InternalSettings.idl

    r203471 r203484  
    7979    [RaisesException] void setAllowsInlineMediaPlaybackAfterFullscreen(boolean allows);
    8080    [RaisesException] void setInlineMediaPlaybackRequiresPlaysInlineAttribute(boolean requires);
    81     [RaisesException] void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(boolean requires);
    82     [RaisesException] void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(boolean requires);
    8381
    8482    [RaisesException] void setIndexedDBWorkersEnabled(boolean requires);

  • trunk/Source/WebKit/mac/ChangeLog

    r203471 r203484  
     12016-07-20  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r203471.
     4        https://bugs.webkit.org/show_bug.cgi?id=160003
     5
     6        many iOS-simulator tests are failing (Requested by litherum on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "[iPhone] Playing a video on tudou.com plays only sound, no
     12        video"
     13        https://bugs.webkit.org/show_bug.cgi?id=159967
     14        http://trac.webkit.org/changeset/203471
     15
    1162016-07-20  Myles C. Maxfield  <mmaxfield@apple.com>
    217

  • trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

    r203471 r203484  
    128128#define WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey @"WebKitAllowsInlineMediaPlaybackAfterFullscreen"
    129129#define WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey @"InlineMediaPlaybackRequiresPlaysInlineAttribute"
    130 #define WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithPlaysInlineAttribute"
    131 #define WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute"
    132130#define WebKitInvisibleAutoplayNotPermittedKey @"InvisibleAutoplayNotPermitted"
    133131#define WebKitAllowsPictureInPictureMediaPlaybackPreferenceKey @"WebKitAllowsPictureInPictureMediaPlayback"

  • trunk/Source/WebKit/mac/WebView/WebPreferences.mm

    r203471 r203484  
    526526        [NSNumber numberWithBool:YES],  WebKitAllowsInlineMediaPlaybackPreferenceKey,
    527527        [NSNumber numberWithBool:NO],   WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
    528         [NSNumber numberWithBool:NO],   WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
    529         [NSNumber numberWithBool:NO],   WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
    530         [NSNumber numberWithBool:NO],   WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
     528        [NSNumber numberWithBool:NO],  WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
    531529        [NSNumber numberWithBool:YES],  WebKitMediaControlsScaleWithPageZoomPreferenceKey,
    532530        [NSNumber numberWithBool:NO],   WebKitWebAudioEnabledPreferenceKey,
    … …  
    542540        [NSNumber numberWithBool:allowsInlineMediaPlaybackAfterFullscreen],   WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
    543541        [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
    544         [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
    545         [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
    546542        [NSNumber numberWithBool:NO],   WebKitMediaControlsScaleWithPageZoomPreferenceKey,
    547543        [NSNumber numberWithUnsignedInt:AudioSession::None],  WebKitAudioSessionCategoryOverride,
    … …  
    22982294}
    22992295
    2300 - (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute
    2301 {
    2302     return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey];
    2303 }
    2304 
    2305 - (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag
    2306 {
    2307     [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey];
    2308 }
    2309 
    2310 - (BOOL)allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
    2311 {
    2312     return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey];
    2313 }
    2314 
    2315 - (void)setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)flag
    2316 {
    2317     [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey];
    2318 }
    2319 
    23202296- (BOOL)invisibleAutoplayNotPermitted
    23212297{

  • trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

    r203471 r203484  
    266266- (BOOL)inlineMediaPlaybackRequiresPlaysInlineAttribute;
    267267
    268 - (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag;
    269 - (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute;
    270 
    271 - (void)setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)flag;
    272 - (BOOL)allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
    273 
    274268- (void)setInvisibleAutoplayNotPermitted:(BOOL)flag;
    275269- (BOOL)invisibleAutoplayNotPermitted;

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r203471 r203484  
    23502350    settings.setAllowsInlineMediaPlaybackAfterFullscreen([preferences allowsInlineMediaPlaybackAfterFullscreen]);
    23512351    settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute([preferences inlineMediaPlaybackRequiresPlaysInlineAttribute]);
    2352     settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithPlaysInlineAttribute]);
    2353     settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]);
    23542352    settings.setInvisibleAutoplayNotPermitted([preferences invisibleAutoplayNotPermitted]);
    23552353    settings.setAllowsPictureInPictureMediaPlayback([preferences allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback());

  • trunk/Source/WebKit2/ChangeLog

    r203483 r203484  
     12016-07-20  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r203471.
     4        https://bugs.webkit.org/show_bug.cgi?id=160003
     5
     6        many iOS-simulator tests are failing (Requested by litherum on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "[iPhone] Playing a video on tudou.com plays only sound, no
     12        video"
     13        https://bugs.webkit.org/show_bug.cgi?id=159967
     14        http://trac.webkit.org/changeset/203471
     15
    1162016-07-20  Simon Fraser  <simon.fraser@apple.com>
    217

  • trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h

    r203471 r203484  
    6767#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN true
    6868#define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE true
    69 #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE true
    70 #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE true
    7169#define DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED true
    7270#define DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY false
    … …  
    8684#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN false
    8785#define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE false
    88 #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE false
    89 #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE false
    9086#define DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED false
    9187#define DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY true
    … …  
    158154    macro(AllowsInlineMediaPlaybackAfterFullscreen, allowsInlineMediaPlaybackAfterFullscreen, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN, "", "") \
    159155    macro(InlineMediaPlaybackRequiresPlaysInlineAttribute, inlineMediaPlaybackRequiresPlaysInlineAttribute, Bool, bool, DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE, "", "") \
    160     macro(AllowsInlineMediaPlaybackWithPlaysInlineAttribute, allowsInlineMediaPlaybackWithPlaysInlineAttribute, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE, "", "") \
    161     macro(AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute, allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE, "", "") \
    162156    macro(InvisibleAutoplayNotPermitted, invisibleAutoplayNotPermitted, Bool, bool, DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED, "", "") \
    163157    macro(MediaDataLoadsAutomatically, mediaDataLoadsAutomatically, Bool, bool, DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY, "", "") \

  • trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

    r203471 r203484  
    804804}
    805805
    806 void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
    807 {
    808     toImpl(preferencesRef)->setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(flag);
    809 }
    810 
    811 bool WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef)
    812 {
    813     return toImpl(preferencesRef)->allowsInlineMediaPlaybackWithPlaysInlineAttribute();
    814 }
    815 
    816 void WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
    817 {
    818     toImpl(preferencesRef)->setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(flag);
    819 }
    820 
    821 bool WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef)
    822 {
    823     return toImpl(preferencesRef)->allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute();
    824 }
    825 
    826806void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag)
    827807{

  • trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h

    r203471 r203484  
    196196WK_EXPORT bool WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef);
    197197
    198 // Defaults to true on iOS, false elsewhere.
    199 WK_EXPORT void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
    200 WK_EXPORT bool WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef);
    201 
    202 // Defaults to true on iOS, false elsewhere.
    203 WK_EXPORT void WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
    204 WK_EXPORT bool WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef);
    205 
    206198// Defaults to false on iOS, true elsewhere.
    207199WK_EXPORT void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag);

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r203483 r203484  
    457457    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackAfterFullscreen]));
    458458    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _inlineMediaPlaybackRequiresPlaysInlineAttribute]));
    459     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackWithPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackWithPlaysInlineAttribute]));
    460     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]));
    461459    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback()));
    462460    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::userInterfaceDirectionPolicyKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(WebCore::UserInterfaceDirectionPolicy::Content)));

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

    r203471 r203484  
    109109    BOOL _allowsInlineMediaPlayback;
    110110    BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
    111     BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
    112     BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
    113111    BOOL _allowsInlineMediaPlaybackAfterFullscreen;
    114112#endif
    … …  
    141139    _allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
    142140    _inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
    143     _allowsInlineMediaPlaybackWithPlaysInlineAttribute = !_allowsInlineMediaPlayback;
    144     _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = !_allowsInlineMediaPlayback;
    145141    _allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback;
    146142    _mediaDataLoadsAutomatically = NO;
    … …  
    294290    configuration->_allowsInlineMediaPlaybackAfterFullscreen = self->_allowsInlineMediaPlaybackAfterFullscreen;
    295291    configuration->_inlineMediaPlaybackRequiresPlaysInlineAttribute = self->_inlineMediaPlaybackRequiresPlaysInlineAttribute;
    296     configuration->_allowsInlineMediaPlaybackWithPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
    297     configuration->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
    298292    configuration->_allowsPictureInPictureMediaPlayback = self->_allowsPictureInPictureMediaPlayback;
    299293    configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
    … …  
    585579}
    586580
    587 - (BOOL)_allowsInlineMediaPlaybackWithPlaysInlineAttribute
    588 {
    589     return _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
    590 }
    591 
    592 - (void)_setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)requires
    593 {
    594     _allowsInlineMediaPlaybackWithPlaysInlineAttribute = requires;
    595 }
    596 
    597 - (BOOL)_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
    598 {
    599     return _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
    600 }
    601 
    602 - (void)_setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)requires
    603 {
    604     _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = requires;
    605 }
    606 
    607581- (BOOL)_allowsInlineMediaPlaybackAfterFullscreen
    608582{

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h

    r203471 r203484  
    6161@property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
    6262@property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
    63 @property (nonatomic, setter=_setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:) BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
    64 @property (nonatomic, setter=_setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:) BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
    6563@property (nonatomic, setter=_setAllowsInlineMediaPlaybackAfterFullscreen:) BOOL _allowsInlineMediaPlaybackAfterFullscreen  WK_API_AVAILABLE(ios(WK_IOS_TBA));
    6664#else

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r203471 r203484  
    29872987    settings.setAllowsInlineMediaPlaybackAfterFullscreen(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey()));
    29882988    settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey()));
    2989     settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackWithPlaysInlineAttributeKey()));
    2990     settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey()));
    29912989    settings.setInvisibleAutoplayNotPermitted(store.getBoolValueForKey(WebPreferencesKey::invisibleAutoplayNotPermittedKey()));
    29922990    settings.setMediaDataLoadsAutomatically(store.getBoolValueForKey(WebPreferencesKey::mediaDataLoadsAutomaticallyKey()));
Note: See TracChangeset for help on using the changeset viewer.