<!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>[187427] branches/safari-601.1-branch/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/187427">187427</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-27 00:07:22 -0700 (Mon, 27 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187391">r187391</a>. rdar://problem/21905839</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCorebindingsobjcDOMmm">branches/safari-601.1-branch/Source/WebCore/bindings/objc/DOM.mm</a></li>
<li><a href="#branchessafari6011branchSourceWebCorebindingsobjcDOMExtensionsh">branches/safari-601.1-branch/Source/WebCore/bindings/objc/DOMExtensions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187426 => 187427)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-27 07:06:32 UTC (rev 187426)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-27 07:07:22 UTC (rev 187427)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-07-27 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187391.
+
+ 2015-07-25 Tim Horton <timothy_horton@apple.com>
+
+ Expose TextIndicator-backed snapshot and rect gathering on DOMNode
+ https://bugs.webkit.org/show_bug.cgi?id=147298
+ <rdar://problem/21905839>
+
+ Reviewed by Sam Weinig.
+
+ * bindings/objc/DOM.mm:
+ (-[DOMNode getPreviewSnapshotImage:andRects:]):
+ * bindings/objc/DOMExtensions.h:
+
+2015-07-27 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r187386.
</span><span class="cx">
</span><span class="cx"> 2015-07-25 Chris Fleizach <cfleizach@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorebindingsobjcDOMmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/bindings/objc/DOM.mm (187426 => 187427)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/bindings/objc/DOM.mm 2015-07-27 07:06:32 UTC (rev 187426)
+++ branches/safari-601.1-branch/Source/WebCore/bindings/objc/DOM.mm 2015-07-27 07:07:22 UTC (rev 187427)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> #import "Range.h"
</span><span class="cx"> #import "RenderImage.h"
</span><span class="cx"> #import "ScriptController.h"
</span><ins>+#import "TextIndicator.h"
</ins><span class="cx"> #import "WebScriptObjectPrivate.h"
</span><span class="cx"> #import <JavaScriptCore/APICast.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="lines">@@ -541,6 +542,48 @@
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><ins>+- (void)getPreviewSnapshotImage:(CGImageRef*)cgImage andRects:(NSArray **)rects
+{
+ if (!cgImage || !rects)
+ return;
+
+ *cgImage = nullptr;
+ *rects = nullptr;
+
+ Node* coreNode = core(self);
+
+ Ref<Range> range = rangeOfContents(*coreNode);
+
+ float deviceScaleFactor = coreNode->document().deviceScaleFactor();
+ const float margin = 4 * deviceScaleFactor;
+ RefPtr<TextIndicator> textIndicator = TextIndicator::createWithRange(range, TextIndicatorPresentationTransition::None, margin);
+
+ if (!textIndicator)
+ return;
+
+ if (Image* image = textIndicator->contentImage())
+ *cgImage = (CGImageRef)CFAutorelease(CGImageRetain(image->getCGImageRef()));
+
+ RetainPtr<NSMutableArray> rectArray = adoptNS([[NSMutableArray alloc] init]);
+
+ if (*cgImage) {
+ FloatPoint origin = textIndicator->textBoundingRectInRootViewCoordinates().location();
+ for (const FloatRect& rect : textIndicator->textRectsInBoundingRectCoordinates()) {
+ CGRect cgRect = rect;
+ cgRect.origin.x += origin.x();
+ cgRect.origin.y += origin.y();
+ cgRect = coreNode->document().frame()->view()->contentsToWindow(enclosingIntRect(cgRect));
+ [rectArray addObject:[NSValue value:&cgRect withObjCType:@encode(CGRect)]];
+ }
+ } else {
+ CGRect cgRect = CGRectInset(range->boundingRect(), -margin, -margin);
+ cgRect = coreNode->document().frame()->view()->contentsToWindow(enclosingIntRect(cgRect));
+ [rectArray addObject:[NSValue value:&cgRect withObjCType:@encode(CGRect)]];
+ }
+
+ *rects = rectArray.autorelease();
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation DOMNode (DOMNodeExtensionsPendingPublic)
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorebindingsobjcDOMExtensionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/bindings/objc/DOMExtensions.h (187426 => 187427)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/bindings/objc/DOMExtensions.h 2015-07-27 07:06:32 UTC (rev 187426)
+++ branches/safari-601.1-branch/Source/WebCore/bindings/objc/DOMExtensions.h 2015-07-27 07:07:22 UTC (rev 187427)
</span><span class="lines">@@ -109,6 +109,8 @@
</span><span class="cx"> - (DOMNode *)nextFocusNode;
</span><span class="cx"> - (DOMNode *)previousFocusNode;
</span><span class="cx"> #endif
</span><ins>+
+- (void)getPreviewSnapshotImage:(CGImageRef*)cgImage andRects:(NSArray **)rects;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DOMElement (DOMElementAppKitExtensions)
</span></span></pre>
</div>
</div>
</body>
</html>