<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[19961] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/19961">19961</a></dd>
<dt>Author</dt> <dd>bdash</dd>
<dt>Date</dt> <dd>2007-03-05 01:39:15 -0800 (Mon, 05 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>2007-03-05 Mark Rowe <mrowe@apple.com>
Reviewed by Lars.
Fix http://bugs.webkit.org/show_bug.cgi?id=12947
Bug 12947: REGRESSION: ASSERTION FAILED: maxWidth >= 0 in StringTruncator.cpp:109 in WebCore::truncateString()
Handle nil window correctly in toUserSpace and toDeviceSpace. On Intel Mac's a message to nil that returns a
float will return 0.0. We use this as the divisor in calculating a scale factor, which results in NaN being
introduced into our rect.
* platform/mac/ScreenMac.mm:
(WebCore::toUserSpace):
(WebCore::toDeviceSpace):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformmacScreenMacmm">trunk/WebCore/platform/mac/ScreenMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (19960 => 19961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-03-05 09:07:41 UTC (rev 19960)
+++ trunk/WebCore/ChangeLog 2007-03-05 09:39:15 UTC (rev 19961)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2007-03-05 Mark Rowe <mrowe@apple.com>
+
+ Reviewed by Lars.
+
+ Fix http://bugs.webkit.org/show_bug.cgi?id=12947
+ Bug 12947: REGRESSION: ASSERTION FAILED: maxWidth >= 0 in StringTruncator.cpp:109 in WebCore::truncateString()
+
+ Handle nil window correctly in toUserSpace and toDeviceSpace. On Intel Mac's a message to nil that returns a
+ float will return 0.0. We use this as the divisor in calculating a scale factor, which results in NaN being
+ introduced into our rect.
+
+ * platform/mac/ScreenMac.mm:
+ (WebCore::toUserSpace):
+ (WebCore::toDeviceSpace):
+
</ins><span class="cx"> 2007-03-05 Rob Buis <buis@kde.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin.
</span></span></pre></div>
<a id="trunkWebCoreplatformmacScreenMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/mac/ScreenMac.mm (19960 => 19961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/mac/ScreenMac.mm 2007-03-05 09:07:41 UTC (rev 19960)
+++ trunk/WebCore/platform/mac/ScreenMac.mm 2007-03-05 09:39:15 UTC (rev 19961)
</span><span class="lines">@@ -83,16 +83,18 @@
</span><span class="cx"> FloatRect toUserSpace(const NSRect& rect, NSWindow *destination)
</span><span class="cx"> {
</span><span class="cx"> FloatRect userRect = rect;
</span><del>- userRect.setY(NSMaxY([[destination screen] frame]) - (userRect.y() + userRect.height())); // flip
- userRect.scale(1 / [destination userSpaceScaleFactor]); // scale down
</del><ins>+ userRect.setY(NSMaxY([screenForWindow(destination) frame]) - (userRect.y() + userRect.height())); // flip
+ if (destination)
+ userRect.scale(1 / [destination userSpaceScaleFactor]); // scale down
</ins><span class="cx"> return userRect;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSRect toDeviceSpace(const FloatRect& rect, NSWindow *source)
</span><span class="cx"> {
</span><span class="cx"> FloatRect deviceRect = rect;
</span><del>- deviceRect.scale([source userSpaceScaleFactor]); // scale up
- deviceRect.setY(NSMaxY([[source screen] frame]) - (deviceRect.y() + deviceRect.height())); // flip
</del><ins>+ if (source)
+ deviceRect.scale([source userSpaceScaleFactor]); // scale up
+ deviceRect.setY(NSMaxY([screenForWindow(source) frame]) - (deviceRect.y() + deviceRect.height())); // flip
</ins><span class="cx"> return deviceRect;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>