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

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: resolveAlignment and resolveJustification now defined in RenderStyle. Created 6 years, 2 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 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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 339
340 public: 340 public:
341 static PassRefPtr<RenderStyle> create(); 341 static PassRefPtr<RenderStyle> create();
342 static PassRefPtr<RenderStyle> createDefaultStyle(); 342 static PassRefPtr<RenderStyle> createDefaultStyle();
343 static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderS tyle* parentStyle, EDisplay); 343 static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderS tyle* parentStyle, EDisplay);
344 static PassRefPtr<RenderStyle> clone(const RenderStyle*); 344 static PassRefPtr<RenderStyle> clone(const RenderStyle*);
345 345
346 // Computes how the style change should be propagated down the tree. 346 // Computes how the style change should be propagated down the tree.
347 static StyleRecalcChange stylePropagationDiff(const RenderStyle* oldStyle, c onst RenderStyle* newStyle); 347 static StyleRecalcChange stylePropagationDiff(const RenderStyle* oldStyle, c onst RenderStyle* newStyle);
348 348
349 static ItemPosition resolveAlignment(const RenderStyle* parentStyle, const R enderStyle* childStyle); 349 static ItemPosition resolveAlignment(const RenderStyle* parentStyle, const R enderStyle* childStyle, ItemPosition defaultPosition = ItemPositionStretch);
350 static ItemPosition resolveJustification(const RenderStyle* parentStyle, con st RenderStyle* childStyle, ItemPosition defaultPosition = ItemPositionStretch);
Julien - ping for review 2014/10/31 17:17:13 The default parameter seems very artificial (why I
jfernandez 2014/10/31 22:55:59 I agree is not the best approach, but I couldn't c
350 351
351 StyleDifference visualInvalidationDiff(const RenderStyle&) const; 352 StyleDifference visualInvalidationDiff(const RenderStyle&) const;
352 353
353 enum IsAtShadowBoundary { 354 enum IsAtShadowBoundary {
354 AtShadowBoundary, 355 AtShadowBoundary,
355 NotAtShadowBoundary, 356 NotAtShadowBoundary,
356 }; 357 };
357 358
358 void inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary = NotA tShadowBoundary); 359 void inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary = NotA tShadowBoundary);
359 void copyNonInheritedFrom(const RenderStyle*); 360 void copyNonInheritedFrom(const RenderStyle*);
(...skipping 1558 matching lines...) Expand 10 before | Expand all | Expand 10 after
1918 inline bool RenderStyle::hasPseudoElementStyle() const 1919 inline bool RenderStyle::hasPseudoElementStyle() const
1919 { 1920 {
1920 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1921 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1921 } 1922 }
1922 1923
1923 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1924 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1924 1925
1925 } // namespace blink 1926 } // namespace blink
1926 1927
1927 #endif // RenderStyle_h 1928 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698