WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Style fixes and reuse zoom adjusting code from RenderObject.h
bug-32230-20100914172943.patch (text/plain), 38.57 KB, created by
Erik Arvidsson
on 2010-09-14 17:29:44 PDT
(
hide
)
Description:
Style fixes and reuse zoom adjusting code from RenderObject.h
Filename:
MIME Type:
Creator:
Erik Arvidsson
Created:
2010-09-14 17:29:44 PDT
Size:
38.57 KB
patch
obsolete
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 55301da0aed4ad9b603deeac500516bc6b1a06fc..d35465cf21449174fe2c5579257fea15cdd377b2 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,16 @@ >+2010-09-14 Erik Arvidsson <arv@chromium.org> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ getComputedStyle() returns different values for different zoom levels >+ https://bugs.webkit.org/show_bug.cgi?id=32230 >+ >+ * fast/css/getComputedStyle/computed-style-with-zoom-expected.txt: Added. >+ * fast/css/getComputedStyle/computed-style-with-zoom.html: Added. >+ * fast/css/getComputedStyle/script-tests/computed-style-with-zoom.js: Added. >+ (testProperty): >+ (testPropertyValue): >+ > 2010-09-14 Andrey Kosyakov <caseq@chromium.org> > > Reviewed by Yury Semikhatsky. >diff --git a/LayoutTests/fast/css/getComputedStyle/computed-style-with-zoom-expected.txt b/LayoutTests/fast/css/getComputedStyle/computed-style-with-zoom-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..0b6c0082ef4cbef34ce110d042cc72a83693d744 >--- /dev/null >+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-with-zoom-expected.txt >@@ -0,0 +1,50 @@ >+Tests that computed style is not affected by the zoom value >+ >+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". >+ >+ >+PASS -webkit-border-horizontal-spacing, value: "5px" >+PASS -webkit-border-vertical-spacing, value: "5px" >+PASS -webkit-box-reflect, value: "below 5px -webkit-gradient(linear, 0% 0%, 0% 100%, from(transparent), to(white)) 0 0 0 0 stretch stretch" >+PASS -webkit-box-shadow, value: "rgb(255, 0, 0) 5px 5px 5px 5px" >+PASS -webkit-column-rule-width, value: "5px" >+PASS -webkit-perspective-origin, value: "5px 5px" >+PASS -webkit-text-stroke-width, value: "5px" >+PASS -webkit-transform, value: "matrix(1, 0, 0, 1, 5, 5)" >+PASS -webkit-transform, value: "matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 5, 5, 5, 1)" >+PASS -webkit-transform-origin, value: "5px 5px" >+PASS border-bottom-left-radius, value: "5px" >+PASS border-bottom-right-radius, value: "5px" >+PASS border-bottom-width, value: "5px" >+PASS border-left-width, value: "5px" >+PASS border-right-width, value: "5px" >+PASS border-spacing, value: "5px 5px" >+PASS border-top-left-radius, value: "5px" >+PASS border-top-right-radius, value: "5px" >+PASS border-top-width, value: "5px" >+PASS bottom, value: "5px" >+PASS clip, value: "rect(5px 95px 95px 5px)" >+PASS font-size, value: "5px" >+PASS font-size, value: "16px" >+PASS height, value: "5px" >+PASS left, value: "5px" >+PASS letter-spacing, value: "5px" >+PASS line-height, value: "5px" >+PASS margin-bottom, value: "5px" >+PASS margin-left, value: "5px" >+PASS margin-right, value: "5px" >+PASS margin-top, value: "5px" >+PASS outline-width, value: "5px" >+PASS padding-bottom, value: "5px" >+PASS padding-left, value: "5px" >+PASS padding-right, value: "5px" >+PASS padding-top, value: "5px" >+PASS right, value: "5px" >+PASS text-shadow, value: "rgb(255, 0, 0) 5px 5px 5px" >+PASS top, value: "5px" >+PASS width, value: "5px" >+PASS word-spacing, value: "5px" >+PASS successfullyParsed is true >+ >+TEST COMPLETE >+ >diff --git a/LayoutTests/fast/css/getComputedStyle/computed-style-with-zoom.html b/LayoutTests/fast/css/getComputedStyle/computed-style-with-zoom.html >new file mode 100644 >index 0000000000000000000000000000000000000000..9f7b2aa61ba7abded58fab659c8ab291206499e4 >--- /dev/null >+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-with-zoom.html >@@ -0,0 +1,13 @@ >+<!DOCTYPE html> >+<html> >+<head> >+<link rel="stylesheet" href="../../js/resources/js-test-style.css"> >+<script src="../../js/resources/js-test-pre.js"></script> >+</head> >+<body> >+<p id="description"></p> >+<div id="console"></div> >+<script src="script-tests/computed-style-with-zoom.js"></script> >+<script src="../../js/resources/js-test-post.js"></script> >+</body> >+</html> >diff --git a/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-with-zoom.js b/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-with-zoom.js >new file mode 100644 >index 0000000000000000000000000000000000000000..a5ad9d4a004e8705f736c1945934bfae5c150b63 >--- /dev/null >+++ b/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-with-zoom.js >@@ -0,0 +1,83 @@ >+description('Tests that computed style is not affected by the zoom value'); >+ >+function testProperty(data) >+{ >+ var prop = data[0]; >+ if (data.length == 1) >+ data.push('5px'); >+ >+ for (var i = 1; i < data.length; i++) { >+ testPropertyValue(prop, data[i]); >+ } >+} >+ >+function testPropertyValue(prop, value) >+{ >+ var el = document.createElement('div'); >+ el.style.cssText = 'position: absolute; width: 100px; height: 100px;' + >+ 'overflow: hidden; border: 1px solid red;' + >+ 'outline: 1px solid blue;-webkit-column-rule: 1px solid red'; >+ el.style.setProperty(prop, value, ''); >+ >+ document.body.style.zoom = ''; >+ document.body.appendChild(el); >+ >+ var value1 = getComputedStyle(el, null).getPropertyValue(prop); >+ document.body.style.zoom = 2; >+ var value2 = getComputedStyle(el, null).getPropertyValue(prop); >+ >+ document.body.removeChild(el); >+ document.body.style.zoom = ''; >+ >+ if (typeof value1 === 'string' && value1 === value2) >+ testPassed(prop + ', value: "' + value1 + '"'); >+ else >+ testFailed(prop + ', value1: "' + value1 + '", value2: "' + value2 + '"'); >+} >+ >+var testData = [ >+ ['-webkit-border-horizontal-spacing'], >+ ['-webkit-border-vertical-spacing'], >+ ['-webkit-box-reflect', 'below 5px -webkit-gradient(linear, left top, left bottom, from(transparent), to(white))'], >+ ['-webkit-box-shadow', '5px 5px 5px 5px red'], >+ ['-webkit-column-rule-width', '5px'], >+ ['-webkit-perspective-origin', '5px 5px'], >+ ['-webkit-text-stroke-width'], >+ ['-webkit-transform', 'translate(5px, 5px)', 'translate3d(5px, 5px, 5px)'], >+ ['-webkit-transform-origin', '5px 5px'], >+ ['border-bottom-left-radius'], >+ ['border-bottom-right-radius'], >+ ['border-bottom-width'], >+ ['border-left-width'], >+ ['border-right-width'], >+ ['border-spacing'], >+ ['border-top-left-radius'], >+ ['border-top-right-radius'], >+ ['border-top-width'], >+ ['bottom'], >+ ['clip', 'rect(5px 95px 95px 5px)'], >+ ['font-size', '5px', 'medium'], >+ ['height'], >+ ['left'], >+ ['letter-spacing'], >+ ['line-height'], >+ ['margin-bottom'], >+ ['margin-left'], >+ ['margin-right'], >+ ['margin-top'], >+ ['outline-width'], >+ ['padding-bottom'], >+ ['padding-left'], >+ ['padding-right'], >+ ['padding-top'], >+ ['right'], >+ ['text-shadow', '5px 5px 5px red'], >+ ['top'], >+ ['width'], >+ ['word-spacing'], >+]; >+ >+testData.forEach(testProperty); >+ >+successfullyParsed = true; >+ >diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog >index d7901b3b4bff58936e7c50f4196c9f39a5a0a4ee..019810c5a56b49135a36ecb52c1b6a84f2a430d6 100644 >--- a/WebCore/ChangeLog >+++ b/WebCore/ChangeLog >@@ -1,3 +1,30 @@ >+2010-09-14 Erik Arvidsson <arv@chromium.org> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ getComputedStyle() returns different values for different zoom levels >+ https://bugs.webkit.org/show_bug.cgi?id=32230 >+ >+ Test: fast/css/getComputedStyle/computed-style-with-zoom.html >+ >+ * css/CSSComputedStyleDeclaration.cpp: >+ (WebCore::zoomAdjustedPixelValue): >+ (WebCore::zoomAdjustedNumberValue): >+ (WebCore::valueForReflection): >+ (WebCore::getPositionOffsetValue): >+ (WebCore::getBorderRadiusCornerValue): >+ (WebCore::computedTransform): >+ (WebCore::CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringKeyword): >+ (WebCore::CSSComputedStyleDeclaration::valueForShadow): >+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): >+ * css/CSSComputedStyleDeclaration.h: >+ * css/SVGCSSComputedStyleDeclaration.cpp: >+ (WebCore::CSSComputedStyleDeclaration::getSVGPropertyCSSValue): >+ * rendering/RenderObject.h: >+ (WebCore::adjustForAbsoluteZoom): >+ * rendering/style/RenderStyle.h: >+ (WebCore::adjustForAbsoluteZoom): >+ > 2010-09-14 Tony Chang <tony@chromium.org> > > Unreviewed, fix chromium compile. >diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp >index 0ef77211906bc98f1b6a52928d81e0e58895928e..54a4fbc48db1efb077ea5d5b7cf794069c9959b0 100644 >--- a/WebCore/css/CSSComputedStyleDeclaration.cpp >+++ b/WebCore/css/CSSComputedStyleDeclaration.cpp >@@ -327,7 +327,21 @@ static PassRefPtr<CSSValue> valueForNinePieceImage(const NinePieceImage& image) > return CSSBorderImageValue::create(imageValue, rect, valueForRepeatRule(image.horizontalRule()), valueForRepeatRule(image.verticalRule())); > } > >-static PassRefPtr<CSSValue> valueForReflection(const StyleReflection* reflection) >+inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(int value, const RenderStyle* style) >+{ >+ return CSSPrimitiveValue::create(adjustForAbsoluteZoom(value, style), CSSPrimitiveValue::CSS_PX); >+} >+ >+static PassRefPtr<CSSPrimitiveValue> zoomAdjustedNumberValue(double value, const RenderStyle* style) >+{ >+ double zoomFactor = style->effectiveZoom(); >+ if (zoomFactor != 1) >+ value = value / zoomFactor; >+ >+ return CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER); >+} >+ >+static PassRefPtr<CSSValue> valueForReflection(const StyleReflection* reflection, const RenderStyle* style) > { > if (!reflection) > return CSSPrimitiveValue::createIdentifier(CSSValueNone); >@@ -336,7 +350,7 @@ static PassRefPtr<CSSValue> valueForReflection(const StyleReflection* reflection > if (reflection->offset().isPercent()) > offset = CSSPrimitiveValue::create(reflection->offset().percent(), CSSPrimitiveValue::CSS_PERCENTAGE); > else >- offset = CSSPrimitiveValue::create(reflection->offset().value(), CSSPrimitiveValue::CSS_PX); >+ offset = zoomAdjustedPixelValue(reflection->offset().value(), style); > > return CSSReflectValue::create(reflection->direction(), offset.release(), valueForNinePieceImage(reflection->mask())); > } >@@ -364,8 +378,11 @@ static PassRefPtr<CSSValue> getPositionOffsetValue(RenderStyle* style, int prope > return 0; > } > >- if (style->position() == AbsolutePosition || style->position() == FixedPosition) >+ if (style->position() == AbsolutePosition || style->position() == FixedPosition) { >+ if (l.type() == WebCore::Fixed) >+ return zoomAdjustedPixelValue(l.value(), style); > return CSSPrimitiveValue::create(l); >+ } > > if (style->position() == RelativePosition) > // FIXME: It's not enough to simply return "auto" values for one offset if the other side is defined. >@@ -384,22 +401,22 @@ PassRefPtr<CSSPrimitiveValue> CSSComputedStyleDeclaration::currentColorOrValidCo > return CSSPrimitiveValue::createColor(color.rgb()); > } > >-static PassRefPtr<CSSValue> getBorderRadiusCornerValue(LengthSize radius) >+static PassRefPtr<CSSValue> getBorderRadiusCornerValue(LengthSize radius, const RenderStyle* style) > { > RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); > if (radius.width() == radius.height()) { > if (radius.width().type() == Percent) > return CSSPrimitiveValue::create(radius.width().percent(), CSSPrimitiveValue::CSS_PERCENTAGE); >- return CSSPrimitiveValue::create(radius.width().value(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(radius.width().value(), style); > } > if (radius.width().type() == Percent) > list->append(CSSPrimitiveValue::create(radius.width().percent(), CSSPrimitiveValue::CSS_PERCENTAGE)); > else >- list->append(CSSPrimitiveValue::create(radius.width().value(), CSSPrimitiveValue::CSS_PX)); >+ list->append(zoomAdjustedPixelValue(radius.width().value(), style)); > if (radius.height().type() == Percent) > list->append(CSSPrimitiveValue::create(radius.height().percent(), CSSPrimitiveValue::CSS_PERCENTAGE)); > else >- list->append(CSSPrimitiveValue::create(radius.height().value(), CSSPrimitiveValue::CSS_PX)); >+ list->append(zoomAdjustedPixelValue(radius.height().value(), style)); > return list.release(); > } > >@@ -438,8 +455,8 @@ static PassRefPtr<CSSValue> computedTransform(RenderObject* renderer, const Rend > transformVal->append(CSSPrimitiveValue::create(transform.b(), CSSPrimitiveValue::CSS_NUMBER)); > transformVal->append(CSSPrimitiveValue::create(transform.c(), CSSPrimitiveValue::CSS_NUMBER)); > transformVal->append(CSSPrimitiveValue::create(transform.d(), CSSPrimitiveValue::CSS_NUMBER)); >- transformVal->append(CSSPrimitiveValue::create(transform.e(), CSSPrimitiveValue::CSS_NUMBER)); >- transformVal->append(CSSPrimitiveValue::create(transform.f(), CSSPrimitiveValue::CSS_NUMBER)); >+ transformVal->append(zoomAdjustedNumberValue(transform.e(), style)); >+ transformVal->append(zoomAdjustedNumberValue(transform.f(), style)); > } else { > transformVal = WebKitCSSTransformValue::create(WebKitCSSTransformValue::Matrix3DTransformOperation); > >@@ -458,9 +475,9 @@ static PassRefPtr<CSSValue> computedTransform(RenderObject* renderer, const Rend > transformVal->append(CSSPrimitiveValue::create(transform.m33(), CSSPrimitiveValue::CSS_NUMBER)); > transformVal->append(CSSPrimitiveValue::create(transform.m34(), CSSPrimitiveValue::CSS_NUMBER)); > >- transformVal->append(CSSPrimitiveValue::create(transform.m41(), CSSPrimitiveValue::CSS_NUMBER)); >- transformVal->append(CSSPrimitiveValue::create(transform.m42(), CSSPrimitiveValue::CSS_NUMBER)); >- transformVal->append(CSSPrimitiveValue::create(transform.m43(), CSSPrimitiveValue::CSS_NUMBER)); >+ transformVal->append(zoomAdjustedNumberValue(transform.m41(), style)); >+ transformVal->append(zoomAdjustedNumberValue(transform.m42(), style)); >+ transformVal->append(zoomAdjustedNumberValue(transform.m43(), style)); > transformVal->append(CSSPrimitiveValue::create(transform.m44(), CSSPrimitiveValue::CSS_NUMBER)); > } > >@@ -583,7 +600,8 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getFontSizeCSSValuePreferringK > if (int keywordSize = style->fontDescription().keywordSize()) > return CSSPrimitiveValue::createIdentifier(cssIdentifierForFontSizeKeyword(keywordSize)); > >- return CSSPrimitiveValue::create(style->fontDescription().computedPixelSize(), CSSPrimitiveValue::CSS_PX); >+ >+ return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), style.get()); > } > > bool CSSComputedStyleDeclaration::useFixedFontDefaultSize() const >@@ -598,7 +616,7 @@ bool CSSComputedStyleDeclaration::useFixedFontDefaultSize() const > return style->fontDescription().useFixedDefaultSize(); > } > >-PassRefPtr<CSSValue> CSSComputedStyleDeclaration::valueForShadow(const ShadowData* shadow, int id) const >+PassRefPtr<CSSValue> CSSComputedStyleDeclaration::valueForShadow(const ShadowData* shadow, int id, RenderStyle* style) const > { > if (!shadow) > return CSSPrimitiveValue::createIdentifier(CSSValueNone); >@@ -607,10 +625,10 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::valueForShadow(const ShadowDat > > RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); > for (const ShadowData* s = shadow; s; s = s->next()) { >- RefPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(s->x(), CSSPrimitiveValue::CSS_PX); >- RefPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(s->y(), CSSPrimitiveValue::CSS_PX); >- RefPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(s->blur(), CSSPrimitiveValue::CSS_PX); >- RefPtr<CSSPrimitiveValue> spread = propertyID == CSSPropertyTextShadow ? 0 : CSSPrimitiveValue::create(s->spread(), CSSPrimitiveValue::CSS_PX); >+ RefPtr<CSSPrimitiveValue> x = zoomAdjustedPixelValue(s->x(), style); >+ RefPtr<CSSPrimitiveValue> y = zoomAdjustedPixelValue(s->y(), style); >+ RefPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(s->blur(), style); >+ RefPtr<CSSPrimitiveValue> spread = propertyID == CSSPropertyTextShadow ? 0 : zoomAdjustedPixelValue(s->spread(), style); > RefPtr<CSSPrimitiveValue> style = propertyID == CSSPropertyTextShadow || s->style() == Normal ? 0 : CSSPrimitiveValue::createIdentifier(CSSValueInset); > RefPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(s->color().rgb()); > list->prepend(ShadowValue::create(x.release(), y.release(), blur.release(), spread.release(), style.release(), color.release())); >@@ -774,14 +792,14 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > return CSSPrimitiveValue::createIdentifier(CSSValueSeparate); > case CSSPropertyBorderSpacing: { > RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); >- list->append(CSSPrimitiveValue::create(style->horizontalBorderSpacing(), CSSPrimitiveValue::CSS_PX)); >- list->append(CSSPrimitiveValue::create(style->verticalBorderSpacing(), CSSPrimitiveValue::CSS_PX)); >+ list->append(zoomAdjustedPixelValue(style->horizontalBorderSpacing(), style.get())); >+ list->append(zoomAdjustedPixelValue(style->verticalBorderSpacing(), style.get())); > return list.release(); > } > case CSSPropertyWebkitBorderHorizontalSpacing: >- return CSSPrimitiveValue::create(style->horizontalBorderSpacing(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->horizontalBorderSpacing(), style.get()); > case CSSPropertyWebkitBorderVerticalSpacing: >- return CSSPrimitiveValue::create(style->verticalBorderSpacing(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->verticalBorderSpacing(), style.get()); > case CSSPropertyBorderTopColor: > return m_allowVisitedStyle ? CSSPrimitiveValue::createColor(style->visitedDependentColor(CSSPropertyBorderTopColor).rgb()) : currentColorOrValidColor(style.get(), style->borderTopColor()); > case CSSPropertyBorderRightColor: >@@ -799,13 +817,13 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > case CSSPropertyBorderLeftStyle: > return CSSPrimitiveValue::create(style->borderLeftStyle()); > case CSSPropertyBorderTopWidth: >- return CSSPrimitiveValue::create(style->borderTopWidth(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->borderTopWidth(), style.get()); > case CSSPropertyBorderRightWidth: >- return CSSPrimitiveValue::create(style->borderRightWidth(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->borderRightWidth(), style.get()); > case CSSPropertyBorderBottomWidth: >- return CSSPrimitiveValue::create(style->borderBottomWidth(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->borderBottomWidth(), style.get()); > case CSSPropertyBorderLeftWidth: >- return CSSPrimitiveValue::create(style->borderLeftWidth(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->borderLeftWidth(), style.get()); > case CSSPropertyBottom: > return getPositionOffsetValue(style.get(), CSSPropertyBottom); > case CSSPropertyWebkitBoxAlign: >@@ -831,9 +849,9 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > return CSSPrimitiveValue::create(boxPack); > } > case CSSPropertyWebkitBoxReflect: >- return valueForReflection(style->boxReflect()); >+ return valueForReflection(style->boxReflect(), style.get()); > case CSSPropertyWebkitBoxShadow: >- return valueForShadow(style->boxShadow(), propertyID); >+ return valueForShadow(style->boxShadow(), propertyID, style.get()); > case CSSPropertyCaptionSide: > return CSSPrimitiveValue::create(style->captionSide()); > case CSSPropertyClear: >@@ -853,7 +871,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > case CSSPropertyWebkitColumnRuleStyle: > return CSSPrimitiveValue::create(style->columnRuleStyle()); > case CSSPropertyWebkitColumnRuleWidth: >- return CSSPrimitiveValue::create(style->columnRuleWidth(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->columnRuleWidth(), style.get()); > case CSSPropertyWebkitColumnSpan: > if (style->columnSpan()) > return CSSPrimitiveValue::createIdentifier(CSSValueAll); >@@ -901,7 +919,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > return list.release(); > } > case CSSPropertyFontSize: >- return CSSPrimitiveValue::create(style->fontDescription().computedPixelSize(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), style.get()); > case CSSPropertyFontStyle: > if (style->fontDescription().italic()) > return CSSPrimitiveValue::createIdentifier(CSSValueItalic); >@@ -935,7 +953,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > return CSSPrimitiveValue::createIdentifier(CSSValueNormal); > case CSSPropertyHeight: > if (renderer) >- return CSSPrimitiveValue::create(sizingBox(renderer).height(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(sizingBox(renderer).height(), style.get()); > return CSSPrimitiveValue::create(style->height()); > case CSSPropertyWebkitHighlight: > if (style->highlight() == nullAtom) >@@ -960,7 +978,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > case CSSPropertyLetterSpacing: > if (!style->letterSpacing()) > return CSSPrimitiveValue::createIdentifier(CSSValueNormal); >- return CSSPrimitiveValue::create(style->letterSpacing(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->letterSpacing(), style.get()); > case CSSPropertyWebkitLineClamp: > if (style->lineClamp().isNone()) > return CSSPrimitiveValue::createIdentifier(CSSValueNone); >@@ -974,8 +992,8 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > // for how high to be in pixels does include things like minimum font size and the zoom factor. > // On the other hand, since font-size doesn't include the zoom factor, we really can't do > // that here either. >- return CSSPrimitiveValue::create(static_cast<int>(length.percent() * style->fontDescription().specifiedSize()) / 100, CSSPrimitiveValue::CSS_PX); >- return CSSPrimitiveValue::create(length.value(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(static_cast<int>(length.percent() * style->fontDescription().specifiedSize()) / 100, style.get()); >+ return zoomAdjustedPixelValue(length.value(), style.get()); > } > case CSSPropertyListStyleImage: > if (style->listStyleImage()) >@@ -988,22 +1006,22 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > case CSSPropertyMarginTop: > if (renderer && renderer->isBox()) > // FIXME: Supposed to return the percentage if percentage was specified. >- return CSSPrimitiveValue::create(toRenderBox(renderer)->marginTop(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(toRenderBox(renderer)->marginTop(), style.get()); > return CSSPrimitiveValue::create(style->marginTop()); > case CSSPropertyMarginRight: > if (renderer && renderer->isBox()) > // FIXME: Supposed to return the percentage if percentage was specified. >- return CSSPrimitiveValue::create(toRenderBox(renderer)->marginRight(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(toRenderBox(renderer)->marginRight(), style.get()); > return CSSPrimitiveValue::create(style->marginRight()); > case CSSPropertyMarginBottom: > if (renderer && renderer->isBox()) > // FIXME: Supposed to return the percentage if percentage was specified. >- return CSSPrimitiveValue::create(toRenderBox(renderer)->marginBottom(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(toRenderBox(renderer)->marginBottom(), style.get()); > return CSSPrimitiveValue::create(style->marginBottom()); > case CSSPropertyMarginLeft: > if (renderer && renderer->isBox()) > // FIXME: Supposed to return the percentage if percentage was specified. >- return CSSPrimitiveValue::create(toRenderBox(renderer)->marginLeft(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(toRenderBox(renderer)->marginLeft(), style.get()); > return CSSPrimitiveValue::create(style->marginLeft()); > case CSSPropertyWebkitMarqueeDirection: > return CSSPrimitiveValue::create(style->marqueeDirection()); >@@ -1082,7 +1100,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > return CSSPrimitiveValue::createIdentifier(CSSValueAuto); > return CSSPrimitiveValue::create(style->outlineStyle()); > case CSSPropertyOutlineWidth: >- return CSSPrimitiveValue::create(style->outlineWidth(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->outlineWidth(), style.get()); > case CSSPropertyOverflow: > return CSSPrimitiveValue::create(max(style->overflowX(), style->overflowY())); > case CSSPropertyOverflowX: >@@ -1091,19 +1109,19 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > return CSSPrimitiveValue::create(style->overflowY()); > case CSSPropertyPaddingTop: > if (renderer && renderer->isBox()) >- return CSSPrimitiveValue::create(toRenderBox(renderer)->paddingTop(false), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(toRenderBox(renderer)->paddingTop(false), style.get()); > return CSSPrimitiveValue::create(style->paddingTop()); > case CSSPropertyPaddingRight: > if (renderer && renderer->isBox()) >- return CSSPrimitiveValue::create(toRenderBox(renderer)->paddingRight(false), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(toRenderBox(renderer)->paddingRight(false), style.get()); > return CSSPrimitiveValue::create(style->paddingRight()); > case CSSPropertyPaddingBottom: > if (renderer && renderer->isBox()) >- return CSSPrimitiveValue::create(toRenderBox(renderer)->paddingBottom(false), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(toRenderBox(renderer)->paddingBottom(false), style.get()); > return CSSPrimitiveValue::create(style->paddingBottom()); > case CSSPropertyPaddingLeft: > if (renderer && renderer->isBox()) >- return CSSPrimitiveValue::create(toRenderBox(renderer)->paddingLeft(false), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(toRenderBox(renderer)->paddingLeft(false), style.get()); > return CSSPrimitiveValue::create(style->paddingLeft()); > case CSSPropertyPageBreakAfter: > return CSSPrimitiveValue::create(style->pageBreakAfter()); >@@ -1133,7 +1151,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > case CSSPropertyTextIndent: > return CSSPrimitiveValue::create(style->textIndent()); > case CSSPropertyTextShadow: >- return valueForShadow(style->textShadow(), propertyID); >+ return valueForShadow(style->textShadow(), propertyID, style.get()); > case CSSPropertyTextRendering: > return CSSPrimitiveValue::create(style->fontDescription().textRenderingMode()); > case CSSPropertyTextOverflow: >@@ -1149,7 +1167,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > case CSSPropertyWebkitTextStrokeColor: > return currentColorOrValidColor(style.get(), style->textStrokeColor()); > case CSSPropertyWebkitTextStrokeWidth: >- return CSSPrimitiveValue::create(style->textStrokeWidth(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->textStrokeWidth(), style.get()); > case CSSPropertyTextTransform: > return CSSPrimitiveValue::create(style->textTransform()); > case CSSPropertyTop: >@@ -1189,12 +1207,12 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > return CSSPrimitiveValue::create(style->widows(), CSSPrimitiveValue::CSS_NUMBER); > case CSSPropertyWidth: > if (renderer) >- return CSSPrimitiveValue::create(sizingBox(renderer).width(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(sizingBox(renderer).width(), style.get()); > return CSSPrimitiveValue::create(style->width()); > case CSSPropertyWordBreak: > return CSSPrimitiveValue::create(style->wordBreak()); > case CSSPropertyWordSpacing: >- return CSSPrimitiveValue::create(style->wordSpacing(), CSSPrimitiveValue::CSS_PX); >+ return zoomAdjustedPixelValue(style->wordSpacing(), style.get()); > case CSSPropertyWordWrap: > return CSSPrimitiveValue::create(style->wordWrap()); > case CSSPropertyWebkitLineBreak: >@@ -1233,10 +1251,10 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > > region->m_label = styleRegion.label; > LengthBox offset = styleRegion.offset; >- region->setTop(CSSPrimitiveValue::create(offset.top().value(), CSSPrimitiveValue::CSS_PX)); >- region->setRight(CSSPrimitiveValue::create(offset.right().value(), CSSPrimitiveValue::CSS_PX)); >- region->setBottom(CSSPrimitiveValue::create(offset.bottom().value(), CSSPrimitiveValue::CSS_PX)); >- region->setLeft(CSSPrimitiveValue::create(offset.left().value(), CSSPrimitiveValue::CSS_PX)); >+ region->setTop(zoomAdjustedPixelValue(offset.top().value(), style.get())); >+ region->setRight(zoomAdjustedPixelValue(offset.right().value(), style.get())); >+ region->setBottom(zoomAdjustedPixelValue(offset.bottom().value(), style.get())); >+ region->setLeft(zoomAdjustedPixelValue(offset.left().value(), style.get())); > region->m_isRectangle = (styleRegion.type == StyleDashboardRegion::Rectangle); > region->m_isCircle = (styleRegion.type == StyleDashboardRegion::Circle); > >@@ -1357,8 +1375,8 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); > if (renderer) { > IntRect box = sizingBox(renderer); >- list->append(CSSPrimitiveValue::create(style->perspectiveOriginX().calcMinValue(box.width()), CSSPrimitiveValue::CSS_PX)); >- list->append(CSSPrimitiveValue::create(style->perspectiveOriginY().calcMinValue(box.height()), CSSPrimitiveValue::CSS_PX)); >+ list->append(zoomAdjustedPixelValue(style->perspectiveOriginX().calcMinValue(box.width()), style.get())); >+ list->append(zoomAdjustedPixelValue(style->perspectiveOriginY().calcMinValue(box.height()), style.get())); > } > else { > list->append(CSSPrimitiveValue::create(style->perspectiveOriginX())); >@@ -1375,21 +1393,21 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > case CSSPropertyWebkitUserSelect: > return CSSPrimitiveValue::create(style->userSelect()); > case CSSPropertyBorderBottomLeftRadius: >- return getBorderRadiusCornerValue(style->borderBottomLeftRadius()); >+ return getBorderRadiusCornerValue(style->borderBottomLeftRadius(), style.get()); > case CSSPropertyBorderBottomRightRadius: >- return getBorderRadiusCornerValue(style->borderBottomRightRadius()); >+ return getBorderRadiusCornerValue(style->borderBottomRightRadius(), style.get()); > case CSSPropertyBorderTopLeftRadius: >- return getBorderRadiusCornerValue(style->borderTopLeftRadius()); >+ return getBorderRadiusCornerValue(style->borderTopLeftRadius(), style.get()); > case CSSPropertyBorderTopRightRadius: >- return getBorderRadiusCornerValue(style->borderTopRightRadius()); >+ return getBorderRadiusCornerValue(style->borderTopRightRadius(), style.get()); > case CSSPropertyClip: { > if (!style->hasClip()) > return CSSPrimitiveValue::createIdentifier(CSSValueAuto); > RefPtr<Rect> rect = Rect::create(); >- rect->setTop(CSSPrimitiveValue::create(style->clip().top().value(), CSSPrimitiveValue::CSS_PX)); >- rect->setRight(CSSPrimitiveValue::create(style->clip().right().value(), CSSPrimitiveValue::CSS_PX)); >- rect->setBottom(CSSPrimitiveValue::create(style->clip().bottom().value(), CSSPrimitiveValue::CSS_PX)); >- rect->setLeft(CSSPrimitiveValue::create(style->clip().left().value(), CSSPrimitiveValue::CSS_PX)); >+ rect->setTop(zoomAdjustedPixelValue(style->clip().top().value(), style.get())); >+ rect->setRight(zoomAdjustedPixelValue(style->clip().right().value(), style.get())); >+ rect->setBottom(zoomAdjustedPixelValue(style->clip().bottom().value(), style.get())); >+ rect->setLeft(zoomAdjustedPixelValue(style->clip().left().value(), style.get())); > return CSSPrimitiveValue::create(rect.release()); > } > case CSSPropertyWebkitTransform: >@@ -1398,15 +1416,15 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper > RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); > if (renderer) { > IntRect box = sizingBox(renderer); >- list->append(CSSPrimitiveValue::create(style->transformOriginX().calcMinValue(box.width()), CSSPrimitiveValue::CSS_PX)); >- list->append(CSSPrimitiveValue::create(style->transformOriginY().calcMinValue(box.height()), CSSPrimitiveValue::CSS_PX)); >+ list->append(zoomAdjustedPixelValue(style->transformOriginX().calcMinValue(box.width()), style.get())); >+ list->append(zoomAdjustedPixelValue(style->transformOriginY().calcMinValue(box.height()), style.get())); > if (style->transformOriginZ() != 0) >- list->append(CSSPrimitiveValue::create(style->transformOriginZ(), CSSPrimitiveValue::CSS_PX)); >+ list->append(zoomAdjustedPixelValue(style->transformOriginZ(), style.get())); > } else { > list->append(CSSPrimitiveValue::create(style->transformOriginX())); > list->append(CSSPrimitiveValue::create(style->transformOriginY())); > if (style->transformOriginZ() != 0) >- list->append(CSSPrimitiveValue::create(style->transformOriginZ(), CSSPrimitiveValue::CSS_PX)); >+ list->append(zoomAdjustedPixelValue(style->transformOriginZ(), style.get())); > } > return list.release(); > } >diff --git a/WebCore/css/CSSComputedStyleDeclaration.h b/WebCore/css/CSSComputedStyleDeclaration.h >index d4b7df244eed6531c85e6e6c3b7b1f3f6cff56d6..718eb2dfab3cd9fbfa5330cd7acc5a02269aa5c2 100644 >--- a/WebCore/css/CSSComputedStyleDeclaration.h >+++ b/WebCore/css/CSSComputedStyleDeclaration.h >@@ -74,7 +74,7 @@ private: > virtual String removeProperty(int propertyID, ExceptionCode&); > virtual void setProperty(int propertyId, const String& value, bool important, ExceptionCode&); > >- PassRefPtr<CSSValue> valueForShadow(const ShadowData*, int) const; >+ PassRefPtr<CSSValue> valueForShadow(const ShadowData*, int, RenderStyle*) const; > PassRefPtr<CSSPrimitiveValue> currentColorOrValidColor(RenderStyle*, const Color&) const; > > RefPtr<Node> m_node; >diff --git a/WebCore/css/SVGCSSComputedStyleDeclaration.cpp b/WebCore/css/SVGCSSComputedStyleDeclaration.cpp >index 410eede32ebf4a2663565f5710c746aa0fc4c9b8..0cf6181375e8eeb9d97f732cbea4d30a8f13eae0 100644 >--- a/WebCore/css/SVGCSSComputedStyleDeclaration.cpp >+++ b/WebCore/css/SVGCSSComputedStyleDeclaration.cpp >@@ -180,7 +180,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getSVGPropertyCSSValue(int pro > return 0; > } > case CSSPropertyWebkitSvgShadow: >- return valueForShadow(svgStyle->shadow(), propertyID); >+ return valueForShadow(svgStyle->shadow(), propertyID, style); > case CSSPropertyVectorEffect: > return CSSPrimitiveValue::create(svgStyle->vectorEffect()); > case CSSPropertyMarker: >diff --git a/WebCore/rendering/RenderObject.h b/WebCore/rendering/RenderObject.h >index be1435129253d3355a861dde70200f4f94cdae88..f2ca47197e66987db35be806d08804edd9fdca7a 100644 >--- a/WebCore/rendering/RenderObject.h >+++ b/WebCore/rendering/RenderObject.h >@@ -989,14 +989,7 @@ inline void makeMatrixRenderable(TransformationMatrix& matrix, bool has3DRenderi > > inline int adjustForAbsoluteZoom(int value, RenderObject* renderer) > { >- double zoomFactor = renderer->style()->effectiveZoom(); >- if (zoomFactor == 1) >- return value; >- // Needed because computeLengthInt truncates (rather than rounds) when scaling up. >- if (zoomFactor > 1) >- value++; >- >- return roundForImpreciseConversion<int, INT_MAX, INT_MIN>(value / zoomFactor); >+ return adjustForAbsoluteZoom(value, renderer->style()); > } > > inline void adjustIntRectForAbsoluteZoom(IntRect& rect, RenderObject* renderer) >diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h >index 477a252802a08a9a7a943079d640de1d935c80c2..9ede4e64cb27d98704217ca081d5faeb3bd5fc66 100644 >--- a/WebCore/rendering/style/RenderStyle.h >+++ b/WebCore/rendering/style/RenderStyle.h >@@ -1239,6 +1239,18 @@ private: > ContentData* prepareToSetContent(StringImpl*, bool add); > }; > >+inline int adjustForAbsoluteZoom(int value, const RenderStyle* style) >+{ >+ double zoomFactor = style->effectiveZoom(); >+ if (zoomFactor == 1) >+ return value; >+ // Needed because computeLengthInt truncates (rather than rounds) when scaling up. >+ if (zoomFactor > 1) >+ value++; >+ >+ return roundForImpreciseConversion<int, INT_MAX, INT_MIN>(value / zoomFactor); >+} >+ > } // namespace WebCore > > #endif // RenderStyle_h
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=67621">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 32230
:
44419
|
58483
|
67278
|
67576
|
67621
|
70033
|
126390