Source/WebCore/rendering/style/RenderStyle.h - Issue 10383285: Merge 116174

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

Issue 10383285: Merge 116174 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/

Patch Set: Created 8 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:

« no previous file with comments | « Source/WebCore/rendering/mathml/RenderMathMLSubSup.cpp ('k') | Source/WebCore/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

OLD	NEW
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 372 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
383	383

384 private:	384 private:

385 ALWAYS_INLINE RenderStyle();	385 ALWAYS_INLINE RenderStyle();

386 // used to create the default style.	386 // used to create the default style.

387 ALWAYS_INLINE RenderStyle(bool);	387 ALWAYS_INLINE RenderStyle(bool);

388 ALWAYS_INLINE RenderStyle(const RenderStyle&);	388 ALWAYS_INLINE RenderStyle(const RenderStyle&);

389	389

390 public:	390 public:

391 static PassRefPtr<RenderStyle> create();	391 static PassRefPtr<RenderStyle> create();

392 static PassRefPtr<RenderStyle> createDefaultStyle();	392 static PassRefPtr<RenderStyle> createDefaultStyle();

393 static PassRefPtr<RenderStyle> createAnonymousStyle(const RenderStyle* paren tStyle);	393 static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderS tyle* parentStyle, EDisplay);

394 static PassRefPtr<RenderStyle> clone(const RenderStyle*);	394 static PassRefPtr<RenderStyle> clone(const RenderStyle*);

395	395

396 void inheritFrom(const RenderStyle* inheritParent);	396 void inheritFrom(const RenderStyle* inheritParent);

397 void copyNonInheritedFrom(const RenderStyle*);	397 void copyNonInheritedFrom(const RenderStyle*);

398	398

399 PseudoId styleType() const { return static_cast<PseudoId>(noninherited_flags ._styleType); }	399 PseudoId styleType() const { return static_cast<PseudoId>(noninherited_flags ._styleType); }

400 void setStyleType(PseudoId styleType) { noninherited_flags._styleType = styl eType; }	400 void setStyleType(PseudoId styleType) { noninherited_flags._styleType = styl eType; }

401	401

402 RenderStyle* getCachedPseudoStyle(PseudoId) const;	402 RenderStyle* getCachedPseudoStyle(PseudoId) const;

403 RenderStyle* addCachedPseudoStyle(PassRefPtr<RenderStyle>);	403 RenderStyle* addCachedPseudoStyle(PassRefPtr<RenderStyle>);

(...skipping 1407 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1811 {	1811 {

1812 if (compareEqual(rareInheritedData->textSizeAdjust, b))	1812 if (compareEqual(rareInheritedData->textSizeAdjust, b))

1813 return false;	1813 return false;

1814 rareInheritedData.access()->textSizeAdjust = b;	1814 rareInheritedData.access()->textSizeAdjust = b;

1815 return true;	1815 return true;

1816 }	1816 }

1817	1817

1818 } // namespace WebCore	1818 } // namespace WebCore

1819	1819

1820 #endif // RenderStyle_h	1820 #endif // RenderStyle_h

OLD	NEW