<!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>[177997] trunk/Tools</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/177997">177997</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 14:47:58 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix API tests that are broken under HiDPI
https://bugs.webkit.org/show_bug.cgi?id=140146
Reviewed by Tim Horton.
* TestWebKitAPI/Tests/WebKit2/FindMatches.mm:
(TestWebKitAPI::didGetImageForMatchResult):
NSImages are measured in points, so grab the underlying bitmap image and get its size in pixels.
* TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm:
(TestWebKitAPI::DeviceScaleFactorOnBack::runTest):
Don't assume that a web view not in a window has a backing scale factor of 1. Instead, always have web views start
out in a window that has a backing scale factor of 1.
* TestWebKitAPI/Tests/mac/DynamicDeviceScaleFactor.mm:
(TestWebKitAPI::DynamicDeviceScaleFactor::runTest):
Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2FindMatchesmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacDeviceScaleFactorOnBackmm">trunk/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacDynamicDeviceScaleFactormm">trunk/Tools/TestWebKitAPI/Tests/mac/DynamicDeviceScaleFactor.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (177996 => 177997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-01-06 22:32:48 UTC (rev 177996)
+++ trunk/Tools/ChangeLog        2015-01-06 22:47:58 UTC (rev 177997)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-06 Anders Carlsson <andersca@apple.com>
+
+ Fix API tests that are broken under HiDPI
+ https://bugs.webkit.org/show_bug.cgi?id=140146
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebKit2/FindMatches.mm:
+ (TestWebKitAPI::didGetImageForMatchResult):
+ NSImages are measured in points, so grab the underlying bitmap image and get its size in pixels.
+
+ * TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm:
+ (TestWebKitAPI::DeviceScaleFactorOnBack::runTest):
+ Don't assume that a web view not in a window has a backing scale factor of 1. Instead, always have web views start
+ out in a window that has a backing scale factor of 1.
+
+ * TestWebKitAPI/Tests/mac/DynamicDeviceScaleFactor.mm:
+ (TestWebKitAPI::DynamicDeviceScaleFactor::runTest):
+ Ditto.
+
</ins><span class="cx"> 2015-01-06 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> ADDRESS_SANITIZER macro is overloaded
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2FindMatchesmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm (177996 => 177997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm        2015-01-06 22:32:48 UTC (rev 177996)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm        2015-01-06 22:47:58 UTC (rev 177997)
</span><span class="lines">@@ -104,9 +104,14 @@
</span><span class="cx"> DOMNode *target = [document getElementById:@"target"];
</span><span class="cx"> [range selectNode:target];
</span><span class="cx"> NSImage *expectedImage = [range renderedImageForcingBlackText:YES];
</span><del>- NSSize expectedSize = [expectedImage size];
- EXPECT_EQ(size.width, expectedSize.width);
- EXPECT_EQ(size.height, expectedSize.height);
</del><ins>+ EXPECT_EQ(1u, expectedImage.representations.count);
+ EXPECT_TRUE([expectedImage.representations[0] isKindOfClass:[NSBitmapImageRep class]]);
+
+ NSInteger expectedWidth = ((NSBitmapImageRep *)expectedImage.representations[0]).pixelsWide;
+ NSInteger expectedHeight = ((NSBitmapImageRep *)expectedImage.representations[0]).pixelsHigh;
+
+ EXPECT_EQ(size.width, expectedWidth);
+ EXPECT_EQ(size.height, expectedHeight);
</ins><span class="cx"> didCallGetImage = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacDeviceScaleFactorOnBackmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm (177996 => 177997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm        2015-01-06 22:32:48 UTC (rev 177996)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm        2015-01-06 22:47:58 UTC (rev 177997)
</span><span class="lines">@@ -72,6 +72,9 @@
</span><span class="cx"> template <typename View>
</span><span class="cx"> void DeviceScaleFactorOnBack::runTest(View view)
</span><span class="cx"> {
</span><ins>+ RetainPtr<SyntheticBackingScaleFactorWindow> window1 = createWindow();
+ [[window1 contentView] addSubview:view];
+
</ins><span class="cx"> EXPECT_JS_EQ(view, "window.devicePixelRatio", "1");
</span><span class="cx"> EXPECT_JS_EQ(view, "devicePixelRatioFromStyle()", "1");
</span><span class="cx">
</span><span class="lines">@@ -80,11 +83,10 @@
</span><span class="cx"> waitForLoadToFinish();
</span><span class="cx">
</span><span class="cx"> // Change the scale factor
</span><del>- RetainPtr<SyntheticBackingScaleFactorWindow> window1 = createWindow();
- [window1.get() setBackingScaleFactor:3];
</del><ins>+ RetainPtr<SyntheticBackingScaleFactorWindow> window2 = createWindow();
+ [window2 setBackingScaleFactor:3];
+ [[window2 contentView] addSubview:view];
</ins><span class="cx">
</span><del>- [[window1.get() contentView] addSubview:view];
-
</del><span class="cx"> // Navigate back to the first page
</span><span class="cx"> goBack(view);
</span><span class="cx"> waitForLoadToFinish();
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacDynamicDeviceScaleFactormm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/DynamicDeviceScaleFactor.mm (177996 => 177997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/DynamicDeviceScaleFactor.mm        2015-01-06 22:32:48 UTC (rev 177996)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/DynamicDeviceScaleFactor.mm        2015-01-06 22:47:58 UTC (rev 177997)
</span><span class="lines">@@ -55,26 +55,26 @@
</span><span class="cx"> template <typename View>
</span><span class="cx"> void DynamicDeviceScaleFactor::runTest(View view)
</span><span class="cx"> {
</span><ins>+ RetainPtr<SyntheticBackingScaleFactorWindow> window1 = createWindow();
+ [[window1 contentView] addSubview:view];
</ins><span class="cx"> EXPECT_JS_EQ(view, "window.devicePixelRatio", "1");
</span><span class="cx"> EXPECT_JS_EQ(view, "devicePixelRatioFromStyle()", "1");
</span><span class="cx">
</span><del>- RetainPtr<SyntheticBackingScaleFactorWindow> window1 = createWindow();
- [window1.get() setBackingScaleFactor:3];
</del><ins>+ RetainPtr<SyntheticBackingScaleFactorWindow> window2 = createWindow();
+ [window2 setBackingScaleFactor:3];
</ins><span class="cx">
</span><del>- [[window1.get() contentView] addSubview:view];
</del><ins>+ [[window2 contentView] addSubview:view];
</ins><span class="cx"> EXPECT_JS_EQ(view, "window.devicePixelRatio", "3");
</span><span class="cx"> EXPECT_JS_EQ(view, "devicePixelRatioFromStyle()", "3");
</span><span class="cx">
</span><del>- RetainPtr<SyntheticBackingScaleFactorWindow> window2 = createWindow();
- [window2.get() setBackingScaleFactor:4];
</del><ins>+ RetainPtr<SyntheticBackingScaleFactorWindow> window3 = createWindow();
+ [window3 setBackingScaleFactor:4];
</ins><span class="cx">
</span><del>- [[window2.get() contentView] addSubview:view];
</del><ins>+ [[window3 contentView] addSubview:view];
</ins><span class="cx"> EXPECT_JS_EQ(view, "window.devicePixelRatio", "4");
</span><span class="cx"> EXPECT_JS_EQ(view, "devicePixelRatioFromStyle()", "4");
</span><span class="cx">
</span><span class="cx"> [view removeFromSuperview];
</span><del>- EXPECT_JS_EQ(view, "window.devicePixelRatio", "1");
- EXPECT_JS_EQ(view, "devicePixelRatioFromStyle()", "1");
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(DynamicDeviceScaleFactor, WebKit)
</span></span></pre>
</div>
</div>
</body>
</html>