| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009 Apple Computer, Inc. | 2 * Copyright (C) 2007, 2008, 2009 Apple Computer, Inc. |
| 3 * Copyright (C) 2010, 2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2010, 2011 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 809 node_style, EditingStyle::kDoNotIgnoreTextOnlyProperties); | 809 node_style, EditingStyle::kDoNotIgnoreTextOnlyProperties); |
| 810 if (node_is_start) { | 810 if (node_is_start) { |
| 811 state = node_state; | 811 state = node_state; |
| 812 node_is_start = false; | 812 node_is_start = false; |
| 813 } else if (state != node_state && node.IsTextNode()) { | 813 } else if (state != node_state && node.IsTextNode()) { |
| 814 state = kMixedTriState; | 814 state = kMixedTriState; |
| 815 break; | 815 break; |
| 816 } | 816 } |
| 817 } | 817 } |
| 818 } | 818 } |
| 819 if (&node == selection.end().AnchorNode()) | 819 if (&node == selection.End().AnchorNode()) |
| 820 break; | 820 break; |
| 821 } | 821 } |
| 822 | 822 |
| 823 return state; | 823 return state; |
| 824 } | 824 } |
| 825 | 825 |
| 826 bool EditingStyle::ConflictsWithInlineStyleOfElement( | 826 bool EditingStyle::ConflictsWithInlineStyleOfElement( |
| 827 HTMLElement* element, | 827 HTMLElement* element, |
| 828 EditingStyle* extracted_style, | 828 EditingStyle* extracted_style, |
| 829 Vector<CSSPropertyID>* conflicting_properties) const { | 829 Vector<CSSPropertyID>* conflicting_properties) const { |
| (...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1777 const CSSIdentifierValue& identifier_value = ToCSSIdentifierValue(*value); | 1777 const CSSIdentifierValue& identifier_value = ToCSSIdentifierValue(*value); |
| 1778 if (CSSValueXSmall <= identifier_value.GetValueID() && | 1778 if (CSSValueXSmall <= identifier_value.GetValueID() && |
| 1779 identifier_value.GetValueID() <= CSSValueWebkitXxxLarge) | 1779 identifier_value.GetValueID() <= CSSValueWebkitXxxLarge) |
| 1780 return identifier_value.GetValueID() - CSSValueXSmall + 1; | 1780 return identifier_value.GetValueID() - CSSValueXSmall + 1; |
| 1781 } | 1781 } |
| 1782 | 1782 |
| 1783 return 0; | 1783 return 0; |
| 1784 } | 1784 } |
| 1785 | 1785 |
| 1786 } // namespace blink | 1786 } // namespace blink |
| OLD | NEW |