<!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>[41950] trunk/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/41950">41950</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2009-03-24 13:46:10 -0700 (Tue, 24 Mar 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>2009-03-24 Simon Fraser <simon.fraser@apple.com>
Reviewed by Dan Bernstein
https://bugs.webkit.org/show_bug.cgi?id=24782
Fix regression with CSS clip rects with non-length values, by reverting to
the original code, but passing the zoom multiplier through convertToLength().
Also make stylistic change in createTransformOperations(), renaming 'inStyle'
to 'style.
Tested by existing tests.
* css/CSSStyleSelector.cpp:
(WebCore::convertToLength):
(WebCore::CSSStyleSelector::applyProperty):
(WebCore::CSSStyleSelector::createTransformOperations):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorecssCSSStyleSelectorcpp">trunk/WebCore/css/CSSStyleSelector.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (41949 => 41950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2009-03-24 20:29:36 UTC (rev 41949)
+++ trunk/WebCore/ChangeLog 2009-03-24 20:46:10 UTC (rev 41950)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2009-03-24 Simon Fraser <simon.fraser@apple.com>
+
+ Reviewed by Dan Bernstein
+
+ https://bugs.webkit.org/show_bug.cgi?id=24782
+
+ Fix regression with CSS clip rects with non-length values, by reverting to
+ the original code, but passing the zoom multiplier through convertToLength().
+
+ Also make stylistic change in createTransformOperations(), renaming 'inStyle'
+ to 'style.
+
+ Tested by existing tests.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::convertToLength):
+ (WebCore::CSSStyleSelector::applyProperty):
+ (WebCore::CSSStyleSelector::createTransformOperations):
+
</ins><span class="cx"> 2009-03-24 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Simon Fraser
</span></span></pre></div>
<a id="trunkWebCorecssCSSStyleSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSStyleSelector.cpp (41949 => 41950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSStyleSelector.cpp 2009-03-24 20:29:36 UTC (rev 41949)
+++ trunk/WebCore/css/CSSStyleSelector.cpp 2009-03-24 20:46:10 UTC (rev 41950)
</span><span class="lines">@@ -2703,7 +2703,7 @@
</span><span class="cx"> // -------------------------------------------------------------------------------------
</span><span class="cx"> // this is mostly boring stuff on how to apply a certain rule to the renderstyle...
</span><span class="cx">
</span><del>-static Length convertToLength(CSSPrimitiveValue *primitiveValue, RenderStyle *style, bool *ok = 0)
</del><ins>+static Length convertToLength(CSSPrimitiveValue *primitiveValue, RenderStyle *style, double multiplier = 1, bool *ok = 0)
</ins><span class="cx"> {
</span><span class="cx"> // This function is tolerant of a null style value. The only place style is used is in
</span><span class="cx"> // length measurements, like 'ems' and 'px'. And in those cases style is only used
</span><span class="lines">@@ -2719,7 +2719,7 @@
</span><span class="cx"> if (ok)
</span><span class="cx"> *ok = false;
</span><span class="cx"> } else if (CSSPrimitiveValue::isUnitTypeLength(type))
</span><del>- l = Length(primitiveValue->computeLengthIntForLength(style), Fixed);
</del><ins>+ l = Length(primitiveValue->computeLengthIntForLength(style, multiplier), Fixed);
</ins><span class="cx"> else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><span class="cx"> l = Length(primitiveValue->getDoubleValue(), Percent);
</span><span class="cx"> else if (type == CSSPrimitiveValue::CSS_NUMBER)
</span><span class="lines">@@ -3954,11 +3954,10 @@
</span><span class="cx"> Rect* rect = primitiveValue->getRectValue();
</span><span class="cx"> if (!rect)
</span><span class="cx"> return;
</span><del>-
- top = Length(rect->top()->computeLengthIntForLength(style(), zoomFactor), Fixed);
- right = Length(rect->right()->computeLengthIntForLength(style(), zoomFactor), Fixed);
- bottom = Length(rect->bottom()->computeLengthIntForLength(style(), zoomFactor), Fixed);
- left = Length(rect->left()->computeLengthIntForLength(style(), zoomFactor), Fixed);
</del><ins>+ top = convertToLength(rect->top(), style(), zoomFactor);
+ right = convertToLength(rect->right(), style(), zoomFactor);
+ bottom = convertToLength(rect->bottom(), style(), zoomFactor);
+ left = convertToLength(rect->left(), style(), zoomFactor);
</ins><span class="cx"> } else if (primitiveValue->getIdent() != CSSValueAuto) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -4827,7 +4826,7 @@
</span><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> bool ok = true;
</span><del>- Length l = convertToLength(primitiveValue, style(), &ok);
</del><ins>+ Length l = convertToLength(primitiveValue, style(), 1, &ok);
</ins><span class="cx"> if (ok)
</span><span class="cx"> m_style->setMarqueeIncrement(l);
</span><span class="cx"> }
</span><span class="lines">@@ -5893,7 +5892,7 @@
</span><span class="cx"> return TransformOperation::NONE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSStyleSelector::createTransformOperations(CSSValue* inValue, RenderStyle* inStyle, TransformOperations& outOperations)
</del><ins>+bool CSSStyleSelector::createTransformOperations(CSSValue* inValue, RenderStyle* style, TransformOperations& outOperations)
</ins><span class="cx"> {
</span><span class="cx"> TransformOperations operations;
</span><span class="cx"> if (inValue && !inValue->isPrimitiveValue()) {
</span><span class="lines">@@ -5958,13 +5957,13 @@
</span><span class="cx"> Length tx = Length(0, Fixed);
</span><span class="cx"> Length ty = Length(0, Fixed);
</span><span class="cx"> if (val->operationType() == WebKitCSSTransformValue::TranslateYTransformOperation)
</span><del>- ty = convertToLength(firstValue, inStyle, &ok);
</del><ins>+ ty = convertToLength(firstValue, style, 1, &ok);
</ins><span class="cx"> else {
</span><del>- tx = convertToLength(firstValue, inStyle, &ok);
</del><ins>+ tx = convertToLength(firstValue, style, 1, &ok);
</ins><span class="cx"> if (val->operationType() != WebKitCSSTransformValue::TranslateXTransformOperation) {
</span><span class="cx"> if (val->length() > 1) {
</span><span class="cx"> CSSPrimitiveValue* secondValue = static_cast<CSSPrimitiveValue*>(val->itemWithoutBoundsCheck(1));
</span><del>- ty = convertToLength(secondValue, inStyle, &ok);
</del><ins>+ ty = convertToLength(secondValue, style, 1, &ok);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -5982,19 +5981,19 @@
</span><span class="cx"> Length ty = Length(0, Fixed);
</span><span class="cx"> Length tz = Length(0, Fixed);
</span><span class="cx"> if (val->operationType() == WebKitCSSTransformValue::TranslateZTransformOperation)
</span><del>- tz = convertToLength(firstValue, inStyle, &ok);
</del><ins>+ tz = convertToLength(firstValue, style, 1, &ok);
</ins><span class="cx"> else if (val->operationType() == WebKitCSSTransformValue::TranslateYTransformOperation)
</span><del>- ty = convertToLength(firstValue, inStyle, &ok);
</del><ins>+ ty = convertToLength(firstValue, style, 1, &ok);
</ins><span class="cx"> else {
</span><del>- tx = convertToLength(firstValue, inStyle, &ok);
</del><ins>+ tx = convertToLength(firstValue, style, 1, &ok);
</ins><span class="cx"> if (val->operationType() != WebKitCSSTransformValue::TranslateXTransformOperation) {
</span><span class="cx"> if (val->length() > 2) {
</span><span class="cx"> CSSPrimitiveValue* thirdValue = static_cast<CSSPrimitiveValue*>(val->itemWithoutBoundsCheck(2));
</span><del>- tz = convertToLength(thirdValue, inStyle, &ok);
</del><ins>+ tz = convertToLength(thirdValue, style, 1, &ok);
</ins><span class="cx"> }
</span><span class="cx"> if (val->length() > 1) {
</span><span class="cx"> CSSPrimitiveValue* secondValue = static_cast<CSSPrimitiveValue*>(val->itemWithoutBoundsCheck(1));
</span><del>- ty = convertToLength(secondValue, inStyle, &ok);
</del><ins>+ ty = convertToLength(secondValue, style, 1, &ok);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>