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
reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. |
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
999 | 999 |
1000 const CounterDirectives RenderStyle::getCounterDirectives(const AtomicString& id
entifier) const | 1000 const CounterDirectives RenderStyle::getCounterDirectives(const AtomicString& id
entifier) const |
1001 { | 1001 { |
1002 if (const CounterDirectiveMap* directives = counterDirectives()) | 1002 if (const CounterDirectiveMap* directives = counterDirectives()) |
1003 return directives->get(identifier); | 1003 return directives->get(identifier); |
1004 return CounterDirectives(); | 1004 return CounterDirectives(); |
1005 } | 1005 } |
1006 | 1006 |
1007 const AtomicString& RenderStyle::hyphenString() const | 1007 const AtomicString& RenderStyle::hyphenString() const |
1008 { | 1008 { |
1009 ASSERT(hyphens() != HyphensNone); | |
1010 | |
1011 const AtomicString& hyphenationString = rareInheritedData.get()->hyphenation
String; | 1009 const AtomicString& hyphenationString = rareInheritedData.get()->hyphenation
String; |
1012 if (!hyphenationString.isNull()) | 1010 if (!hyphenationString.isNull()) |
1013 return hyphenationString; | 1011 return hyphenationString; |
1014 | 1012 |
1015 // FIXME: This should depend on locale. | 1013 // FIXME: This should depend on locale. |
1016 DEFINE_STATIC_LOCAL(AtomicString, hyphenMinusString, (&hyphenMinus, 1)); | 1014 DEFINE_STATIC_LOCAL(AtomicString, hyphenMinusString, (&hyphenMinus, 1)); |
1017 DEFINE_STATIC_LOCAL(AtomicString, hyphenString, (&hyphen, 1)); | 1015 DEFINE_STATIC_LOCAL(AtomicString, hyphenString, (&hyphen, 1)); |
1018 return font().primaryFontHasGlyphForCharacter(hyphen) ? hyphenString : hyphe
nMinusString; | 1016 return font().primaryFontHasGlyphForCharacter(hyphen) ? hyphenString : hyphe
nMinusString; |
1019 } | 1017 } |
1020 | 1018 |
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1567 surround.access()->border.m_image.setOutset(outset); | 1565 surround.access()->border.m_image.setOutset(outset); |
1568 } | 1566 } |
1569 | 1567 |
1570 ShapeValue* RenderStyle::initialShapeInside() | 1568 ShapeValue* RenderStyle::initialShapeInside() |
1571 { | 1569 { |
1572 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu
tsideValue())); | 1570 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu
tsideValue())); |
1573 return sOutsideValue.get(); | 1571 return sOutsideValue.get(); |
1574 } | 1572 } |
1575 | 1573 |
1576 } // namespace WebCore | 1574 } // namespace WebCore |
OLD | NEW |