Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(346)

Side by Side Diff: Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 1312023003: Make getComputedStyle(e).transform return correct values for non-transformable elements (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/css/getComputedStyle/getComputedStyle-transform.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * Copyright (C) 2015 Google Inc. All rights reserved. 7 * Copyright (C) 2015 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 transformValue->append(zoomAdjustedNumberValue(transform.m42(), style)); 924 transformValue->append(zoomAdjustedNumberValue(transform.m42(), style));
925 transformValue->append(zoomAdjustedNumberValue(transform.m43(), style)); 925 transformValue->append(zoomAdjustedNumberValue(transform.m43(), style));
926 transformValue->append(cssValuePool().createValue(transform.m44(), CSSPr imitiveValue::UnitType::Number)); 926 transformValue->append(cssValuePool().createValue(transform.m44(), CSSPr imitiveValue::UnitType::Number));
927 } 927 }
928 928
929 return transformValue.release(); 929 return transformValue.release();
930 } 930 }
931 931
932 static PassRefPtrWillBeRawPtr<CSSValue> computedTransform(const LayoutObject* la youtObject, const ComputedStyle& style) 932 static PassRefPtrWillBeRawPtr<CSSValue> computedTransform(const LayoutObject* la youtObject, const ComputedStyle& style)
933 { 933 {
934 if (!layoutObject || !layoutObject->hasTransformRelatedProperty() || !style. hasTransform()) 934 if (!layoutObject || !style.hasTransform())
935 return cssValuePool().createIdentifierValue(CSSValueNone); 935 return cssValuePool().createIdentifierValue(CSSValueNone);
936 936
937 IntRect box; 937 IntRect box;
938 if (layoutObject->isBox()) 938 if (layoutObject->isBox())
939 box = pixelSnappedIntRect(toLayoutBox(layoutObject)->borderBoxRect()); 939 box = pixelSnappedIntRect(toLayoutBox(layoutObject)->borderBoxRect());
940 940
941 TransformationMatrix transform; 941 TransformationMatrix transform;
942 style.applyTransform(transform, LayoutSize(box.size()), ComputedStyle::Exclu deTransformOrigin, ComputedStyle::ExcludeMotionPath, ComputedStyle::ExcludeIndep endentTransformProperties); 942 style.applyTransform(transform, LayoutSize(box.size()), ComputedStyle::Exclu deTransformOrigin, ComputedStyle::ExcludeMotionPath, ComputedStyle::ExcludeIndep endentTransformProperties);
943 943
944 // FIXME: Need to print out individual functions (https://bugs.webkit.org/sh ow_bug.cgi?id=23924) 944 // FIXME: Need to print out individual functions (https://bugs.webkit.org/sh ow_bug.cgi?id=23924)
(...skipping 1744 matching lines...) Expand 10 before | Expand all | Expand 10 after
2689 case CSSPropertyAll: 2689 case CSSPropertyAll:
2690 return nullptr; 2690 return nullptr;
2691 default: 2691 default:
2692 break; 2692 break;
2693 } 2693 }
2694 ASSERT_NOT_REACHED(); 2694 ASSERT_NOT_REACHED();
2695 return nullptr; 2695 return nullptr;
2696 } 2696 }
2697 2697
2698 } 2698 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/getComputedStyle/getComputedStyle-transform.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698