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

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 613273002: [CSS Grid Layout] Stretch value for align and justify properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed some layout tests. Created 6 years, 1 month 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/rendering/RenderGrid.cpp ('k') | Source/core/rendering/style/RenderStyle.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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 338
339 public: 339 public:
340 static PassRefPtr<RenderStyle> create(); 340 static PassRefPtr<RenderStyle> create();
341 static PassRefPtr<RenderStyle> createDefaultStyle(); 341 static PassRefPtr<RenderStyle> createDefaultStyle();
342 static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderS tyle* parentStyle, EDisplay); 342 static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderS tyle* parentStyle, EDisplay);
343 static PassRefPtr<RenderStyle> clone(const RenderStyle*); 343 static PassRefPtr<RenderStyle> clone(const RenderStyle*);
344 344
345 // Computes how the style change should be propagated down the tree. 345 // Computes how the style change should be propagated down the tree.
346 static StyleRecalcChange stylePropagationDiff(const RenderStyle* oldStyle, c onst RenderStyle* newStyle); 346 static StyleRecalcChange stylePropagationDiff(const RenderStyle* oldStyle, c onst RenderStyle* newStyle);
347 347
348 static ItemPosition resolveAlignment(const RenderStyle* parentStyle, const R enderStyle* childStyle); 348 static ItemPosition resolveAlignment(const RenderStyle* parentStyle, const R enderStyle* childStyle, ItemPosition resolvedAutoPositionForRenderer);
349 static ItemPosition resolveJustification(const RenderStyle* parentStyle, con st RenderStyle* childStyle, ItemPosition resolvedAutoPositionForRenderer);
349 350
350 StyleDifference visualInvalidationDiff(const RenderStyle&) const; 351 StyleDifference visualInvalidationDiff(const RenderStyle&) const;
351 352
352 enum IsAtShadowBoundary { 353 enum IsAtShadowBoundary {
353 AtShadowBoundary, 354 AtShadowBoundary,
354 NotAtShadowBoundary, 355 NotAtShadowBoundary,
355 }; 356 };
356 357
357 void inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary = NotA tShadowBoundary); 358 void inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary = NotA tShadowBoundary);
358 void copyNonInheritedFrom(const RenderStyle*); 359 void copyNonInheritedFrom(const RenderStyle*);
(...skipping 1550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1909 inline bool RenderStyle::hasPseudoElementStyle() const 1910 inline bool RenderStyle::hasPseudoElementStyle() const
1910 { 1911 {
1911 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1912 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1912 } 1913 }
1913 1914
1914 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1915 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1915 1916
1916 } // namespace blink 1917 } // namespace blink
1917 1918
1918 #endif // RenderStyle_h 1919 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderGrid.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698