<!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>[234942] trunk/Source/WebKit</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/234942">234942</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2018-08-16 11:19:19 -0700 (Thu, 16 Aug 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Transition more WKWebViewConfiguration ivars to API::PageConfiguration values
https://bugs.webkit.org/show_bug.cgi?id=188663

Reviewed by Tim Horton.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration init]):
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _drawsBackground]):
(-[WKWebViewConfiguration _setDrawsBackground:]):
(-[WKWebViewConfiguration _waitsForPaintAfterViewDidMoveToWindow]):
(-[WKWebViewConfiguration _setWaitsForPaintAfterViewDidMoveToWindow:]):
(-[WKWebViewConfiguration _isControlledByAutomation]):
(-[WKWebViewConfiguration _setControlledByAutomation:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (234941 => 234942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2018-08-16 17:59:30 UTC (rev 234941)
+++ trunk/Source/WebKit/ChangeLog       2018-08-16 18:19:19 UTC (rev 234942)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2018-08-16  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><ins>+        Transition more WKWebViewConfiguration ivars to API::PageConfiguration values
+        https://bugs.webkit.org/show_bug.cgi?id=188663
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration init]):
+        (-[WKWebViewConfiguration copyWithZone:]):
+        (-[WKWebViewConfiguration _drawsBackground]):
+        (-[WKWebViewConfiguration _setDrawsBackground:]):
+        (-[WKWebViewConfiguration _waitsForPaintAfterViewDidMoveToWindow]):
+        (-[WKWebViewConfiguration _setWaitsForPaintAfterViewDidMoveToWindow:]):
+        (-[WKWebViewConfiguration _isControlledByAutomation]):
+        (-[WKWebViewConfiguration _setControlledByAutomation:]):
+
+2018-08-16  Alex Christensen  <achristensen@webkit.org>
+
</ins><span class="cx">         Stop using canAuthenticateAgainstProtectionSpace in modern WebKit
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=188639
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (234941 => 234942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm     2018-08-16 17:59:30 UTC (rev 234941)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm        2018-08-16 18:19:19 UTC (rev 234942)
</span><span class="lines">@@ -538,9 +538,6 @@
</span><span class="cx">     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::shouldConvertPositionStyleOnCopyKey(), WebKit::WebPreferencesStore::Value(!![_configuration _convertsPositionStyleOnCopy]));
</span><span class="cx">     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::httpEquivEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsMetaRefresh]));
</span><span class="cx">     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowUniversalAccessFromFileURLsKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowUniversalAccessFromFileURLs]));
</span><del>-    pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow([_configuration _waitsForPaintAfterViewDidMoveToWindow]);
-    pageConfiguration->setDrawsBackground([_configuration _drawsBackground]);
-    pageConfiguration->setControlledByAutomation([_configuration _isControlledByAutomation]);
</del><span class="cx">     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::incompleteImageBorderEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _incompleteImageBorderEnabled]));
</span><span class="cx">     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::shouldDeferAsynchronousScriptsUntilAfterDocumentLoadKey(), WebKit::WebPreferencesStore::Value(!![_configuration _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad]));
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (234941 => 234942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm        2018-08-16 17:59:30 UTC (rev 234941)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm   2018-08-16 18:19:19 UTC (rev 234942)
</span><span class="lines">@@ -147,8 +147,6 @@
</span><span class="cx">     BOOL _imageControlsEnabled;
</span><span class="cx">     BOOL _requiresUserActionForEditingControlsManager;
</span><span class="cx"> #endif
</span><del>-    BOOL _waitsForPaintAfterViewDidMoveToWindow;
-    BOOL _controlledByAutomation;
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(APPLICATION_MANIFEST)
</span><span class="cx">     RetainPtr<_WKApplicationManifest> _applicationManifest;
</span><span class="lines">@@ -163,7 +161,6 @@
</span><span class="cx">     BOOL _colorFilterEnabled;
</span><span class="cx">     BOOL _incompleteImageBorderEnabled;
</span><span class="cx">     BOOL _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
</span><del>-    BOOL _drawsBackground;
</del><span class="cx"> 
</span><span class="cx">     RetainPtr<NSString> _mediaContentTypesRequiringHardwareSupport;
</span><span class="cx"> }
</span><span class="lines">@@ -217,7 +214,6 @@
</span><span class="cx">     _imageControlsEnabled = NO;
</span><span class="cx">     _requiresUserActionForEditingControlsManager = NO;
</span><span class="cx"> #endif
</span><del>-    _waitsForPaintAfterViewDidMoveToWindow = YES;
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx">     _allowsAirPlayForMediaPlayback = YES;
</span><span class="lines">@@ -249,7 +245,6 @@
</span><span class="cx">     _colorFilterEnabled = NO;
</span><span class="cx">     _incompleteImageBorderEnabled = NO;
</span><span class="cx">     _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = NO;
</span><del>-    _drawsBackground = YES;
</del><span class="cx"> 
</span><span class="cx">     return self;
</span><span class="cx"> }
</span><span class="lines">@@ -364,8 +359,6 @@
</span><span class="cx">     configuration->_attachmentElementEnabled = self->_attachmentElementEnabled;
</span><span class="cx">     configuration->_mediaTypesRequiringUserActionForPlayback = self->_mediaTypesRequiringUserActionForPlayback;
</span><span class="cx">     configuration->_mainContentUserGestureOverrideEnabled = self->_mainContentUserGestureOverrideEnabled;
</span><del>-    configuration->_waitsForPaintAfterViewDidMoveToWindow = self->_waitsForPaintAfterViewDidMoveToWindow;
-    configuration->_controlledByAutomation = self->_controlledByAutomation;
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
</span><span class="lines">@@ -410,7 +403,6 @@
</span><span class="cx">     configuration->_colorFilterEnabled = self->_colorFilterEnabled;
</span><span class="cx">     configuration->_incompleteImageBorderEnabled = self->_incompleteImageBorderEnabled;
</span><span class="cx">     configuration->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = self->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
</span><del>-    configuration->_drawsBackground = self->_drawsBackground;
</del><span class="cx"> 
</span><span class="cx">     return configuration;
</span><span class="cx"> }
</span><span class="lines">@@ -790,12 +782,12 @@
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_drawsBackground
</span><span class="cx"> {
</span><del>-    return _drawsBackground;
</del><ins>+    return _pageConfiguration->drawsBackground();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_setDrawsBackground:(BOOL)drawsBackground
</span><span class="cx"> {
</span><del>-    _drawsBackground = drawsBackground;
</del><ins>+    _pageConfiguration->setDrawsBackground(drawsBackground);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_requiresUserActionForVideoPlayback
</span><span class="lines">@@ -846,22 +838,22 @@
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_waitsForPaintAfterViewDidMoveToWindow
</span><span class="cx"> {
</span><del>-    return _waitsForPaintAfterViewDidMoveToWindow;
</del><ins>+    return _pageConfiguration->waitsForPaintAfterViewDidMoveToWindow();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_setWaitsForPaintAfterViewDidMoveToWindow:(BOOL)shouldSynchronize
</del><ins>+- (void)_setWaitsForPaintAfterViewDidMoveToWindow:(BOOL)waitsForPaintAfterViewDidMoveToWindow
</ins><span class="cx"> {
</span><del>-    _waitsForPaintAfterViewDidMoveToWindow = shouldSynchronize;
</del><ins>+    _pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow(waitsForPaintAfterViewDidMoveToWindow);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_isControlledByAutomation
</span><span class="cx"> {
</span><del>-    return _controlledByAutomation;
</del><ins>+    return _pageConfiguration->isControlledByAutomation();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_setControlledByAutomation:(BOOL)controlledByAutomation
</span><span class="cx"> {
</span><del>-    _controlledByAutomation = controlledByAutomation;
</del><ins>+    _pageConfiguration->setControlledByAutomation(controlledByAutomation);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (_WKApplicationManifest *)_applicationManifest
</span></span></pre>
</div>
</div>

</body>
</html>