Changeset 195148 in webkit


Ignore:
Timestamp:
Jan 15, 2016 2:28:03 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Media Query (-webkit-video-playable-inline) is failing as an invalid media query expression
​https://bugs.webkit.org/show_bug.cgi?id=153111

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-01-15
Reviewed by Dean Jackson.

Source/WebCore:

Test: fast/media/video-playable-inline-media-query.html

  • css/MediaQueryEvaluator.cpp:

(WebCore::video_playable_inlineMediaFeatureEval):
(WebCore::isRunningOnIPhoneOrIPod): Deleted.
Make the media query work regardless of the platform.
It should just check the web view's settings.

  • css/MediaQueryExp.cpp:

(WebCore::featureWithoutValue):
This media query expects no value, include it in the list
so it is not treated as invalid.

LayoutTests:

  • fast/media/video-playable-inline-media-query-expected.txt: Added.
  • fast/media/video-playable-inline-media-query.html: Added.
  • platform/ios-simulator/ios/fast/media/video-inline-expected.txt: Removed.
  • platform/ios-simulator/ios/fast/media/video-inline.html: Removed.
Location:
trunk
Files:
2 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r195147 r195148  
     12016-01-15  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Media Query (-webkit-video-playable-inline) is failing as an invalid media query expression
     4        https://bugs.webkit.org/show_bug.cgi?id=153111
     5
     6        Reviewed by Dean Jackson.
     7
     8        * fast/media/video-playable-inline-media-query-expected.txt: Added.
     9        * fast/media/video-playable-inline-media-query.html: Added.
     10        * platform/ios-simulator/ios/fast/media/video-inline-expected.txt: Removed.
     11        * platform/ios-simulator/ios/fast/media/video-inline.html: Removed.
     12
    1132016-01-15  Joseph Pecoraro  <pecoraro@apple.com>
    214

  • trunk/Source/WebCore/ChangeLog

    r195146 r195148  
     12016-01-15  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Media Query (-webkit-video-playable-inline) is failing as an invalid media query expression
     4        https://bugs.webkit.org/show_bug.cgi?id=153111
     5
     6        Reviewed by Dean Jackson.
     7
     8        Test: fast/media/video-playable-inline-media-query.html
     9
     10        * css/MediaQueryEvaluator.cpp:
     11        (WebCore::video_playable_inlineMediaFeatureEval):
     12        (WebCore::isRunningOnIPhoneOrIPod): Deleted.
     13        Make the media query work regardless of the platform.
     14        It should just check the web view's settings.
     15
     16        * css/MediaQueryExp.cpp:
     17        (WebCore::featureWithoutValue):
     18        This media query expects no value, include it in the list
     19        so it is not treated as invalid.
     20
    1212016-01-15  Zalan Bujtas  <zalan@apple.com>
    222

  • trunk/Source/WebCore/css/MediaQueryEvaluator.cpp

    r193859 r195148  
    5757#endif
    5858
    59 #if PLATFORM(IOS)
    60 #include "Device.h"
    61 #endif
    62 
    6359namespace WebCore {
    6460
    … …  
    662658#endif // ENABLE(VIEW_MODE_CSS_MEDIA)
    663659
    664 // FIXME: Find a better place for this function. Maybe ChromeClient?
    665 static inline bool isRunningOnIPhoneOrIPod()
    666 {
    667 #if PLATFORM(IOS)
    668     static bool runningOnIPhoneOrIPod = deviceClass() == MGDeviceClassiPhone || deviceClass() == MGDeviceClassiPod;
    669     return runningOnIPhoneOrIPod;
    670 #else
    671     return false;
    672 #endif
    673 }
    674 
    675660static bool video_playable_inlineMediaFeatureEval(CSSValue*, const CSSToLengthConversionData&, Frame* frame, MediaFeaturePrefix)
    676661{
    677     return !isRunningOnIPhoneOrIPod() || frame->settings().allowsInlineMediaPlayback();
     662    return frame->settings().allowsInlineMediaPlayback();
    678663}
    679664

  • trunk/Source/WebCore/css/MediaQueryExp.cpp

    r183404 r195148  
    156156        || mediaFeature == MediaFeatureNames::pointerMediaFeature
    157157        || mediaFeature == MediaFeatureNames::device_pixel_ratioMediaFeature
    158         || mediaFeature == MediaFeatureNames::resolutionMediaFeature;
     158        || mediaFeature == MediaFeatureNames::resolutionMediaFeature
     159        || mediaFeature == MediaFeatureNames::video_playable_inlineMediaFeature;
    159160}
    160161
Note: See TracChangeset for help on using the changeset viewer.