Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2865923002: Move LocaleForLineBreakIterator() to ComputedStyle (Closed)
Patch Set: Revert ng changes Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1979 matching lines...) Expand 10 before | Expand all | Expand 10 after
1990 // font-weight 1990 // font-weight
1991 FontWeight GetFontWeight() const; 1991 FontWeight GetFontWeight() const;
1992 1992
1993 // font-stretch 1993 // font-stretch
1994 FontStretch GetFontStretch() const; 1994 FontStretch GetFontStretch() const;
1995 1995
1996 // -webkit-locale 1996 // -webkit-locale
1997 const AtomicString& Locale() const { 1997 const AtomicString& Locale() const {
1998 return LayoutLocale::LocaleString(GetFontDescription().Locale()); 1998 return LayoutLocale::LocaleString(GetFontDescription().Locale());
1999 } 1999 }
2000 AtomicString LocaleForLineBreakIterator() const;
2000 2001
2001 // FIXME: Remove letter-spacing/word-spacing and replace them with respective 2002 // FIXME: Remove letter-spacing/word-spacing and replace them with respective
2002 // FontBuilder calls. letter-spacing 2003 // FontBuilder calls. letter-spacing
2003 static float InitialLetterWordSpacing() { return 0.0f; } 2004 static float InitialLetterWordSpacing() { return 0.0f; }
2004 float LetterSpacing() const; 2005 float LetterSpacing() const;
2005 void SetLetterSpacing(float); 2006 void SetLetterSpacing(float);
2006 2007
2007 // word-spacing 2008 // word-spacing
2008 float WordSpacing() const; 2009 float WordSpacing() const;
2009 void SetWordSpacing(float); 2010 void SetWordSpacing(float);
(...skipping 1644 matching lines...) Expand 10 before | Expand all | Expand 10 after
3654 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3655 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3655 } 3656 }
3656 3657
3657 inline bool ComputedStyle::HasPseudoElementStyle() const { 3658 inline bool ComputedStyle::HasPseudoElementStyle() const {
3658 return PseudoBitsInternal() & kElementPseudoIdMask; 3659 return PseudoBitsInternal() & kElementPseudoIdMask;
3659 } 3660 }
3660 3661
3661 } // namespace blink 3662 } // namespace blink
3662 3663
3663 #endif // ComputedStyle_h 3664 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698