<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169818] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169818">169818</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-11 12:49:57 -0700 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169817 => 169818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-11 19:31:51 UTC (rev 169817)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-11 19:49:57 UTC (rev 169818)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-06-11 Anders Carlsson <andersca@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-06-11 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit2 iOS: Unable to open UI menu for "open in new tab" for links on yahoo.com.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h (169817 => 169818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-06-11 19:31:51 UTC (rev 169817)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-06-11 19:49:57 UTC (rev 169818)
</span><span class="lines">@@ -67,26 +67,6 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL javaScriptCanOpenWindowsAutomatically;
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE
-/*! @abstract A Boolean value indicating whether HTML5 videos play inline
- (YES) or use the native full-screen controller (NO).
- @discussion The default value is NO.
- */
-@property (nonatomic) BOOL allowsInlineMediaPlayback;
-
-/*! @abstract A Boolean value indicating whether HTML5 videos require the
- user to start playing them (YES) or can play automatically (NO).
- @discussion The default value is YES.
- */
-@property (nonatomic) BOOL mediaPlaybackRequiresUserAction;
-
-/*! @abstract A Boolean value indicating whether AirPlay is allowed.
- @discussion The default value is YES.
- */
-@property (nonatomic) BOOL mediaPlaybackAllowsAirPlay;
-
-#endif
-
</del><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> /*! @abstract A Boolean value indicating whether Java is enabled.
</span><span class="cx"> @discussion The default value is YES.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (169817 => 169818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-06-11 19:31:51 UTC (rev 169817)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-06-11 19:49:57 UTC (rev 169818)
</span><span class="lines">@@ -62,6 +62,11 @@
</span><span class="cx"> return _preferences->minimumFontSize();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setMinimumFontSize:(CGFloat)minimumFontSize
+{
+ _preferences->setMinimumFontSize(minimumFontSize);
+}
+
</ins><span class="cx"> - (BOOL)isJavaScriptEnabled
</span><span class="cx"> {
</span><span class="cx"> return _preferences->javaScriptEnabled();
</span><span class="lines">@@ -82,57 +87,6 @@
</span><span class="cx"> _preferences->setJavaScriptCanOpenWindowsAutomatically(javaScriptCanOpenWindowsAutomatically);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)suppressesIncrementalRendering
-{
- return _preferences->suppressesIncrementalRendering();
-}
-
-- (void)setSuppressesIncrementalRendering:(BOOL)suppressesIncrementalRendering
-{
- _preferences->setSuppressesIncrementalRendering(suppressesIncrementalRendering);
-}
-
-- (void)setMinimumFontSize:(CGFloat)minimumFontSize
-{
- _preferences->setMinimumFontSize(minimumFontSize);
-}
-
-#pragma mark iOS-specific methods
-
-#if PLATFORM(IOS)
-
-- (BOOL)allowsInlineMediaPlayback
-{
- return _preferences->mediaPlaybackAllowsInline();
-}
-
-- (void)setAllowsInlineMediaPlayback:(BOOL)allowsInlineMediaPlayback
-{
- _preferences->setMediaPlaybackAllowsInline(allowsInlineMediaPlayback);
-}
-
-- (BOOL)mediaPlaybackRequiresUserAction
-{
- return _preferences->mediaPlaybackRequiresUserGesture();
-}
-
-- (void)setMediaPlaybackRequiresUserAction:(BOOL)mediaPlaybackRequiresUserAction
-{
- _preferences->setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserAction);
-}
-
-- (BOOL)mediaPlaybackAllowsAirPlay
-{
- return _preferences->mediaPlaybackAllowsAirPlay();
-}
-
-- (void)setMediaPlaybackAllowsAirPlay:(BOOL)mediaPlaybackAllowsAirPlay
-{
- _preferences->setMediaPlaybackAllowsAirPlay(mediaPlaybackAllowsAirPlay);
-}
-
-#endif
-
</del><span class="cx"> #pragma mark OS X-specific methods
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169817 => 169818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-11 19:31:51 UTC (rev 169817)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-11 19:49:57 UTC (rev 169818)
</span><span class="lines">@@ -253,6 +253,12 @@
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::suppressesIncrementalRenderingKey(), WebKit::WebPreferencesStore::Value(!![_configuration suppressesIncrementalRendering]));
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackRequiresUserGestureKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
+#endif
+
+#if PLATFORM(IOS)
</ins><span class="cx"> _scrollView = adoptNS([[WKScrollView alloc] initWithFrame:bounds]);
</span><span class="cx"> [_scrollView setInternalDelegate:self];
</span><span class="cx"> [_scrollView setBouncesZoom:YES];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (169817 => 169818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-06-11 19:31:51 UTC (rev 169817)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-06-11 19:49:57 UTC (rev 169818)
</span><span class="lines">@@ -62,6 +62,26 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL suppressesIncrementalRendering;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+/*! @abstract A Boolean value indicating whether HTML5 videos play inline
+ (YES) or use the native full-screen controller (NO).
+ @discussion The default value is NO.
+ */
+@property (nonatomic) BOOL allowsInlineMediaPlayback;
+
+/*! @abstract A Boolean value indicating whether HTML5 videos require the
+ user to start playing them (YES) or can play automatically (NO).
+ @discussion The default value is YES.
+ */
+@property (nonatomic) BOOL mediaPlaybackRequiresUserAction;
+
+/*! @abstract A Boolean value indicating whether AirPlay is allowed.
+ @discussion The default value is YES.
+ */
+@property (nonatomic) BOOL mediaPlaybackAllowsAirPlay;
+
+#endif
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (169817 => 169818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-06-11 19:31:51 UTC (rev 169817)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-06-11 19:49:57 UTC (rev 169818)
</span><span class="lines">@@ -99,6 +99,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> configuration->_suppressesIncrementalRendering = self->_suppressesIncrementalRendering;
</span><ins>+#if PLATFORM(IOS)
+ configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
+ configuration->_mediaPlaybackRequiresUserAction = self->_mediaPlaybackRequiresUserAction;
+ configuration->_mediaPlaybackAllowsAirPlay = self->_mediaPlaybackAllowsAirPlay;
+#endif
</ins><span class="cx">
</span><span class="cx"> return configuration;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (169817 => 169818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-06-11 19:31:51 UTC (rev 169817)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-06-11 19:49:57 UTC (rev 169818)
</span><span class="lines">@@ -171,7 +171,6 @@
</span><span class="cx"> 1A2A4B0E1586A2240090C9E9 /* ColorSpaceData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A4AFD158693920090C9E9 /* ColorSpaceData.mm */; };
</span><span class="cx"> 1A2BB6D014117B4D000F35D4 /* PluginProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2BB6CE14117B4D000F35D4 /* PluginProcessConnectionMessageReceiver.cpp */; };
</span><span class="cx"> 1A2BB6D114117B4D000F35D4 /* PluginProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2BB6CF14117B4D000F35D4 /* PluginProcessConnectionMessages.h */; };
</span><del>- 1A2D252B194688FD004537B0 /* WKErrorInternal.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 1A2D252A194688FD004537B0 /* WKErrorInternal.h */; };
</del><span class="cx"> 1A2D82A4127F4EAB001EB962 /* NPObjectMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FA35C127A45BF0050E709 /* NPObjectMessageReceiver.cpp */; };
</span><span class="cx"> 1A2D82A5127F4EAB001EB962 /* NPObjectMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1FA35B127A45BF0050E709 /* NPObjectMessageReceiver.h */; };
</span><span class="cx"> 1A2D82A6127F4EAB001EB962 /* NPObjectProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FA284127A13BC0050E709 /* NPObjectProxy.cpp */; };
</span><span class="lines">@@ -1892,7 +1891,6 @@
</span><span class="cx"> dstPath = WebKit.framework;
</span><span class="cx"> dstSubfolderSpec = 1;
</span><span class="cx"> files = (
</span><del>- 1A2D252B194688FD004537B0 /* WKErrorInternal.h in Copy Files */,
</del><span class="cx"> 510CC8491613C85C00D03ED3 /* NetworkProcess.app in Copy Files */,
</span><span class="cx"> BCDE0ABF13272708001259FB /* PluginProcess.app in Copy Files */,
</span><span class="cx"> 51A60B2A180CCEB500F3BF50 /* DatabaseProcess.app in Copy Files */,
</span></span></pre>
</div>
</div>
</body>
</html>