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 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
716 } | 716 } |
717 | 717 |
718 if (inherited_data_->text_autosizing_multiplier_ != | 718 if (inherited_data_->text_autosizing_multiplier_ != |
719 other.inherited_data_->text_autosizing_multiplier_) | 719 other.inherited_data_->text_autosizing_multiplier_) |
720 return true; | 720 return true; |
721 | 721 |
722 if (inherited_data_->font_.LoadingCustomFonts() != | 722 if (inherited_data_->font_.LoadingCustomFonts() != |
723 other.inherited_data_->font_.LoadingCustomFonts()) | 723 other.inherited_data_->font_.LoadingCustomFonts()) |
724 return true; | 724 return true; |
725 | 725 |
726 if (inherited_data_.Get() != other.inherited_data_.Get()) { | |
727 if (inherited_data_->line_height_ != other.inherited_data_->line_height_ || | |
728 inherited_data_->font_ != other.inherited_data_->font_ || | |
729 inherited_data_->horizontal_border_spacing_ != | |
730 other.inherited_data_->horizontal_border_spacing_ || | |
731 inherited_data_->vertical_border_spacing_ != | |
732 other.inherited_data_->vertical_border_spacing_) | |
733 return true; | |
734 } | |
alancutter (OOO until 2018)
2017/05/19 01:16:58
Haha, this is so much easier to read in the genera
nainar
2017/05/19 01:18:19
OMG I never realized - even more reason to generat
| |
735 | |
736 if (BoxDirection() != other.BoxDirection() || | 726 if (BoxDirection() != other.BoxDirection() || |
737 RtlOrdering() != other.RtlOrdering() || | 727 RtlOrdering() != other.RtlOrdering() || |
738 GetTextAlign() != other.GetTextAlign() || | 728 GetTextAlign() != other.GetTextAlign() || |
739 TextTransform() != other.TextTransform() || | 729 TextTransform() != other.TextTransform() || |
740 Direction() != other.Direction() || WhiteSpace() != other.WhiteSpace() || | 730 Direction() != other.Direction() || WhiteSpace() != other.WhiteSpace() || |
741 GetWritingMode() != other.GetWritingMode()) | 731 GetWritingMode() != other.GetWritingMode()) |
742 return true; | 732 return true; |
743 | 733 |
744 if (OverflowX() != other.OverflowX() || OverflowY() != other.OverflowY() || | 734 if (OverflowX() != other.OverflowX() || OverflowY() != other.OverflowY() || |
745 Clear() != other.Clear() || GetUnicodeBidi() != other.GetUnicodeBidi() || | 735 Clear() != other.Clear() || GetUnicodeBidi() != other.GetUnicodeBidi() || |
(...skipping 1748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2494 if (value < 0) | 2484 if (value < 0) |
2495 fvalue -= 0.5f; | 2485 fvalue -= 0.5f; |
2496 else | 2486 else |
2497 fvalue += 0.5f; | 2487 fvalue += 0.5f; |
2498 } | 2488 } |
2499 | 2489 |
2500 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); | 2490 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); |
2501 } | 2491 } |
2502 | 2492 |
2503 } // namespace blink | 2493 } // namespace blink |
OLD | NEW |