| 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 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 // every line). In addition we need to solve the floating object issue | 665 // every line). In addition we need to solve the floating object issue |
| 666 // when layers come and go. Right now a full layout is necessary to keep | 666 // when layers come and go. Right now a full layout is necessary to keep |
| 667 // floating object lists sane. | 667 // floating object lists sane. |
| 668 return true; | 668 return true; |
| 669 } | 669 } |
| 670 } | 670 } |
| 671 | 671 |
| 672 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) { | 672 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) { |
| 673 if (rare_inherited_data_->highlight_ != | 673 if (rare_inherited_data_->highlight_ != |
| 674 other.rare_inherited_data_->highlight_ || | 674 other.rare_inherited_data_->highlight_ || |
| 675 rare_inherited_data_->indent_ != other.rare_inherited_data_->indent_ || | 675 rare_inherited_data_->text_indent_ != |
| 676 other.rare_inherited_data_->text_indent_ || |
| 676 rare_inherited_data_->text_align_last_ != | 677 rare_inherited_data_->text_align_last_ != |
| 677 other.rare_inherited_data_->text_align_last_ || | 678 other.rare_inherited_data_->text_align_last_ || |
| 678 rare_inherited_data_->text_indent_line_ != | 679 rare_inherited_data_->text_indent_line_ != |
| 679 other.rare_inherited_data_->text_indent_line_ || | 680 other.rare_inherited_data_->text_indent_line_ || |
| 680 rare_inherited_data_->effective_zoom_ != | 681 rare_inherited_data_->effective_zoom_ != |
| 681 other.rare_inherited_data_->effective_zoom_ || | 682 other.rare_inherited_data_->effective_zoom_ || |
| 682 rare_inherited_data_->word_break_ != | 683 rare_inherited_data_->word_break_ != |
| 683 other.rare_inherited_data_->word_break_ || | 684 other.rare_inherited_data_->word_break_ || |
| 684 rare_inherited_data_->overflow_wrap_ != | 685 rare_inherited_data_->overflow_wrap_ != |
| 685 other.rare_inherited_data_->overflow_wrap_ || | 686 other.rare_inherited_data_->overflow_wrap_ || |
| (...skipping 1819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2505 if (value < 0) | 2506 if (value < 0) |
| 2506 fvalue -= 0.5f; | 2507 fvalue -= 0.5f; |
| 2507 else | 2508 else |
| 2508 fvalue += 0.5f; | 2509 fvalue += 0.5f; |
| 2509 } | 2510 } |
| 2510 | 2511 |
| 2511 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); | 2512 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); |
| 2512 } | 2513 } |
| 2513 | 2514 |
| 2514 } // namespace blink | 2515 } // namespace blink |
| OLD | NEW |