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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 2895283004: Replace AnimatableValues with ComputedStyle references for CSS Transitions (Closed)
Patch Set: Created 3 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
4 * reserved. 4 * reserved.
5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 // we haven't yet been painted (and can't provide the invalidation 915 // we haven't yet been painted (and can't provide the invalidation
916 // properties yet). 916 // properties yet).
917 if (!value->NativeInvalidationProperties() || 917 if (!value->NativeInvalidationProperties() ||
918 !value->CustomInvalidationProperties()) 918 !value->CustomInvalidationProperties())
919 return true; 919 return true;
920 920
921 for (CSSPropertyID property_id : *value->NativeInvalidationProperties()) { 921 for (CSSPropertyID property_id : *value->NativeInvalidationProperties()) {
922 // TODO(ikilpatrick): remove IsInterpolableProperty check once 922 // TODO(ikilpatrick): remove IsInterpolableProperty check once
923 // CSSPropertyEquality::PropertiesEqual correctly handles all properties. 923 // CSSPropertyEquality::PropertiesEqual correctly handles all properties.
924 if (!CSSPropertyMetadata::IsInterpolableProperty(property_id) || 924 if (!CSSPropertyMetadata::IsInterpolableProperty(property_id) ||
925 !CSSPropertyEquality::PropertiesEqual(property_id, *this, other)) 925 !CSSPropertyEquality::PropertiesEqual(PropertyHandle(property_id),
926 *this, other))
926 return true; 927 return true;
927 } 928 }
928 929
929 if (InheritedVariables() || NonInheritedVariables() || 930 if (InheritedVariables() || NonInheritedVariables() ||
930 other.InheritedVariables() || other.NonInheritedVariables()) { 931 other.InheritedVariables() || other.NonInheritedVariables()) {
931 for (const AtomicString& property : 932 for (const AtomicString& property :
932 *value->CustomInvalidationProperties()) { 933 *value->CustomInvalidationProperties()) {
933 if (!DataEquivalent(GetVariable(property), other.GetVariable(property))) 934 if (!DataEquivalent(GetVariable(property), other.GetVariable(property)))
934 return true; 935 return true;
935 } 936 }
(...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after
2480 if (value < 0) 2481 if (value < 0)
2481 fvalue -= 0.5f; 2482 fvalue -= 0.5f;
2482 else 2483 else
2483 fvalue += 0.5f; 2484 fvalue += 0.5f;
2484 } 2485 }
2485 2486
2486 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); 2487 return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
2487 } 2488 }
2488 2489
2489 } // namespace blink 2490 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698