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 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
697 other.rare_inherited_data_->tab_size_ || | 697 other.rare_inherited_data_->tab_size_ || |
698 rare_inherited_data_->text_size_adjust_ != | 698 rare_inherited_data_->text_size_adjust_ != |
699 other.rare_inherited_data_->text_size_adjust_ || | 699 other.rare_inherited_data_->text_size_adjust_ || |
700 rare_inherited_data_->list_style_image_ != | 700 rare_inherited_data_->list_style_image_ != |
701 other.rare_inherited_data_->list_style_image_ || | 701 other.rare_inherited_data_->list_style_image_ || |
702 rare_inherited_data_->line_height_step_ != | 702 rare_inherited_data_->line_height_step_ != |
703 other.rare_inherited_data_->line_height_step_ || | 703 other.rare_inherited_data_->line_height_step_ || |
704 rare_inherited_data_->text_stroke_width_ != | 704 rare_inherited_data_->text_stroke_width_ != |
705 other.rare_inherited_data_->text_stroke_width_) | 705 other.rare_inherited_data_->text_stroke_width_) |
706 return true; | 706 return true; |
707 | |
708 if (!TextShadowDataEquivalent(other)) | |
709 return true; | |
710 | |
711 if (!QuotesDataEquivalent(other)) | |
712 return true; | |
713 } | 707 } |
714 | 708 |
715 if (IsDisplayTableType(Display())) { | 709 if (IsDisplayTableType(Display())) { |
716 if (BorderCollapse() != other.BorderCollapse() || | 710 if (BorderCollapse() != other.BorderCollapse() || |
717 EmptyCells() != other.EmptyCells() || | 711 EmptyCells() != other.EmptyCells() || |
718 CaptionSide() != other.CaptionSide() || | 712 CaptionSide() != other.CaptionSide() || |
719 TableLayout() != other.TableLayout()) | 713 TableLayout() != other.TableLayout()) |
720 return true; | 714 return true; |
721 | 715 |
722 // In the collapsing border model, 'hidden' suppresses other borders, while | 716 // In the collapsing border model, 'hidden' suppresses other borders, while |
(...skipping 1727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2450 if (value < 0) | 2444 if (value < 0) |
2451 fvalue -= 0.5f; | 2445 fvalue -= 0.5f; |
2452 else | 2446 else |
2453 fvalue += 0.5f; | 2447 fvalue += 0.5f; |
2454 } | 2448 } |
2455 | 2449 |
2456 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); | 2450 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); |
2457 } | 2451 } |
2458 | 2452 |
2459 } // namespace blink | 2453 } // namespace blink |
OLD | NEW |