<!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>[198363] trunk</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/198363">198363</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-03-17 17:50:46 -0700 (Thu, 17 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Find-in-page indicator in Mail viewer is the wrong scale and cut off
https://bugs.webkit.org/show_bug.cgi?id=155605
<rdar://problem/23948165>
Reviewed by Simon Fraser.
Source/WebKit2:
* UIProcess/mac/WKTextFinderClient.mm:
(-[WKTextFinderClient didGetImageForMatchResult:]):
Initialize the NSImage with the correct size, instead of inferring the
size from the bitmap, so that we don't lose information about device pixel ratio.
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm:
(TEST):
Add a test that ensures that the find result image is correctly @2x.
The NSImage size should be in points.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKTextFinderClientmm">trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaFindInPagemm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198362 => 198363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-18 00:46:04 UTC (rev 198362)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-18 00:50:46 UTC (rev 198363)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-17 Tim Horton <timothy_horton@apple.com>
+
+ Find-in-page indicator in Mail viewer is the wrong scale and cut off
+ https://bugs.webkit.org/show_bug.cgi?id=155605
+ <rdar://problem/23948165>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/mac/WKTextFinderClient.mm:
+ (-[WKTextFinderClient didGetImageForMatchResult:]):
+ Initialize the NSImage with the correct size, instead of inferring the
+ size from the bitmap, so that we don't lose information about device pixel ratio.
+
</ins><span class="cx"> 2016-03-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove use of dyld_register_image_state_change_handler() in PluginProcessMac.mm
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKTextFinderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm (198362 => 198363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm 2016-03-18 00:46:04 UTC (rev 198362)
+++ trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm 2016-03-18 00:50:46 UTC (rev 198363)
</span><span class="lines">@@ -248,8 +248,11 @@
</span><span class="cx"> if (_imageReplyCallbacks.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ IntSize size = image->bitmap()->size();
+ size.scale(1 / _page->deviceScaleFactor());
+
</ins><span class="cx"> auto imageCallback = _imageReplyCallbacks.takeFirst();
</span><del>- imageCallback([[[NSImage alloc] initWithCGImage:image->bitmap()->makeCGImage().get() size:NSZeroSize] autorelease]);
</del><ins>+ imageCallback(adoptNS([[NSImage alloc] initWithCGImage:image->bitmap()->makeCGImage().get() size:size]).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark - WKTextFinderMatch callbacks
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198362 => 198363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-18 00:46:04 UTC (rev 198362)
+++ trunk/Tools/ChangeLog 2016-03-18 00:50:46 UTC (rev 198363)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-17 Tim Horton <timothy_horton@apple.com>
+
+ Find-in-page indicator in Mail viewer is the wrong scale and cut off
+ https://bugs.webkit.org/show_bug.cgi?id=155605
+ <rdar://problem/23948165>
+
+ Reviewed by Simon Fraser.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm:
+ (TEST):
+ Add a test that ensures that the find result image is correctly @2x.
+ The NSImage size should be in points.
+
</ins><span class="cx"> 2016-03-16 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r198187.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaFindInPagemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm (198362 => 198363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm 2016-03-18 00:46:04 UTC (rev 198362)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FindInPage.mm 2016-03-18 00:50:46 UTC (rev 198363)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx">
</span><span class="cx"> @protocol NSTextFinderAsynchronousDocumentFindMatch <NSObject>
</span><span class="cx"> @property (retain, nonatomic, readonly) NSArray *textRects;
</span><ins>+- (void)generateTextImage:(void (^)(NSImage *generatedImage))completionHandler;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface WKWebView (NSTextFinderSupport)
</span><span class="lines">@@ -63,6 +64,7 @@
</span><span class="cx"> TEST(WebKit2, FindInPage)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
</span><ins>+ [webView _setOverrideDeviceScaleFactor:2];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<FindInPageNavigationDelegate> delegate = adoptNS([[FindInPageNavigationDelegate alloc] init]);
</span><span class="cx"> [webView setNavigationDelegate:delegate.get()];
</span><span class="lines">@@ -119,6 +121,24 @@
</span><span class="cx"> }];
</span><span class="cx">
</span><span class="cx"> TestWebKitAPI::Util::run(&findMatchesDone);
</span><ins>+ findMatchesDone = false;
+
+ // Ensure that the generated image has the correct DPI.
+ [webView findMatchesForString:@"Birthday" relativeToMatch:nil findOptions:noFindOptions maxResults:NSUIntegerMax resultCollector:^(NSArray *matches, BOOL didWrap) {
+ EXPECT_EQ((NSUInteger)360, matches.count);
+
+ id <NSTextFinderAsynchronousDocumentFindMatch> firstMatch = [matches objectAtIndex:0];
+ [firstMatch generateTextImage:^(NSImage *image) {
+ CGImageRef CGImage = [image CGImageForProposedRect:nil context:nil hints:nil];
+ EXPECT_EQ(image.size.width, CGImageGetWidth(CGImage) / 2);
+ EXPECT_EQ(image.size.height, CGImageGetHeight(CGImage) / 2);
+
+ findMatchesDone = true;
+ }];
+ }];
+
+ TestWebKitAPI::Util::run(&findMatchesDone);
+ findMatchesDone = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>