<!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>[245528] branches/safari-608.1.24-branch/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/245528">245528</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2019-05-20 11:03:50 -0700 (Mon, 20 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/245272">r245272</a>. <rdar://problem/50743963>

    2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>

            Followup to <a href="http://trac.webkit.org/projects/webkit/changeset/245267">r245267</a>: fix some more deprecated uses of -[UIApplication interfaceOrientation]
            https://bugs.webkit.org/show_bug.cgi?id=197867
            <rdar://problem/50743963>

            Reviewed by Simon Fraser.

            Add a helper method on WKContentView that asks the view's window's scene for an interface orientation; then,
            use this helper from various places in WebKit instead of invoking -[UIApplication interfaceOrientation]
            directly. No change in behavior.

            * UIProcess/ios/WKContentView.h:
            * UIProcess/ios/WKContentView.mm:
            (-[WKContentView interfaceOrientation]):
            * UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
            (-[WKDataListSuggestionsPicker initWithInformation:inView:]):
            * UIProcess/ios/forms/WKFormColorPicker.mm:
            (-[WKColorPicker initWithView:]):
            * UIProcess/ios/forms/WKFormInputControl.mm:
            (-[WKDateTimePicker initWithView:datePickerMode:]):
            * UIProcess/ios/forms/WKFormSelectPicker.mm:
            (-[WKMultipleSelectPicker initWithView:]):
            * UIProcess/ios/forms/WKFormSelectPopover.mm:
            (-[WKSelectPopover initWithView:hasGroups:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari608124branchSourceWebKitChangeLog">branches/safari-608.1.24-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari608124branchSourceWebKitUIProcessiosWKContentViewh">branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#branchessafari608124branchSourceWebKitUIProcessiosWKContentViewmm">branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#branchessafari608124branchSourceWebKitUIProcessiosWebDataListSuggestionsDropdownIOSmm">branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm</a></li>
<li><a href="#branchessafari608124branchSourceWebKitUIProcessiosformsWKFormColorPickermm">branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm</a></li>
<li><a href="#branchessafari608124branchSourceWebKitUIProcessiosformsWKFormInputControlmm">branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm</a></li>
<li><a href="#branchessafari608124branchSourceWebKitUIProcessiosformsWKFormSelectPickermm">branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm</a></li>
<li><a href="#branchessafari608124branchSourceWebKitUIProcessiosformsWKFormSelectPopovermm">branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari608124branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/WebKit/ChangeLog (245527 => 245528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/WebKit/ChangeLog  2019-05-20 18:03:47 UTC (rev 245527)
+++ branches/safari-608.1.24-branch/Source/WebKit/ChangeLog     2019-05-20 18:03:50 UTC (rev 245528)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2019-05-20  Dean Jackson  <dino@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r245272. <rdar://problem/50743963>
+
+    2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            Followup to r245267: fix some more deprecated uses of -[UIApplication interfaceOrientation]
+            https://bugs.webkit.org/show_bug.cgi?id=197867
+            <rdar://problem/50743963>
+
+            Reviewed by Simon Fraser.
+
+            Add a helper method on WKContentView that asks the view's window's scene for an interface orientation; then,
+            use this helper from various places in WebKit instead of invoking -[UIApplication interfaceOrientation]
+            directly. No change in behavior.
+
+            * UIProcess/ios/WKContentView.h:
+            * UIProcess/ios/WKContentView.mm:
+            (-[WKContentView interfaceOrientation]):
+            * UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
+            (-[WKDataListSuggestionsPicker initWithInformation:inView:]):
+            * UIProcess/ios/forms/WKFormColorPicker.mm:
+            (-[WKColorPicker initWithView:]):
+            * UIProcess/ios/forms/WKFormInputControl.mm:
+            (-[WKDateTimePicker initWithView:datePickerMode:]):
+            * UIProcess/ios/forms/WKFormSelectPicker.mm:
+            (-[WKMultipleSelectPicker initWithView:]):
+            * UIProcess/ios/forms/WKFormSelectPopover.mm:
+            (-[WKSelectPopover initWithView:hasGroups:]):
+
+2019-05-20  Dean Jackson  <dino@apple.com>
+
</ins><span class="cx">         Cherry-pick r245267.
</span><span class="cx"> 
</span><span class="cx">     2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>
</span></span></pre></div>
<a id="branchessafari608124branchSourceWebKitUIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WKContentView.h (245527 => 245528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WKContentView.h      2019-05-20 18:03:47 UTC (rev 245527)
+++ branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WKContentView.h 2019-05-20 18:03:50 UTC (rev 245528)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> @property (nonatomic, getter=isShowingInspectorIndication) BOOL showingInspectorIndication;
</span><span class="cx"> @property (nonatomic, readonly, getter=isResigningFirstResponder) BOOL resigningFirstResponder;
</span><span class="cx"> @property (nonatomic) BOOL sizeChangedSinceLastVisibleContentRectUpdate;
</span><ins>+@property (nonatomic, readonly) UIInterfaceOrientation interfaceOrientation;
</ins><span class="cx"> 
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari608124branchSourceWebKitUIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WKContentView.mm (245527 => 245528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WKContentView.mm     2019-05-20 18:03:47 UTC (rev 245527)
+++ branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WKContentView.mm        2019-05-20 18:03:50 UTC (rev 245528)
</span><span class="lines">@@ -545,6 +545,15 @@
</span><span class="cx">     return _undoManager.get();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (UIInterfaceOrientation)interfaceOrientation
+{
+#if HAVE(UISCENE)
+    return self.window.windowScene.interfaceOrientation;
+#else
+    return UIApp.interfaceOrientation;
+#endif
+}
+
</ins><span class="cx"> #pragma mark Internal
</span><span class="cx"> 
</span><span class="cx"> - (void)_windowDidMoveToScreenNotification:(NSNotification *)notification
</span></span></pre></div>
<a id="branchessafari608124branchSourceWebKitUIProcessiosWebDataListSuggestionsDropdownIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm (245527 => 245528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm 2019-05-20 18:03:47 UTC (rev 245527)
+++ branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm    2019-05-20 18:03:50 UTC (rev 245528)
</span><span class="lines">@@ -211,12 +211,7 @@
</span><span class="cx">     [_pickerView setDataSource:self];
</span><span class="cx">     [_pickerView setDelegate:self];
</span><span class="cx">     [_pickerView setControl:self];
</span><del>-#if HAVE(UISCENE)
-    auto interfaceOrientation = view.window.windowScene.interfaceOrientation;
-#else
-    auto interfaceOrientation = UIApp.interfaceOrientation;
-#endif
-    [_pickerView setSize:[UIKeyboard defaultSizeForInterfaceOrientation:interfaceOrientation]];
</del><ins>+    [_pickerView setSize:[UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation]];
</ins><span class="cx"> 
</span><span class="cx">     return self;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari608124branchSourceWebKitUIProcessiosformsWKFormColorPickermm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm (245527 => 245528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm   2019-05-20 18:03:47 UTC (rev 245527)
+++ branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm      2019-05-20 18:03:50 UTC (rev 245528)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">     if (currentUserInterfaceIdiomIsPad())
</span><span class="cx">         colorPickerSize = CGSizeMake(pickerWidthForPopover, pickerWidthForPopover);
</span><span class="cx">     else {
</span><del>-        CGSize keyboardSize = [UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]];
</del><ins>+        auto keyboardSize = [UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation];
</ins><span class="cx">         colorPickerSize = CGSizeMake(keyboardSize.width, keyboardSize.height + additionalKeyboardAffordance);
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari608124branchSourceWebKitUIProcessiosformsWKFormInputControlmm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm (245527 => 245528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm  2019-05-20 18:03:47 UTC (rev 245527)
+++ branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm     2019-05-20 18:03:50 UTC (rev 245528)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">         break;
</span><span class="cx">    }
</span><span class="cx"> 
</span><del>-    CGSize size = currentUserInterfaceIdiomIsPad() ? [UIPickerView defaultSizeForCurrentOrientation] : [UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]];
</del><ins>+    auto size = currentUserInterfaceIdiomIsPad() ? [UIPickerView defaultSizeForCurrentOrientation] : [UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation];
</ins><span class="cx"> 
</span><span class="cx">     _datePicker = adoptNS([[UIDatePicker alloc] initWithFrame:CGRectMake(0, 0, size.width, size.height)]);
</span><span class="cx">     _datePicker.get().datePickerMode = mode;
</span></span></pre></div>
<a id="branchessafari608124branchSourceWebKitUIProcessiosformsWKFormSelectPickermm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm (245527 => 245528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm  2019-05-20 18:03:47 UTC (rev 245527)
+++ branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm     2019-05-20 18:03:50 UTC (rev 245528)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx">     ALLOW_DEPRECATED_DECLARATIONS_END
</span><span class="cx"> 
</span><span class="cx">     [self setAllowsMultipleSelection:_allowsMultipleSelection];
</span><del>-    [self setSize:[UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]]];
</del><ins>+    [self setSize:[UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation]];
</ins><span class="cx">     [self reloadAllComponents];
</span><span class="cx"> 
</span><span class="cx">     if (!_allowsMultipleSelection) {
</span></span></pre></div>
<a id="branchessafari608124branchSourceWebKitUIProcessiosformsWKFormSelectPopovermm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm (245527 => 245528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm 2019-05-20 18:03:47 UTC (rev 245527)
+++ branches/safari-608.1.24-branch/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm    2019-05-20 18:03:50 UTC (rev 245528)
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx">     
</span><span class="cx">     CGRect frame;
</span><span class="cx">     frame.origin = CGPointZero;
</span><del>-    frame.size = [UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]];
</del><ins>+    frame.size = [UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation];
</ins><span class="cx"> 
</span><span class="cx">     _tableViewController = adoptNS([[WKSelectTableViewController alloc] initWithView:view hasGroups:hasGroups]);
</span><span class="cx">     [_tableViewController setPopover:self];
</span></span></pre>
</div>
</div>

</body>
</html>