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 other.visual_data_->text_decoration_) || | 879 other.visual_data_->text_decoration_) || |
880 (rare_non_inherited_data_.Get() != | 880 (rare_non_inherited_data_.Get() != |
881 other.rare_non_inherited_data_.Get() && | 881 other.rare_non_inherited_data_.Get() && |
882 (rare_non_inherited_data_->text_decoration_style_ != | 882 (rare_non_inherited_data_->text_decoration_style_ != |
883 other.rare_non_inherited_data_->text_decoration_style_ || | 883 other.rare_non_inherited_data_->text_decoration_style_ || |
884 rare_non_inherited_data_->text_decoration_color_ != | 884 rare_non_inherited_data_->text_decoration_color_ != |
885 other.rare_non_inherited_data_->text_decoration_color_ || | 885 other.rare_non_inherited_data_->text_decoration_color_ || |
886 rare_non_inherited_data_->visited_link_text_decoration_color_ != | 886 rare_non_inherited_data_->visited_link_text_decoration_color_ != |
887 other.rare_non_inherited_data_ | 887 other.rare_non_inherited_data_ |
888 ->visited_link_text_decoration_color_)) || | 888 ->visited_link_text_decoration_color_)) || |
889 (rare_inherited_data_.Get() != other.rare_inherited_data_.Get() && | |
890 (TextFillColor() != other.TextFillColor() || | |
891 TextStrokeColor() != other.TextStrokeColor() || | |
892 TextEmphasisColor() != other.TextEmphasisColor() || | |
893 VisitedLinkTextFillColor() != other.VisitedLinkTextFillColor() || | |
894 VisitedLinkTextStrokeColor() != other.VisitedLinkTextStrokeColor() || | |
895 VisitedLinkTextEmphasisColor() != | |
896 other.VisitedLinkTextEmphasisColor() || | |
897 rare_inherited_data_->text_emphasis_fill_ != | |
898 other.rare_inherited_data_->text_emphasis_fill_ || | |
899 rare_inherited_data_->text_underline_position_ != | |
900 other.rare_inherited_data_->text_underline_position_ || | |
901 rare_inherited_data_->text_decoration_skip_ != | |
902 other.rare_inherited_data_->text_decoration_skip_ || | |
903 rare_inherited_data_->applied_text_decorations_ != | |
904 other.rare_inherited_data_->applied_text_decorations_ || | |
905 CaretColor() != CaretColor() || | |
906 VisitedLinkCaretColor() != other.VisitedLinkCaretColor())) || | |
907 ComputedStyleBase:: | 889 ComputedStyleBase:: |
908 UpdatePropertySpecificDifferencesTextDecorationOrColor(other)) { | 890 UpdatePropertySpecificDifferencesTextDecorationOrColor(other)) { |
909 diff.SetTextDecorationOrColorChanged(); | 891 diff.SetTextDecorationOrColorChanged(); |
910 } | 892 } |
911 } | 893 } |
912 | 894 |
913 bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip_; | 895 bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip_; |
914 bool other_has_clip = | 896 bool other_has_clip = |
915 other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip_; | 897 other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip_; |
916 if (has_clip != other_has_clip || | 898 if (has_clip != other_has_clip || |
(...skipping 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2372 if (value < 0) | 2354 if (value < 0) |
2373 fvalue -= 0.5f; | 2355 fvalue -= 0.5f; |
2374 else | 2356 else |
2375 fvalue += 0.5f; | 2357 fvalue += 0.5f; |
2376 } | 2358 } |
2377 | 2359 |
2378 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); | 2360 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); |
2379 } | 2361 } |
2380 | 2362 |
2381 } // namespace blink | 2363 } // namespace blink |
OLD | NEW |