<!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>[169084] trunk/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/169084">169084</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-05-19 16:56:55 -0700 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Standalone images need to take topContentInset into account
https://bugs.webkit.org/show_bug.cgi?id=133092
-and corresponding-
<rdar://problem/16945791>
Reviewed by Darin Adler.
The FrameView’s size is accurate in terms of the NSWindow size, but that is not
really what the ImageDocument code is looking for here. The ImageDocument wants to
know the size of the unobscured viewport area. We should use visibleSize() for
that.
* html/ImageDocument.cpp:
(WebCore::ImageDocument::scale):
(WebCore::ImageDocument::imageFitsInWindow):
(WebCore::ImageDocument::imageClicked):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlImageDocumentcpp">trunk/Source/WebCore/html/ImageDocument.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169083 => 169084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-19 23:55:47 UTC (rev 169083)
+++ trunk/Source/WebCore/ChangeLog 2014-05-19 23:56:55 UTC (rev 169084)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-19 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION: Standalone images need to take topContentInset into account
+ https://bugs.webkit.org/show_bug.cgi?id=133092
+ -and corresponding-
+ <rdar://problem/16945791>
+
+ Reviewed by Darin Adler.
+
+ The FrameView’s size is accurate in terms of the NSWindow size, but that is not
+ really what the ImageDocument code is looking for here. The ImageDocument wants to
+ know the size of the unobscured viewport area. We should use visibleSize() for
+ that.
+ * html/ImageDocument.cpp:
+ (WebCore::ImageDocument::scale):
+ (WebCore::ImageDocument::imageFitsInWindow):
+ (WebCore::ImageDocument::imageClicked):
+
</ins><span class="cx"> 2014-05-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Collect web timing data on iOS.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageDocument.cpp (169083 => 169084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageDocument.cpp 2014-05-19 23:55:47 UTC (rev 169083)
+++ trunk/Source/WebCore/html/ImageDocument.cpp 2014-05-19 23:56:55 UTC (rev 169084)
</span><span class="lines">@@ -280,8 +280,9 @@
</span><span class="cx">
</span><span class="cx"> LayoutSize imageSize = this->imageSize();
</span><span class="cx">
</span><del>- float widthScale = view->width() / imageSize.width().toFloat();
- float heightScale = view->height() / imageSize.height().toFloat();
</del><ins>+ IntSize viewportSize = view->visibleSize();
+ float widthScale = viewportSize.width() / imageSize.width().toFloat();
+ float heightScale = viewportSize.height() / imageSize.height().toFloat();
</ins><span class="cx">
</span><span class="cx"> return std::min(widthScale, heightScale);
</span><span class="cx"> }
</span><span class="lines">@@ -327,8 +328,8 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> LayoutSize imageSize = this->imageSize();
</span><del>- LayoutSize windowSize = LayoutSize(view->width(), view->height());
- return imageSize.width() <= windowSize.width() && imageSize.height() <= windowSize.height();
</del><ins>+ IntSize viewportSize = view->visibleSize();
+ return imageSize.width() <= viewportSize.width() && imageSize.height() <= viewportSize.height();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -382,8 +383,9 @@
</span><span class="cx">
</span><span class="cx"> float scale = this->scale();
</span><span class="cx">
</span><del>- int scrollX = static_cast<int>(x / scale - view()->width() / 2.0f);
- int scrollY = static_cast<int>(y / scale - view()->height() / 2.0f);
</del><ins>+ IntSize viewportSize = view()->visibleSize();
+ int scrollX = static_cast<int>(x / scale - viewportSize.width() / 2.0f);
+ int scrollY = static_cast<int>(y / scale - viewportSize.height() / 2.0f);
</ins><span class="cx">
</span><span class="cx"> view()->setScrollPosition(IntPoint(scrollX, scrollY));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>