<!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>[166409] trunk/Source/WebKit/ios</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/166409">166409</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-03-28 09:18:01 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for AirPlay picker for iOS.
https://bugs.webkit.org/show_bug.cgi?id=130876
<rdar://problem/15349859>
Reviewed by Benjamin Poulain.
Adds support for the AirPlay picker for WebKit.
The actual picker is implemented in UIKit.
* DefaultDelegates/WebDefaultUIKitDelegate.m:
(-[WebDefaultUIKitDelegate interactionLocation]):
(-[WebDefaultUIKitDelegate showPlaybackTargetPicker:fromRect:]):
* WebCoreSupport/WebChromeClientIOS.mm:
(WebChromeClientIOS::showPlaybackTargetPicker):
* WebCoreSupport/WebFrameIOS.h:
* WebCoreSupport/WebFrameIOS.mm:
(-[WebFrame elementRectAtPoint:]):
* WebView/WebUIKitDelegate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosDefaultDelegatesWebDefaultUIKitDelegatem">trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.m</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSmm">trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebFrameIOSh">trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebFrameIOSmm">trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm</a></li>
<li><a href="#trunkSourceWebKitiosWebViewWebUIKitDelegateh">trunk/Source/WebKit/ios/WebView/WebUIKitDelegate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (166408 => 166409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-03-28 15:49:39 UTC (rev 166408)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-03-28 16:18:01 UTC (rev 166409)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-03-27 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><ins>+ Add support for AirPlay picker for iOS.
+ https://bugs.webkit.org/show_bug.cgi?id=130876
+ <rdar://problem/15349859>
+
+ Reviewed by Benjamin Poulain.
+
+ Adds support for the AirPlay picker for WebKit.
+ The actual picker is implemented in UIKit.
+
+ * DefaultDelegates/WebDefaultUIKitDelegate.m:
+ (-[WebDefaultUIKitDelegate interactionLocation]):
+ (-[WebDefaultUIKitDelegate showPlaybackTargetPicker:fromRect:]):
+ * WebCoreSupport/WebChromeClientIOS.mm:
+ (WebChromeClientIOS::showPlaybackTargetPicker):
+ * WebCoreSupport/WebFrameIOS.h:
+ * WebCoreSupport/WebFrameIOS.mm:
+ (-[WebFrame elementRectAtPoint:]):
+ * WebView/WebUIKitDelegate.h:
+
+2014-03-27 Enrica Casucci <enrica@apple.com>
+
</ins><span class="cx"> Add support for AirPlay picker in WK2 for iOS.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130855
</span><span class="cx"> <rdar://problem/15349859>
</span></span></pre></div>
<a id="trunkSourceWebKitiosDefaultDelegatesWebDefaultUIKitDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.m (166408 => 166409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.m 2014-03-28 15:49:39 UTC (rev 166408)
+++ trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.m 2014-03-28 16:18:01 UTC (rev 166409)
</span><span class="lines">@@ -236,6 +236,15 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (CGPoint)interactionLocation
+{
+ return CGPointZero;
+}
+
+- (void)showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(CGRect)elementRect
+{
+}
+
</ins><span class="cx"> - (BOOL)hasRichlyEditableSelection
</span><span class="cx"> {
</span><span class="cx"> return NO;
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm (166408 => 166409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2014-03-28 15:49:39 UTC (rev 166408)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2014-03-28 16:18:01 UTC (rev 166409)
</span><span class="lines">@@ -316,6 +316,9 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClientIOS::showPlaybackTargetPicker(bool hasVideo)
</span><span class="cx"> {
</span><ins>+ CGPoint point = [[webView() _UIKitDelegateForwarder] interactionLocation];
+ CGRect elementRect = [[webView() mainFrame] elementRectAtPoint:point];
+ [[webView() _UIKitDelegateForwarder] showPlaybackTargetPicker:hasVideo fromRect:elementRect];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebFrameIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h (166408 => 166409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h 2014-03-28 15:49:39 UTC (rev 166408)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h 2014-03-28 16:18:01 UTC (rev 166409)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx"> - (WebVisiblePosition *)previousUnperturbedDictationResultBoundaryFromPosition:(WebVisiblePosition *)position;
</span><span class="cx"> - (WebVisiblePosition *)nextUnperturbedDictationResultBoundaryFromPosition:(WebVisiblePosition *)position;
</span><span class="cx">
</span><ins>+- (CGRect)elementRectAtPoint:(CGPoint)point;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm (166408 => 166409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm 2014-03-28 15:49:39 UTC (rev 166408)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm 2014-03-28 16:18:01 UTC (rev 166409)
</span><span class="lines">@@ -943,6 +943,17 @@
</span><span class="cx"> return position;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (CGRect)elementRectAtPoint:(CGPoint)point
+{
+ Frame *frame = [self coreFrame];
+ IntPoint adjustedPoint = frame->view()->windowToContents(roundedIntPoint(point));
+ HitTestResult result = frame->eventHandler().hitTestResultAtPoint(adjustedPoint, HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::AllowChildFrameContent);
+ Node* hitNode = result.innerNode();
+ if (!hitNode || !hitNode->renderer())
+ return IntRect();
+ return result.innerNodeFrame()->view()->contentsToWindow(hitNode->renderer()->absoluteBoundingBoxRect(true));
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebViewWebUIKitDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebView/WebUIKitDelegate.h (166408 => 166409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebView/WebUIKitDelegate.h 2014-03-28 15:49:39 UTC (rev 166408)
+++ trunk/Source/WebKit/ios/WebView/WebUIKitDelegate.h 2014-03-28 16:18:01 UTC (rev 166409)
</span><span class="lines">@@ -108,6 +108,8 @@
</span><span class="cx"> - (BOOL)hasRichlyEditableSelection;
</span><span class="cx"> - (BOOL)performsTwoStepPaste:(DOMDocumentFragment*)fragment;
</span><span class="cx"> - (NSInteger)getPasteboardChangeCount;
</span><ins>+- (CGPoint)interactionLocation;
+- (void)showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(CGRect)elementRect;
</ins><span class="cx">
</span><span class="cx"> - (BOOL)isUnperturbedDictationResultMarker:(id)metadataForMarker;
</span><span class="cx"> - (void)webView:(WebView *)webView addMessageToConsole:(NSDictionary *)message withSource:(NSString *)source;
</span></span></pre>
</div>
</div>
</body>
</html>