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

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

Issue 214473004: Rename RenderStyle::diff and RenderStyle::compare to better names (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: better names Created 6 years, 9 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/rendering/RenderObject.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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 }; 349 };
350 ALWAYS_INLINE explicit RenderStyle(DefaultStyleTag); 350 ALWAYS_INLINE explicit RenderStyle(DefaultStyleTag);
351 ALWAYS_INLINE RenderStyle(const RenderStyle&); 351 ALWAYS_INLINE RenderStyle(const RenderStyle&);
352 352
353 public: 353 public:
354 static PassRefPtr<RenderStyle> create(); 354 static PassRefPtr<RenderStyle> create();
355 static PassRefPtr<RenderStyle> createDefaultStyle(); 355 static PassRefPtr<RenderStyle> createDefaultStyle();
356 static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderS tyle* parentStyle, EDisplay); 356 static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderS tyle* parentStyle, EDisplay);
357 static PassRefPtr<RenderStyle> clone(const RenderStyle*); 357 static PassRefPtr<RenderStyle> clone(const RenderStyle*);
358 358
359 static StyleRecalcChange compare(const RenderStyle* oldStyle, const RenderSt yle* newStyle); 359 // Computes how the style change should be propogated through the tree.
rune 2014/03/27 11:50:51 Minor nit: I think I would have said "down the tre
360 static StyleRecalcChange stylePropogationDiff(const RenderStyle* oldStyle, c onst RenderStyle* newStyle);
rune 2014/03/27 11:50:51 Propogation -> Propagation Same misspelling in th
361
362 // Computes how much visual invalidation the style change causes: layout, re paint or recomposite.
363 StyleDifference visualInvalidationDiff(const RenderStyle*, unsigned& changed ContextSensitiveProperties) const;
360 364
361 enum IsAtShadowBoundary { 365 enum IsAtShadowBoundary {
362 AtShadowBoundary, 366 AtShadowBoundary,
363 NotAtShadowBoundary, 367 NotAtShadowBoundary,
364 }; 368 };
365 369
366 void inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary = NotA tShadowBoundary); 370 void inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary = NotA tShadowBoundary);
367 void copyNonInheritedFrom(const RenderStyle*); 371 void copyNonInheritedFrom(const RenderStyle*);
368 372
369 PseudoId styleType() const { return static_cast<PseudoId>(noninherited_flags ._styleType); } 373 PseudoId styleType() const { return static_cast<PseudoId>(noninherited_flags ._styleType); }
(...skipping 1117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1487 const CounterDirectives getCounterDirectives(const AtomicString& identifier) const; 1491 const CounterDirectives getCounterDirectives(const AtomicString& identifier) const;
1488 1492
1489 QuotesData* quotes() const { return rareInheritedData->quotes.get(); } 1493 QuotesData* quotes() const { return rareInheritedData->quotes.get(); }
1490 void setQuotes(PassRefPtr<QuotesData>); 1494 void setQuotes(PassRefPtr<QuotesData>);
1491 1495
1492 const AtomicString& hyphenString() const; 1496 const AtomicString& hyphenString() const;
1493 1497
1494 bool inheritedNotEqual(const RenderStyle*) const; 1498 bool inheritedNotEqual(const RenderStyle*) const;
1495 bool inheritedDataShared(const RenderStyle*) const; 1499 bool inheritedDataShared(const RenderStyle*) const;
1496 1500
1497 StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitivePr operties) const;
1498
1499 bool isDisplayReplacedType() const { return isDisplayReplacedType(display()) ; } 1501 bool isDisplayReplacedType() const { return isDisplayReplacedType(display()) ; }
1500 bool isDisplayInlineType() const { return isDisplayInlineType(display()); } 1502 bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
1501 bool isOriginalDisplayInlineType() const { return isDisplayInlineType(origin alDisplay()); } 1503 bool isOriginalDisplayInlineType() const { return isDisplayInlineType(origin alDisplay()); }
1502 1504
1503 bool setWritingMode(WritingMode v) 1505 bool setWritingMode(WritingMode v)
1504 { 1506 {
1505 if (v == writingMode()) 1507 if (v == writingMode())
1506 return false; 1508 return false;
1507 1509
1508 inherited_flags.m_writingMode = v; 1510 inherited_flags.m_writingMode = v;
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
1876 inline bool RenderStyle::hasPseudoElementStyle() const 1878 inline bool RenderStyle::hasPseudoElementStyle() const
1877 { 1879 {
1878 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1880 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1879 } 1881 }
1880 1882
1881 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1883 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1882 1884
1883 } // namespace WebCore 1885 } // namespace WebCore
1884 1886
1885 #endif // RenderStyle_h 1887 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698