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

Side by Side Diff: Source/core/css/StylePropertyShorthandCustom.cpp

Issue 216803002: Implement all shorthand property. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed ASSERT_NOT_REACH in linux_blink_dbg Created 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * Copyright (C) 2013 Intel Corporation. All rights reserved. 4 * Copyright (C) 2013 Intel Corporation. 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 // The system fonts bypass the normal style resolution by using RenderTheme, 106 // The system fonts bypass the normal style resolution by using RenderTheme,
107 // thus we need to special case it here. FIXME: This is a violation of CSS 3 Fonts 107 // thus we need to special case it here. FIXME: This is a violation of CSS 3 Fonts
108 // as we should still be able to change the longhands. 108 // as we should still be able to change the longhands.
109 // DON'T ADD ANY SHORTHAND HERE UNLESS IT ISN'T ALWAYS EXPANDED AT PARSE TIM E (which is wrong). 109 // DON'T ADD ANY SHORTHAND HERE UNLESS IT ISN'T ALWAYS EXPANDED AT PARSE TIM E (which is wrong).
110 if (id == CSSPropertyFont) 110 if (id == CSSPropertyFont)
111 return false; 111 return false;
112 112
113 return shorthandForProperty(id).length(); 113 return shorthandForProperty(id).length();
114 } 114 }
115 115
116 bool isExpandedShorthandForAll(CSSPropertyID id)
117 {
118 if (id == CSSPropertyFont || id == CSSPropertyWidth || id == CSSPropertyMark er || id == CSSPropertyHeight)
esprehn 2014/05/30 00:59:22 Can you link to the spec in a comment? This is a r
tasak 2014/06/04 09:37:41 I found some mistakes in the condition. We don't n
119 return true;
120
121 return shorthandForProperty(id).length();
122 }
123
116 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty lePropertyShorthand, 4>& shorthands) 124 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty lePropertyShorthand, 4>& shorthands)
117 { 125 {
118 for (unsigned i = 0; i < shorthands.size(); ++i) { 126 for (unsigned i = 0; i < shorthands.size(); ++i) {
119 if (shorthands.at(i).id() == shorthandID) 127 if (shorthands.at(i).id() == shorthandID)
120 return i; 128 return i;
121 } 129 }
122 ASSERT_NOT_REACHED(); 130 ASSERT_NOT_REACHED();
123 return 0; 131 return 0;
124 } 132 }
125 133
126 } // namespace WebCore 134 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698