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

Side by Side Diff: Source/core/css/StyleResolver.h

Issue 13992003: Add support for parsing <grid-line> that includes a 'span' (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed the change to match the specification Created 7 years, 8 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
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/StyleResolver.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 358
359 void addMatchedProperties(const StylePropertySet* properties, StyleRule* = 0, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone); 359 void addMatchedProperties(const StylePropertySet* properties, StyleRule* = 0, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
360 }; 360 };
361 361
362 private: 362 private:
363 // This function fixes up the default font size if it detects that the curre nt generic font family has changed. -dwh 363 // This function fixes up the default font size if it detects that the curre nt generic font family has changed. -dwh
364 void checkForGenericFamilyChange(RenderStyle*, RenderStyle* parentStyle); 364 void checkForGenericFamilyChange(RenderStyle*, RenderStyle* parentStyle);
365 void checkForZoomChange(RenderStyle*, RenderStyle* parentStyle); 365 void checkForZoomChange(RenderStyle*, RenderStyle* parentStyle);
366 366
367 void adjustRenderStyle(RenderStyle* styleToAdjust, RenderStyle* parentStyle, Element*); 367 void adjustRenderStyle(RenderStyle* styleToAdjust, RenderStyle* parentStyle, Element*);
368 void adjustGridItemPosition(RenderStyle* styleToAdjust) const;
368 369
369 bool fastRejectSelector(const RuleData&) const; 370 bool fastRejectSelector(const RuleData&) const;
370 371
371 void applyMatchedProperties(const MatchResult&, const Element*); 372 void applyMatchedProperties(const MatchResult&, const Element*);
372 373
373 enum StyleApplicationPass { 374 enum StyleApplicationPass {
374 VariableDefinitions, 375 VariableDefinitions,
375 HighPriorityProperties, 376 HighPriorityProperties,
376 LowPriorityProperties 377 LowPriorityProperties
377 }; 378 };
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 PseudoId ignoreDynamicPseudo = NOPSEUDO; 647 PseudoId ignoreDynamicPseudo = NOPSEUDO;
647 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches) 648 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches)
648 return true; 649 return true;
649 } 650 }
650 return false; 651 return false;
651 } 652 }
652 653
653 } // namespace WebCore 654 } // namespace WebCore
654 655
655 #endif // StyleResolver_h 656 #endif // StyleResolver_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698