<!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>[171567] 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/171567">171567</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 18:05:14 -0700 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK1] CSS viewport units use the wrong viewport size in WebKit1
https://bugs.webkit.org/show_bug.cgi?id=135254
<rdar://problem/17781423>
Reviewed by Tim Horton.
Source/WebCore:
Test: fast/css/viewport-units-dynamic.html
In WebKit1 on iOS, we want to resolve viewport units against the visible
viewport, not the legacy WK1 notion of the "viewport" which is the entire document.
Fixes rendering of medium.com articles in WK1 views on iPad.
* page/FrameView.cpp:
(WebCore::FrameView::viewportSizeForCSSViewportUnits):
LayoutTests:
New test that ensures that viewport units are resolved against the correct
viewport size after the first style recalc.
* fast/css/viewport-units-dynamic.html: Added.
* platform/mac/fast/css/viewport-units-dynamic-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssviewportunitsdynamichtml">trunk/LayoutTests/fast/css/viewport-units-dynamic.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssviewportunitsdynamicexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/viewport-units-dynamic-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171566 => 171567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-07-25 01:03:00 UTC (rev 171566)
+++ trunk/LayoutTests/ChangeLog        2014-07-25 01:05:14 UTC (rev 171567)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-07-24 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK1] CSS viewport units use the wrong viewport size in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=135254
+ <rdar://problem/17781423>
+
+ Reviewed by Tim Horton.
+
+ New test that ensures that viewport units are resolved against the correct
+ viewport size after the first style recalc.
+
+ * fast/css/viewport-units-dynamic.html: Added.
+ * platform/mac/fast/css/viewport-units-dynamic-expected.txt: Added.
+
</ins><span class="cx"> 2014-07-24 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when measuring a glyphs from a fallback SVG font
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssviewportunitsdynamichtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/viewport-units-dynamic.html (0 => 171567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/viewport-units-dynamic.html         (rev 0)
+++ trunk/LayoutTests/fast/css/viewport-units-dynamic.html        2014-07-25 01:05:14 UTC (rev 171567)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ height: 10000px;
+ width: 10000px;
+ margin: 0;
+ }
+ .box {
+ position: absolute;
+ background-color: rgba(0, 0, 0, 0.5);
+ border: 5px solid black;
+ box-sizing: border-box;
+ }
+
+ .width {
+ width: 100px;
+ height: 100px;
+ padding-left: 100px;
+ }
+
+ .height {
+ height: 100px;
+ width: 100px;
+ padding-top: 100px;
+ }
+
+ body.changed .height {
+ height: 100vh;
+ }
+
+ body.changed .width {
+ width: 100vw;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ function doTest()
+ {
+ window.setTimeout(function() {
+ document.body.classList.add('changed');
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<div class="box width">
+ This should be as wide as the CSS viewport.
+</div>
+
+<div id="vertical" class="box height">
+ This should be as tall as the CSS viewport.
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssviewportunitsdynamicexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/css/viewport-units-dynamic-expected.txt (0 => 171567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/viewport-units-dynamic-expected.txt         (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/css/viewport-units-dynamic-expected.txt        2014-07-25 01:05:14 UTC (rev 171567)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+layer at (0,0) size 10000x10000
+ RenderView at (0,0) size 785x585
+layer at (0,0) size 785x10000
+ RenderBlock {HTML} at (0,0) size 785x10000
+ RenderBody {BODY} at (0,0) size 10000x10000
+layer at (0,0) size 800x100
+ RenderBlock (positioned) {DIV} at (0,0) size 800x100 [bgcolor=#0000007F] [border: (5px solid #000000)]
+ RenderText {#text} at (105,5) size 282x18
+ text run at (105,5) width 282: "This should be as wide as the CSS viewport."
+layer at (0,0) size 100x600
+ RenderBlock (positioned) {DIV} at (0,0) size 100x600 [bgcolor=#0000007F] [border: (5px solid #000000)]
+ RenderText {#text} at (5,105) size 74x72
+ text run at (5,105) width 74: "This should"
+ text run at (5,123) width 72: "be as tall as"
+ text run at (5,141) width 52: "the CSS"
+ text run at (5,159) width 60: "viewport."
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171566 => 171567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-25 01:03:00 UTC (rev 171566)
+++ trunk/Source/WebCore/ChangeLog        2014-07-25 01:05:14 UTC (rev 171567)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-07-24 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK1] CSS viewport units use the wrong viewport size in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=135254
+ <rdar://problem/17781423>
+
+ Reviewed by Tim Horton.
+
+ Test: fast/css/viewport-units-dynamic.html
+
+ In WebKit1 on iOS, we want to resolve viewport units against the visible
+ viewport, not the legacy WK1 notion of the "viewport" which is the entire document.
+
+ Fixes rendering of medium.com articles in WK1 views on iPad.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::viewportSizeForCSSViewportUnits):
+
</ins><span class="cx"> 2014-07-24 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when measuring a glyphs from a fallback SVG font
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (171566 => 171567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp        2014-07-25 01:03:00 UTC (rev 171566)
+++ trunk/Source/WebCore/page/FrameView.cpp        2014-07-25 01:05:14 UTC (rev 171567)
</span><span class="lines">@@ -4522,7 +4522,7 @@
</span><span class="cx"> if (m_hasOverrideViewportSize)
</span><span class="cx"> return m_overrideViewportSize;
</span><span class="cx">
</span><del>- return visibleContentRectIncludingScrollbars(ScrollableArea::LegacyIOSDocumentVisibleRect).size();
</del><ins>+ return visibleContentRectIncludingScrollbars().size();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>