Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 949 { | 949 { |
| 950 if (!layoutObject || !layoutObject->hasTransformRelatedProperty() || !style. hasTransform()) | 950 if (!layoutObject || !layoutObject->hasTransformRelatedProperty() || !style. hasTransform()) |
| 951 return cssValuePool().createIdentifierValue(CSSValueNone); | 951 return cssValuePool().createIdentifierValue(CSSValueNone); |
| 952 | 952 |
| 953 IntRect box; | 953 IntRect box; |
| 954 if (layoutObject->isBox()) | 954 if (layoutObject->isBox()) |
| 955 box = pixelSnappedIntRect(toLayoutBox(layoutObject)->borderBoxRect()); | 955 box = pixelSnappedIntRect(toLayoutBox(layoutObject)->borderBoxRect()); |
| 956 | 956 |
| 957 TransformationMatrix transform; | 957 TransformationMatrix transform; |
| 958 style.applyTransform(transform, LayoutSize(box.size()), ComputedStyle::Exclu deTransformOrigin, ComputedStyle::ExcludeMotionPath, ComputedStyle::ExcludeIndep endentTransformProperties); | 958 style.applyTransform(transform, LayoutSize(box.size()), ComputedStyle::Exclu deTransformOrigin, ComputedStyle::ExcludeMotionPath, ComputedStyle::ExcludeIndep endentTransformProperties); |
| 959 | |
|
Eric Willigers
2015/06/23 06:50:48
There is no need to touch this file.
soonm
2015/06/24 00:26:45
Done - Reverted
| |
| 960 // FIXME: Need to print out individual functions (https://bugs.webkit.org/sh ow_bug.cgi?id=23924) | 959 // FIXME: Need to print out individual functions (https://bugs.webkit.org/sh ow_bug.cgi?id=23924) |
| 961 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; | 960 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; |
| 962 list->append(valueForMatrixTransform(transform, style)); | 961 list->append(valueForMatrixTransform(transform, style)); |
| 963 | 962 |
| 964 return list.release(); | 963 return list.release(); |
| 965 } | 964 } |
| 966 | 965 |
| 967 static PassRefPtrWillBeRawPtr<CSSValue> createTransitionPropertyValue(const CSST ransitionData::TransitionProperty& property) | 966 static PassRefPtrWillBeRawPtr<CSSValue> createTransitionPropertyValue(const CSST ransitionData::TransitionProperty& property) |
| 968 { | 967 { |
| 969 if (property.propertyType == CSSTransitionData::TransitionNone) | 968 if (property.propertyType == CSSTransitionData::TransitionNone) |
| (...skipping 1721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2691 case CSSPropertyAll: | 2690 case CSSPropertyAll: |
| 2692 return nullptr; | 2691 return nullptr; |
| 2693 default: | 2692 default: |
| 2694 break; | 2693 break; |
| 2695 } | 2694 } |
| 2696 ASSERT_NOT_REACHED(); | 2695 ASSERT_NOT_REACHED(); |
| 2697 return nullptr; | 2696 return nullptr; |
| 2698 } | 2697 } |
| 2699 | 2698 |
| 2700 } | 2699 } |
| OLD | NEW |