diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 15:52:31 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-12 18:44:16 +0100 |
| commit | c58b6b265aa9aca56296a4c1199521fe4ab3cb70 (patch) | |
| tree | 30f94fc4ad67f3a09ea21bd3f5b6eb0a4e0ec571 /Source/WebCore/rendering | |
| parent | a921a7a3e5bb1bc5531af9e88cf9f1e3781a9843 (diff) | |
| download | external_webkit-c58b6b265aa9aca56296a4c1199521fe4ab3cb70.zip external_webkit-c58b6b265aa9aca56296a4c1199521fe4ab3cb70.tar.gz external_webkit-c58b6b265aa9aca56296a4c1199521fe4ab3cb70.tar.bz2 | |
Add RenderObject::isBeforeOrAfterContent() from r94543 as a prerequisite for r105769
See http://trac.webkit.org/changeset/94543
Bug: 6329129
Change-Id: I02da7a9f891a6eec394398529f64b0992cbfce70
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/RenderObject.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderObject.h b/Source/WebCore/rendering/RenderObject.h index 005c453..f5fe562 100644 --- a/Source/WebCore/rendering/RenderObject.h +++ b/Source/WebCore/rendering/RenderObject.h @@ -312,6 +312,7 @@ public: inline bool isBeforeContent() const; inline bool isAfterContent() const; + inline bool isBeforeOrAfterContent() const; static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); } static inline bool isAfterContent(const RenderObject* obj) { return obj && obj->isAfterContent(); } @@ -917,6 +918,11 @@ inline bool RenderObject::isAfterContent() const return true; } +inline bool RenderObject::isBeforeOrAfterContent() const +{ + return isBeforeContent() || isAfterContent(); +} + inline void RenderObject::setNeedsLayout(bool b, bool markParents) { bool alreadyNeededLayout = m_needsLayout; |