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 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
702 other.rare_inherited_data_->tab_size_ || | 702 other.rare_inherited_data_->tab_size_ || |
703 rare_inherited_data_->text_size_adjust_ != | 703 rare_inherited_data_->text_size_adjust_ != |
704 other.rare_inherited_data_->text_size_adjust_ || | 704 other.rare_inherited_data_->text_size_adjust_ || |
705 rare_inherited_data_->list_style_image_ != | 705 rare_inherited_data_->list_style_image_ != |
706 other.rare_inherited_data_->list_style_image_ || | 706 other.rare_inherited_data_->list_style_image_ || |
707 rare_inherited_data_->line_height_step_ != | 707 rare_inherited_data_->line_height_step_ != |
708 other.rare_inherited_data_->line_height_step_ || | 708 other.rare_inherited_data_->line_height_step_ || |
709 rare_inherited_data_->text_stroke_width_ != | 709 rare_inherited_data_->text_stroke_width_ != |
710 other.rare_inherited_data_->text_stroke_width_) | 710 other.rare_inherited_data_->text_stroke_width_) |
711 return true; | 711 return true; |
712 | |
713 if (!TextShadowDataEquivalent(other)) | |
714 return true; | |
715 | |
716 if (!QuotesDataEquivalent(other)) | |
717 return true; | |
718 } | 712 } |
719 | 713 |
720 if (inherited_data_->text_autosizing_multiplier_ != | 714 if (inherited_data_->text_autosizing_multiplier_ != |
721 other.inherited_data_->text_autosizing_multiplier_) | 715 other.inherited_data_->text_autosizing_multiplier_) |
722 return true; | 716 return true; |
723 | 717 |
724 if (inherited_data_->font_.LoadingCustomFonts() != | 718 if (inherited_data_->font_.LoadingCustomFonts() != |
725 other.inherited_data_->font_.LoadingCustomFonts()) | 719 other.inherited_data_->font_.LoadingCustomFonts()) |
726 return true; | 720 return true; |
727 | 721 |
(...skipping 1747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2475 if (value < 0) | 2469 if (value < 0) |
2476 fvalue -= 0.5f; | 2470 fvalue -= 0.5f; |
2477 else | 2471 else |
2478 fvalue += 0.5f; | 2472 fvalue += 0.5f; |
2479 } | 2473 } |
2480 | 2474 |
2481 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); | 2475 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); |
2482 } | 2476 } |
2483 | 2477 |
2484 } // namespace blink | 2478 } // namespace blink |
OLD | NEW |