diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/rendering/InlineBox.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/rendering/InlineBox.h')
| -rw-r--r-- | Source/WebCore/rendering/InlineBox.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/rendering/InlineBox.h b/Source/WebCore/rendering/InlineBox.h index 5b3f682..d486ec0 100644 --- a/Source/WebCore/rendering/InlineBox.h +++ b/Source/WebCore/rendering/InlineBox.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -61,7 +61,7 @@ public: , m_determinedIfPrevOnLineExists(false) , m_nextOnLineExists(false) , m_prevOnLineExists(false) - , m_toAdd(0) + , m_expansion(0) #ifndef NDEBUG , m_hasBadParent(false) #endif @@ -95,7 +95,7 @@ public: , m_determinedIfPrevOnLineExists(false) , m_nextOnLineExists(false) , m_prevOnLineExists(false) - , m_toAdd(0) + , m_expansion(0) #ifndef NDEBUG , m_hasBadParent(false) #endif @@ -290,7 +290,7 @@ public: void setHasBadParent(); - int toAdd() const { return m_toAdd; } + int expansion() const { return m_expansion; } bool visibleToHitTesting() const { return renderer()->style()->visibility() == VISIBLE && renderer()->style()->pointerEvents() != PE_NONE; } @@ -348,7 +348,7 @@ protected: mutable bool m_determinedIfPrevOnLineExists : 1; mutable bool m_nextOnLineExists : 1; mutable bool m_prevOnLineExists : 1; - int m_toAdd : 11; // for justified text + int m_expansion : 11; // for justified text #ifndef NDEBUG private: |