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 868 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
879 | 879 |
880 return false; | 880 return false; |
881 } | 881 } |
882 | 882 |
883 bool ComputedStyle::DiffNeedsPaintInvalidationObject( | 883 bool ComputedStyle::DiffNeedsPaintInvalidationObject( |
884 const ComputedStyle& other) const { | 884 const ComputedStyle& other) const { |
885 if (Visibility() != other.Visibility() || | 885 if (Visibility() != other.Visibility() || |
886 PrintColorAdjust() != other.PrintColorAdjust() || | 886 PrintColorAdjust() != other.PrintColorAdjust() || |
887 InsideLink() != other.InsideLink() || | 887 InsideLink() != other.InsideLink() || |
888 !Border().VisuallyEqual(other.Border()) || !RadiiEqual(other) || | 888 !Border().VisuallyEqual(other.Border()) || !RadiiEqual(other) || |
889 !BorderSizeEquals(other) || *background_data_ != *other.background_data_) | 889 !BorderColorVisuallyEquals(other) || !BorderSizeEquals(other) || |
| 890 *background_data_ != *other.background_data_) |
890 return true; | 891 return true; |
891 | 892 |
892 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) { | 893 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) { |
893 if (rare_inherited_data_->user_modify != | 894 if (rare_inherited_data_->user_modify != |
894 other.rare_inherited_data_->user_modify || | 895 other.rare_inherited_data_->user_modify || |
895 rare_inherited_data_->user_select != | 896 rare_inherited_data_->user_select != |
896 other.rare_inherited_data_->user_select || | 897 other.rare_inherited_data_->user_select || |
897 rare_inherited_data_->image_rendering_ != | 898 rare_inherited_data_->image_rendering_ != |
898 other.rare_inherited_data_->image_rendering_) | 899 other.rare_inherited_data_->image_rendering_) |
899 return true; | 900 return true; |
(...skipping 1624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2524 if (value < 0) | 2525 if (value < 0) |
2525 fvalue -= 0.5f; | 2526 fvalue -= 0.5f; |
2526 else | 2527 else |
2527 fvalue += 0.5f; | 2528 fvalue += 0.5f; |
2528 } | 2529 } |
2529 | 2530 |
2530 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); | 2531 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); |
2531 } | 2532 } |
2532 | 2533 |
2533 } // namespace blink | 2534 } // namespace blink |
OLD | NEW |