| OLD | NEW |
| 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 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 822 return true; | 822 return true; |
| 823 } | 823 } |
| 824 | 824 |
| 825 if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) { | 825 if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) { |
| 826 if (rare_non_inherited_data_->user_drag != | 826 if (rare_non_inherited_data_->user_drag != |
| 827 other.rare_non_inherited_data_->user_drag || | 827 other.rare_non_inherited_data_->user_drag || |
| 828 rare_non_inherited_data_->object_fit_ != | 828 rare_non_inherited_data_->object_fit_ != |
| 829 other.rare_non_inherited_data_->object_fit_ || | 829 other.rare_non_inherited_data_->object_fit_ || |
| 830 rare_non_inherited_data_->object_position_ != | 830 rare_non_inherited_data_->object_position_ != |
| 831 other.rare_non_inherited_data_->object_position_ || | 831 other.rare_non_inherited_data_->object_position_ || |
| 832 !rare_non_inherited_data_->ShadowDataEquivalent( | 832 !BoxShadowDataEquivalent(other) || !ShapeOutsideDataEquivalent(other) || |
| 833 *other.rare_non_inherited_data_.Get()) || | 833 !ClipPathDataEquivalent(other) || |
| 834 !rare_non_inherited_data_->ShapeOutsideDataEquivalent( | |
| 835 *other.rare_non_inherited_data_.Get()) || | |
| 836 !rare_non_inherited_data_->ClipPathDataEquivalent( | |
| 837 *other.rare_non_inherited_data_.Get()) || | |
| 838 !rare_non_inherited_data_->outline_.VisuallyEqual( | 834 !rare_non_inherited_data_->outline_.VisuallyEqual( |
| 839 other.rare_non_inherited_data_->outline_) || | 835 other.rare_non_inherited_data_->outline_) || |
| 840 (VisitedLinkBorderLeftColor() != other.VisitedLinkBorderLeftColor() && | 836 (VisitedLinkBorderLeftColor() != other.VisitedLinkBorderLeftColor() && |
| 841 BorderLeftWidth()) || | 837 BorderLeftWidth()) || |
| 842 (VisitedLinkBorderRightColor() != other.VisitedLinkBorderRightColor() && | 838 (VisitedLinkBorderRightColor() != other.VisitedLinkBorderRightColor() && |
| 843 BorderRightWidth()) || | 839 BorderRightWidth()) || |
| 844 (VisitedLinkBorderBottomColor() != | 840 (VisitedLinkBorderBottomColor() != |
| 845 other.VisitedLinkBorderBottomColor() && | 841 other.VisitedLinkBorderBottomColor() && |
| 846 BorderBottomWidth()) || | 842 BorderBottomWidth()) || |
| 847 (VisitedLinkBorderTopColor() != other.VisitedLinkBorderTopColor() && | 843 (VisitedLinkBorderTopColor() != other.VisitedLinkBorderTopColor() && |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 935 | 931 |
| 936 if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) { | 932 if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) { |
| 937 if (rare_non_inherited_data_->opacity != | 933 if (rare_non_inherited_data_->opacity != |
| 938 other.rare_non_inherited_data_->opacity) | 934 other.rare_non_inherited_data_->opacity) |
| 939 diff.SetOpacityChanged(); | 935 diff.SetOpacityChanged(); |
| 940 } | 936 } |
| 941 | 937 |
| 942 if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) { | 938 if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) { |
| 943 if ((rare_non_inherited_data_->filter_ != | 939 if ((rare_non_inherited_data_->filter_ != |
| 944 other.rare_non_inherited_data_->filter_) || | 940 other.rare_non_inherited_data_->filter_) || |
| 945 !rare_non_inherited_data_->ReflectionDataEquivalent( | 941 !ReflectionDataEquivalent(other)) |
| 946 *other.rare_non_inherited_data_.Get())) | |
| 947 diff.SetFilterChanged(); | 942 diff.SetFilterChanged(); |
| 948 } | 943 } |
| 949 | 944 |
| 950 if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) { | 945 if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) { |
| 951 if (!rare_non_inherited_data_->ShadowDataEquivalent( | 946 if (!BoxShadowDataEquivalent(other) || |
| 952 *other.rare_non_inherited_data_.Get()) || | |
| 953 !rare_non_inherited_data_->outline_.VisuallyEqual( | 947 !rare_non_inherited_data_->outline_.VisuallyEqual( |
| 954 other.rare_non_inherited_data_->outline_)) | 948 other.rare_non_inherited_data_->outline_)) |
| 955 diff.SetNeedsRecomputeOverflow(); | 949 diff.SetNeedsRecomputeOverflow(); |
| 956 } | 950 } |
| 957 | 951 |
| 958 if (!BorderVisualOverflowEqual(other)) | 952 if (!BorderVisualOverflowEqual(other)) |
| 959 diff.SetNeedsRecomputeOverflow(); | 953 diff.SetNeedsRecomputeOverflow(); |
| 960 | 954 |
| 961 if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) { | 955 if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) { |
| 962 if (rare_non_inherited_data_->backdrop_filter_ != | 956 if (rare_non_inherited_data_->backdrop_filter_ != |
| (...skipping 1467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2430 if (value < 0) | 2424 if (value < 0) |
| 2431 fvalue -= 0.5f; | 2425 fvalue -= 0.5f; |
| 2432 else | 2426 else |
| 2433 fvalue += 0.5f; | 2427 fvalue += 0.5f; |
| 2434 } | 2428 } |
| 2435 | 2429 |
| 2436 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); | 2430 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); |
| 2437 } | 2431 } |
| 2438 | 2432 |
| 2439 } // namespace blink | 2433 } // namespace blink |
| OLD | NEW |