<!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>[209282] trunk/Source/WebCore</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/209282">209282</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-12-02 16:22:00 -0800 (Fri, 02 Dec 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>HTML Interactive Form Validation popovers do not show in iOS WKWebViews
https://bugs.webkit.org/show_bug.cgi?id=165340
&lt;rdar://problem/29489966&gt;

Reviewed by Simon Fraser.

HTML Interactive Form Validation popovers do not show in iOS WKWebViews,
only in MobileSafari. To address the issue try to find an appropriate
UIViewController to present the popover when the client does not provide
a presenting view controller.

* platform/ValidationBubble.h:
* platform/ios/ValidationBubbleIOS.mm:
(WebCore::fallbackViewController):
(WebCore::ValidationBubble::setAnchorRect):
* platform/spi/ios/UIKitSPI.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformValidationBubbleh">trunk/Source/WebCore/platform/ValidationBubble.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosValidationBubbleIOSmm">trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspiiosUIKitSPIh">trunk/Source/WebCore/platform/spi/ios/UIKitSPI.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209281 => 209282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-12-02 23:36:50 UTC (rev 209281)
+++ trunk/Source/WebCore/ChangeLog        2016-12-03 00:22:00 UTC (rev 209282)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-12-02  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+        HTML Interactive Form Validation popovers do not show in iOS WKWebViews
+        https://bugs.webkit.org/show_bug.cgi?id=165340
+        &lt;rdar://problem/29489966&gt;
+
+        Reviewed by Simon Fraser.
+
+        HTML Interactive Form Validation popovers do not show in iOS WKWebViews,
+        only in MobileSafari. To address the issue try to find an appropriate
+        UIViewController to present the popover when the client does not provide
+        a presenting view controller.
+
+        * platform/ValidationBubble.h:
+        * platform/ios/ValidationBubbleIOS.mm:
+        (WebCore::fallbackViewController):
+        (WebCore::ValidationBubble::setAnchorRect):
+        * platform/spi/ios/UIKitSPI.h:
+
</ins><span class="cx"> 2016-12-02  Zalan Bujtas  &lt;zalan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove redundant LayoutUnit conversions.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformValidationBubbleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ValidationBubble.h (209281 => 209282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ValidationBubble.h        2016-12-02 23:36:50 UTC (rev 209281)
+++ trunk/Source/WebCore/platform/ValidationBubble.h        2016-12-03 00:22:00 UTC (rev 209282)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">     const String&amp; message() const { return m_message; }
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-    WEBCORE_EXPORT void setAnchorRect(const IntRect&amp; anchorRect, UIViewController* presentingViewController);
</del><ins>+    WEBCORE_EXPORT void setAnchorRect(const IntRect&amp; anchorRect, UIViewController* presentingViewController = nullptr);
</ins><span class="cx">     WEBCORE_EXPORT void show();
</span><span class="cx"> #else
</span><span class="cx">     WEBCORE_EXPORT void showRelativeTo(const IntRect&amp; anchorRect);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosValidationBubbleIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm (209281 => 209282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm        2016-12-02 23:36:50 UTC (rev 209281)
+++ trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm        2016-12-03 00:22:00 UTC (rev 209282)
</span><span class="lines">@@ -114,8 +114,21 @@
</span><span class="cx">     [m_presentingViewController presentViewController:m_popoverController.get() animated:NO completion:nil];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static UIViewController *fallbackViewController(UIView *view)
+{
+    for (UIView *currentView = view; currentView; currentView = currentView.superview) {
+        if (UIViewController *viewController = [getUIViewControllerClass() viewControllerForView:currentView])
+            return viewController;
+    }
+    NSLog(@&quot;Failed to find a view controller to show form validation popover&quot;);
+    return nil;
+}
+
</ins><span class="cx"> void ValidationBubble::setAnchorRect(const IntRect&amp; anchorRect, UIViewController* presentingViewController)
</span><span class="cx"> {
</span><ins>+    if (!presentingViewController)
+        presentingViewController = fallbackViewController(m_view);
+
</ins><span class="cx">     UIPopoverPresentationController *presentationController = [m_popoverController popoverPresentationController];
</span><span class="cx">     // This is needed to force UIKit to use a popover on iPhone as well.
</span><span class="cx">     [getUIPopoverPresentationControllerClass() _setAlwaysAllowPopoverPresentations:YES];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/ios/UIKitSPI.h (209281 => 209282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/UIKitSPI.h        2016-12-02 23:36:50 UTC (rev 209281)
+++ trunk/Source/WebCore/platform/spi/ios/UIKitSPI.h        2016-12-03 00:22:00 UTC (rev 209282)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import &lt;UIKit/UIInterface_Private.h&gt;
</span><span class="cx"> #import &lt;UIKit/UIPopoverPresentationController_Private.h&gt;
</span><span class="cx"> #import &lt;UIKit/UIScreen_Private.h&gt;
</span><ins>+#import &lt;UIKit/UIViewController_Private.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> #else
</span><span class="cx"> 
</span><span class="lines">@@ -64,4 +65,8 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+@interface UIViewController ()
++ (UIViewController *)viewControllerForView:(UIView *)view;
+@end
+
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>