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