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

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

Issue 547673002: Move resolveAlignment logic to RenderStyle (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase 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
« 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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 337
338 public: 338 public:
339 static PassRefPtr<RenderStyle> create(); 339 static PassRefPtr<RenderStyle> create();
340 static PassRefPtr<RenderStyle> createDefaultStyle(); 340 static PassRefPtr<RenderStyle> createDefaultStyle();
341 static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderS tyle* parentStyle, EDisplay); 341 static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderS tyle* parentStyle, EDisplay);
342 static PassRefPtr<RenderStyle> clone(const RenderStyle*); 342 static PassRefPtr<RenderStyle> clone(const RenderStyle*);
343 343
344 // Computes how the style change should be propagated down the tree. 344 // Computes how the style change should be propagated down the tree.
345 static StyleRecalcChange stylePropagationDiff(const RenderStyle* oldStyle, c onst RenderStyle* newStyle); 345 static StyleRecalcChange stylePropagationDiff(const RenderStyle* oldStyle, c onst RenderStyle* newStyle);
346 346
347 static ItemPosition resolveAlignment(const RenderStyle* parentStyle, const R enderStyle* childStyle);
348
347 StyleDifference visualInvalidationDiff(const RenderStyle&) const; 349 StyleDifference visualInvalidationDiff(const RenderStyle&) const;
348 350
349 enum IsAtShadowBoundary { 351 enum IsAtShadowBoundary {
350 AtShadowBoundary, 352 AtShadowBoundary,
351 NotAtShadowBoundary, 353 NotAtShadowBoundary,
352 }; 354 };
353 355
354 void inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary = NotA tShadowBoundary); 356 void inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary = NotA tShadowBoundary);
355 void copyNonInheritedFrom(const RenderStyle*); 357 void copyNonInheritedFrom(const RenderStyle*);
356 358
(...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
1929 inline bool RenderStyle::hasPseudoElementStyle() const 1931 inline bool RenderStyle::hasPseudoElementStyle() const
1930 { 1932 {
1931 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1933 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1932 } 1934 }
1933 1935
1934 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1936 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1935 1937
1936 } // namespace blink 1938 } // namespace blink
1937 1939
1938 #endif // RenderStyle_h 1940 #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