Changeset 169818 in webkit


Ignore:
Timestamp:
Jun 11, 2014 12:49:57 PM (10 years ago)
Author:
andersca@apple.com
Message:

Move more WKPreferences to WKWebViewConfiguration
​https://bugs.webkit.org/show_bug.cgi?id=133756
<rdar://problem/17271468>

Reviewed by Tim Horton.

  • UIProcess/API/Cocoa/WKPreferences.h:
  • UIProcess/API/Cocoa/WKPreferences.mm:

(-[WKPreferences setMinimumFontSize:]):
(-[WKPreferences suppressesIncrementalRendering]): Deleted.
(-[WKPreferences setSuppressesIncrementalRendering:]): Deleted.
(-[WKPreferences allowsInlineMediaPlayback]): Deleted.
(-[WKPreferences setAllowsInlineMediaPlayback:]): Deleted.
(-[WKPreferences mediaPlaybackRequiresUserAction]): Deleted.
(-[WKPreferences setMediaPlaybackRequiresUserAction:]): Deleted.
(-[WKPreferences mediaPlaybackAllowsAirPlay]): Deleted.
(-[WKPreferences setMediaPlaybackAllowsAirPlay:]): Deleted.

  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView initWithFrame:configuration:]):

  • UIProcess/API/Cocoa/WKWebViewConfiguration.h:
  • UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration copyWithZone:]):

  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r169813 r169818  
     12014-06-11  Anders Carlsson  <andersca@apple.com>
     2
     3        Move more WKPreferences to WKWebViewConfiguration
     4        https://bugs.webkit.org/show_bug.cgi?id=133756
     5        <rdar://problem/17271468>
     6
     7        Reviewed by Tim Horton.
     8
     9        * UIProcess/API/Cocoa/WKPreferences.h:
     10        * UIProcess/API/Cocoa/WKPreferences.mm:
     11        (-[WKPreferences setMinimumFontSize:]):
     12        (-[WKPreferences suppressesIncrementalRendering]): Deleted.
     13        (-[WKPreferences setSuppressesIncrementalRendering:]): Deleted.
     14        (-[WKPreferences allowsInlineMediaPlayback]): Deleted.
     15        (-[WKPreferences setAllowsInlineMediaPlayback:]): Deleted.
     16        (-[WKPreferences mediaPlaybackRequiresUserAction]): Deleted.
     17        (-[WKPreferences setMediaPlaybackRequiresUserAction:]): Deleted.
     18        (-[WKPreferences mediaPlaybackAllowsAirPlay]): Deleted.
     19        (-[WKPreferences setMediaPlaybackAllowsAirPlay:]): Deleted.
     20        * UIProcess/API/Cocoa/WKWebView.mm:
     21        (-[WKWebView initWithFrame:configuration:]):
     22        * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
     23        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
     24        (-[WKWebViewConfiguration copyWithZone:]):
     25        * WebKit2.xcodeproj/project.pbxproj:
     26
    1272014-06-11  Enrica Casucci  <enrica@apple.com>
    228

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

    r169812 r169818  
    6868@property (nonatomic) BOOL javaScriptCanOpenWindowsAutomatically;
    6969
    70 #if TARGET_OS_IPHONE
    71 /*! @abstract A Boolean value indicating whether HTML5 videos play inline
    72  (YES) or use the native full-screen controller (NO).
    73  @discussion The default value is NO.
    74  */
    75 @property (nonatomic) BOOL allowsInlineMediaPlayback;
    76 
    77 /*! @abstract A Boolean value indicating whether HTML5 videos require the
    78  user to start playing them (YES) or can play automatically (NO).
    79  @discussion The default value is YES.
    80  */
    81 @property (nonatomic) BOOL mediaPlaybackRequiresUserAction;
    82 
    83 /*! @abstract A Boolean value indicating whether AirPlay is allowed.
    84  @discussion The default value is YES.
    85  */
    86 @property (nonatomic) BOOL mediaPlaybackAllowsAirPlay;
    87 
    88 #endif
    89 
    9070#if !TARGET_OS_IPHONE
    9171/*! @abstract A Boolean value indicating whether Java is enabled.

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

    r166596 r169818  
    6363}
    6464
     65- (void)setMinimumFontSize:(CGFloat)minimumFontSize
     66{
     67    _preferences->setMinimumFontSize(minimumFontSize);
     68}
     69
    6570- (BOOL)isJavaScriptEnabled
    6671{
    … …  
    8287    _preferences->setJavaScriptCanOpenWindowsAutomatically(javaScriptCanOpenWindowsAutomatically);
    8388}
    84 
    85 - (BOOL)suppressesIncrementalRendering
    86 {
    87     return _preferences->suppressesIncrementalRendering();
    88 }
    89 
    90 - (void)setSuppressesIncrementalRendering:(BOOL)suppressesIncrementalRendering
    91 {
    92     _preferences->setSuppressesIncrementalRendering(suppressesIncrementalRendering);
    93 }
    94 
    95 - (void)setMinimumFontSize:(CGFloat)minimumFontSize
    96 {
    97     _preferences->setMinimumFontSize(minimumFontSize);
    98 }
    99 
    100 #pragma mark iOS-specific methods
    101 
    102 #if PLATFORM(IOS)
    103 
    104 - (BOOL)allowsInlineMediaPlayback
    105 {
    106     return _preferences->mediaPlaybackAllowsInline();
    107 }
    108 
    109 - (void)setAllowsInlineMediaPlayback:(BOOL)allowsInlineMediaPlayback
    110 {
    111     _preferences->setMediaPlaybackAllowsInline(allowsInlineMediaPlayback);
    112 }
    113 
    114 - (BOOL)mediaPlaybackRequiresUserAction
    115 {
    116     return _preferences->mediaPlaybackRequiresUserGesture();
    117 }
    118 
    119 - (void)setMediaPlaybackRequiresUserAction:(BOOL)mediaPlaybackRequiresUserAction
    120 {
    121     _preferences->setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserAction);
    122 }
    123 
    124 - (BOOL)mediaPlaybackAllowsAirPlay
    125 {
    126     return _preferences->mediaPlaybackAllowsAirPlay();
    127 }
    128 
    129 - (void)setMediaPlaybackAllowsAirPlay:(BOOL)mediaPlaybackAllowsAirPlay
    130 {
    131     _preferences->setMediaPlaybackAllowsAirPlay(mediaPlaybackAllowsAirPlay);
    132 }
    133 
    134 #endif
    13589
    13690#pragma mark OS X-specific methods

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

    r169812 r169818  
    254254
    255255#if PLATFORM(IOS)
     256    webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
     257    webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackRequiresUserGestureKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
     258    webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
     259#endif
     260
     261#if PLATFORM(IOS)
    256262    _scrollView = adoptNS([[WKScrollView alloc] initWithFrame:bounds]);
    257263    [_scrollView setInternalDelegate:self];

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

    r169812 r169818  
    6363@property (nonatomic) BOOL suppressesIncrementalRendering;
    6464
     65#if TARGET_OS_IPHONE
     66/*! @abstract A Boolean value indicating whether HTML5 videos play inline
     67 (YES) or use the native full-screen controller (NO).
     68 @discussion The default value is NO.
     69 */
     70@property (nonatomic) BOOL allowsInlineMediaPlayback;
     71
     72/*! @abstract A Boolean value indicating whether HTML5 videos require the
     73 user to start playing them (YES) or can play automatically (NO).
     74 @discussion The default value is YES.
     75 */
     76@property (nonatomic) BOOL mediaPlaybackRequiresUserAction;
     77
     78/*! @abstract A Boolean value indicating whether AirPlay is allowed.
     79 @discussion The default value is YES.
     80 */
     81@property (nonatomic) BOOL mediaPlaybackAllowsAirPlay;
     82
     83#endif
     84
    6585@end
    6686

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

    r169812 r169818  
    100100
    101101    configuration->_suppressesIncrementalRendering = self->_suppressesIncrementalRendering;
     102#if PLATFORM(IOS)
     103    configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
     104    configuration->_mediaPlaybackRequiresUserAction = self->_mediaPlaybackRequiresUserAction;
     105    configuration->_mediaPlaybackAllowsAirPlay = self->_mediaPlaybackAllowsAirPlay;
     106#endif
    102107
    103108    return configuration;

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r169807 r169818  
    172172                1A2BB6D014117B4D000F35D4 /* PluginProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2BB6CE14117B4D000F35D4 /* PluginProcessConnectionMessageReceiver.cpp */; };
    173173                1A2BB6D114117B4D000F35D4 /* PluginProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2BB6CF14117B4D000F35D4 /* PluginProcessConnectionMessages.h */; };
    174                 1A2D252B194688FD004537B0 /* WKErrorInternal.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 1A2D252A194688FD004537B0 /* WKErrorInternal.h */; };
    175174                1A2D82A4127F4EAB001EB962 /* NPObjectMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FA35C127A45BF0050E709 /* NPObjectMessageReceiver.cpp */; };
    176175                1A2D82A5127F4EAB001EB962 /* NPObjectMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1FA35B127A45BF0050E709 /* NPObjectMessageReceiver.h */; };
    … …  
    18931892                        dstSubfolderSpec = 1;
    18941893                        files = (
    1895                                 1A2D252B194688FD004537B0 /* WKErrorInternal.h in Copy Files */,
    18961894                                510CC8491613C85C00D03ED3 /* NetworkProcess.app in Copy Files */,
    18971895                                BCDE0ABF13272708001259FB /* PluginProcess.app in Copy Files */,
Note: See TracChangeset for help on using the changeset viewer.