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

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

Issue 2888703002: Revert "Incorporate ComputedStyle::hasTransform when diffing transform styles." (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 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 } 1035 }
1036 1036
1037 void ComputedStyle::updatePropertySpecificDifferences( 1037 void ComputedStyle::updatePropertySpecificDifferences(
1038 const ComputedStyle& other, 1038 const ComputedStyle& other,
1039 StyleDifference& diff) const { 1039 StyleDifference& diff) const {
1040 if (m_box->zIndex() != other.m_box->zIndex() || 1040 if (m_box->zIndex() != other.m_box->zIndex() ||
1041 isStackingContext() != other.isStackingContext()) 1041 isStackingContext() != other.isStackingContext())
1042 diff.setZIndexChanged(); 1042 diff.setZIndexChanged();
1043 1043
1044 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { 1044 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) {
1045 // It's possible for the old and new style transform data to be equivalent 1045 if (!transformDataEquivalent(other) ||
1046 // while hasTransform() differs, as it checks a number of conditions aside
1047 // from just the matrix, including but not limited to animation state.
1048 if (hasTransform() != other.hasTransform() ||
1049 !transformDataEquivalent(other) ||
1050 m_rareNonInheritedData->m_perspective != 1046 m_rareNonInheritedData->m_perspective !=
1051 other.m_rareNonInheritedData->m_perspective || 1047 other.m_rareNonInheritedData->m_perspective ||
1052 m_rareNonInheritedData->m_perspectiveOrigin != 1048 m_rareNonInheritedData->m_perspectiveOrigin !=
1053 other.m_rareNonInheritedData->m_perspectiveOrigin) 1049 other.m_rareNonInheritedData->m_perspectiveOrigin)
1054 diff.setTransformChanged(); 1050 diff.setTransformChanged();
1055 1051
1056 if (m_rareNonInheritedData->opacity != 1052 if (m_rareNonInheritedData->opacity !=
1057 other.m_rareNonInheritedData->opacity) 1053 other.m_rareNonInheritedData->opacity)
1058 diff.setOpacityChanged(); 1054 diff.setOpacityChanged();
1059 1055
(...skipping 1442 matching lines...) Expand 10 before | Expand all | Expand 10 after
2502 if (value < 0) 2498 if (value < 0)
2503 fvalue -= 0.5f; 2499 fvalue -= 0.5f;
2504 else 2500 else
2505 fvalue += 0.5f; 2501 fvalue += 0.5f;
2506 } 2502 }
2507 2503
2508 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2504 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2509 } 2505 }
2510 2506
2511 } // namespace blink 2507 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/ComputedStyleTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698