[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [31915] trunk
From: hyatt () apple ! com
Date: 2008-04-15 19:21:42
Message-ID: 20080415192142.6439A159C84D () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; \
padding: 6px; } #msg ul { 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>[31915] trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/31915">31915</a></dd> \
<dt>Author</dt> <dd>hyatt@apple.com</dd> <dt>Date</dt> <dd>2008-04-15 12:21:38 -0700 \
(Tue, 15 Apr 2008)</dd> </dl>
<h3>Log Message</h3>
<pre>2008-04-15 David Hyatt <hyatt@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=18467
Make sure to ignore zoom:0. That is not supposed to actually do anything. \
It's a hack in IE to cause an element to set "hasLayout."
Reviewed by Anders
Added fast/css/zoom-property-parsing.html
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyProperty):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorecssCSSParsercpp">trunk/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkWebCorecssCSSStyleSelectorcpp">trunk/WebCore/css/CSSStyleSelector.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsszoompropertyparsinghtml">trunk/LayoutTests/fast/css/zoom-property-parsing.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsszoompropertyparsingexpectedchecksum"> \
trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.checksum</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsszoompropertyparsingexpectedpng">trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsszoompropertyparsingexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsfastcsszoompropertyparsinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/zoom-property-parsing.html \
(0 => 31915)</h4> <pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/zoom-property-parsing.html \
(rev 0)
+++ trunk/LayoutTests/fast/css/zoom-property-parsing.html 2008-04-15 19:21:38 UTC \
(rev 31915) </span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+<!doctype html>
+
+<div style="width: 250px; zoom: 0;">Lorem ipsum dolor sit amet, \
consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore \
magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi \
ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in \
voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat \
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est \
laborum.</div> </ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsszoompropertyparsingexpectedchecksum"></a>
<div class="addfile"><h4>Added: \
trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.checksum (0 => \
31915)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.checksum \
(rev 0)
+++ trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.checksum 2008-04-15 \
19:21:38 UTC (rev 31915) </span><span class="lines">@@ -0,0 +1 @@
</span><ins>+38f41f79fc6c203ea5ff5232a4fcfc56
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsszoompropertyparsingexpectedpng"></a>
<div class="binary"><h4>Added: \
trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.png</h4> <pre \
class="diff"><span> <span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: \
trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.png \
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:mime-type
</span><span class="cx"> + application/octet-stream
</span><a id="trunkLayoutTestsplatformmacfastcsszoompropertyparsingexpectedtxt"></a>
<div class="addfile"><h4>Added: \
trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.txt (0 => \
31915)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.txt \
(rev 0)
+++ trunk/LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.txt 2008-04-15 \
19:21:38 UTC (rev 31915) </span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x250
+ RenderBlock {HTML} at (0,0) size 800x250
+ RenderBody {BODY} at (8,8) size 784x234
+ RenderBlock {DIV} at (0,0) size 250x234
+ RenderText {#text} at (0,0) size 250x234
+ text run at (0,0) width 177: "Lorem ipsum dolor sit amet,"
+ text run at (0,18) width 215: "consectetur adipisicing elit, sed \
do" + text run at (0,36) width 242: "eiusmod tempor incididunt ut \
labore et" + text run at (0,54) width 250: "dolore magna aliqua. \
Ut enim ad minim" + text run at (0,72) width 208: "veniam, quis \
nostrud exercitation" + text run at (0,90) width 222: "ullamco \
laboris nisi ut aliquip ex ea" + text run at (0,108) width 231: \
"commodo consequat. Duis aute irure" + text run at (0,126) width \
245: "dolor in reprehenderit in voluptate velit" + text run at \
(0,144) width 207: "esse cillum dolore eu fugiat nulla" + text run \
at (0,162) width 204: "pariatur. Excepteur sint occaecat" + text \
run at (0,180) width 229: "cupidatat non proident, sunt in culpa" + \
text run at (0,198) width 233: "qui officia deserunt mollit anim id est" + \
text run at (0,216) width 56: "laborum." </ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (31914 => 31915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2008-04-15 19:03:19 UTC (rev 31914)
+++ trunk/WebCore/ChangeLog 2008-04-15 19:21:38 UTC (rev 31915)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2008-04-15 David Hyatt <hyatt@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=18467
+
+ Make sure to ignore zoom:0. That is not supposed to actually do anything. \
It's a hack in IE + to cause an element to set "hasLayout."
+
+ Reviewed by Anders
+
+ Added fast/css/zoom-property-parsing.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applyProperty):
+
</ins><span class="cx"> 2008-04-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Adam.
</span></span></pre></div>
<a id="trunkWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSParser.cpp (31914 => \
31915)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSParser.cpp 2008-04-15 19:03:19 UTC (rev \
31914)
+++ trunk/WebCore/css/CSSParser.cpp 2008-04-15 19:21:38 UTC (rev 31915)
</span><span class="lines">@@ -1080,7 +1080,7 @@
</span><span class="cx"> if (id == CSSValueNormal || id == CSSValueReset)
</span><span class="cx"> valid_primitive = true;
</span><span class="cx"> else
</span><del>- valid_primitive = (!id && validUnit(value, FNumber | \
FPercent, true)); </del><ins>+ valid_primitive = (!id && \
validUnit(value, FNumber | FPercent | FNonNeg, true)); </ins><span class="cx"> \
break; </span><span class="cx">
</span><span class="cx"> case CSSPropertyTableLayout: // auto | fixed | \
inherit </span></span></pre></div>
<a id="trunkWebCorecssCSSStyleSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSStyleSelector.cpp (31914 => \
31915)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSStyleSelector.cpp 2008-04-15 19:03:19 UTC \
(rev 31914)
+++ trunk/WebCore/css/CSSStyleSelector.cpp 2008-04-15 19:21:38 UTC (rev 31915)
</span><span class="lines">@@ -3575,10 +3575,13 @@
</span><span class="cx"> else if (primitiveValue->getIdent() == \
CSSValueReset) { </span><span class="cx"> \
m_style->setEffectiveZoom(RenderStyle::initialZoom()); </span><span class="cx"> \
m_style->setZoom(RenderStyle::initialZoom()); </span><del>- } else if (type \
== CSSPrimitiveValue::CSS_PERCENTAGE)
- m_style->setZoom(primitiveValue->getFloatValue() / 100.0f);
- else if (type == CSSPrimitiveValue::CSS_NUMBER)
- m_style->setZoom(primitiveValue->getFloatValue());
</del><ins>+ } else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) {
+ if (primitiveValue->getFloatValue())
+ m_style->setZoom(primitiveValue->getFloatValue() / 100.0f);
+ } else if (type == CSSPrimitiveValue::CSS_NUMBER) {
+ if (primitiveValue->getFloatValue())
+ m_style->setZoom(primitiveValue->getFloatValue());
+ }
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> // shorthand properties
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic