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

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

Issue 1136283006: [CSS Grid Layout] Avoid using StyleAdjuster to resolve 'auto' values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed some layout tests failures. Created 5 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
« no previous file with comments | « Source/core/layout/LayoutGrid.cpp ('k') | Source/core/style/ComputedStyle.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) 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 r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 } 344 }
345 345
346 public: 346 public:
347 static PassRefPtr<ComputedStyle> create(); 347 static PassRefPtr<ComputedStyle> create();
348 static PassRefPtr<ComputedStyle> createAnonymousStyleWithDisplay(const Compu tedStyle& parentStyle, EDisplay); 348 static PassRefPtr<ComputedStyle> createAnonymousStyleWithDisplay(const Compu tedStyle& parentStyle, EDisplay);
349 static PassRefPtr<ComputedStyle> clone(const ComputedStyle&); 349 static PassRefPtr<ComputedStyle> clone(const ComputedStyle&);
350 350
351 // Computes how the style change should be propagated down the tree. 351 // Computes how the style change should be propagated down the tree.
352 static StyleRecalcChange stylePropagationDiff(const ComputedStyle* oldStyle, const ComputedStyle* newStyle); 352 static StyleRecalcChange stylePropagationDiff(const ComputedStyle* oldStyle, const ComputedStyle* newStyle);
353 353
354 static ItemPosition resolveAlignment(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject); 354 ContentPosition resolvedAlignContentPosition() const;
355 static ItemPosition resolveJustification(const ComputedStyle& parentStyle, c onst ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject ); 355 ContentDistributionType resolvedAlignContentDistribution() const;
356 ContentPosition resolvedJustifyContentPosition() const;
357 ContentDistributionType resolvedJustifyContentDistribution() const;
358 static ItemPosition resolvedAlignSelfPosition(const ComputedStyle& parentSty le, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutO bject);
359 static OverflowAlignment resolvedAlignSelfOverflow(const ComputedStyle& pare ntStyle, const ComputedStyle& childStyle);
360 static ItemPosition resolvedJustifySelfPosition(const ComputedStyle& parentS tyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayou tObject);
361 static OverflowAlignment resolvedJustifySelfOverflow(const ComputedStyle& pa rentStyle, const ComputedStyle& childStyle);
356 362
357 StyleDifference visualInvalidationDiff(const ComputedStyle&) const; 363 StyleDifference visualInvalidationDiff(const ComputedStyle&) const;
358 364
359 enum IsAtShadowBoundary { 365 enum IsAtShadowBoundary {
360 AtShadowBoundary, 366 AtShadowBoundary,
361 NotAtShadowBoundary, 367 NotAtShadowBoundary,
362 }; 368 };
363 369
364 void inheritFrom(const ComputedStyle& inheritParent, IsAtShadowBoundary = No tAtShadowBoundary); 370 void inheritFrom(const ComputedStyle& inheritParent, IsAtShadowBoundary = No tAtShadowBoundary);
365 void copyNonInheritedFromCached(const ComputedStyle&); 371 void copyNonInheritedFromCached(const ComputedStyle&);
(...skipping 1515 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 } 1887 }
1882 1888
1883 inline bool ComputedStyle::hasPseudoElementStyle() const 1889 inline bool ComputedStyle::hasPseudoElementStyle() const
1884 { 1890 {
1885 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1891 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1886 } 1892 }
1887 1893
1888 } // namespace blink 1894 } // namespace blink
1889 1895
1890 #endif // ComputedStyle_h 1896 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutGrid.cpp ('k') | Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698