Title: [109658] trunk/Source/WebCore
- Revision
- 109658
- Author
- [email protected]
- Date
- 2012-03-03 01:12:21 -0800 (Sat, 03 Mar 2012)
Log Message
Free up a bit in RenderObject.
http://webkit.org/b/80208
Patch by Andreas Kling <[email protected]> on 2012-03-03
Reviewed by Anders Carlsson.
Move m_hasMarkupTruncation to RenderBlock, stealing one bit from m_lineHeight.
This flag is only used by RenderBlock.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::RenderBlock):
* rendering/RenderBlock.h:
(WebCore::RenderBlock::setHasMarkupTruncation):
(WebCore::RenderBlock::hasMarkupTruncation):
(RenderBlock):
* rendering/RenderObject.h:
(RenderObject):
(WebCore::RenderObject::RenderObjectBitfields::RenderObjectBitfields):
(RenderObjectBitfields):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (109657 => 109658)
--- trunk/Source/WebCore/ChangeLog 2012-03-03 09:09:54 UTC (rev 109657)
+++ trunk/Source/WebCore/ChangeLog 2012-03-03 09:12:21 UTC (rev 109658)
@@ -1,3 +1,24 @@
+2012-03-03 Andreas Kling <[email protected]>
+
+ Free up a bit in RenderObject.
+ http://webkit.org/b/80208
+
+ Reviewed by Anders Carlsson.
+
+ Move m_hasMarkupTruncation to RenderBlock, stealing one bit from m_lineHeight.
+ This flag is only used by RenderBlock.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::RenderBlock):
+ * rendering/RenderBlock.h:
+ (WebCore::RenderBlock::setHasMarkupTruncation):
+ (WebCore::RenderBlock::hasMarkupTruncation):
+ (RenderBlock):
+ * rendering/RenderObject.h:
+ (RenderObject):
+ (WebCore::RenderObject::RenderObjectBitfields::RenderObjectBitfields):
+ (RenderObjectBitfields):
+
2012-03-03 Joe Thomas <[email protected]>
Implement vw/vh/vmin (viewport sizes) from CSS 3 Values and Units
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (109657 => 109658)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-03-03 09:09:54 UTC (rev 109657)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-03-03 09:12:21 UTC (rev 109658)
@@ -166,6 +166,7 @@
, m_lineHeight(-1)
, m_beingDestroyed(false)
, m_hasPositionedFloats(false)
+ , m_hasMarkupTruncation(false)
{
setChildrenInline(true);
}
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (109657 => 109658)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2012-03-03 09:09:54 UTC (rev 109657)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2012-03-03 09:12:21 UTC (rev 109658)
@@ -113,6 +113,9 @@
static bool hasPercentHeightDescendant(RenderBox*);
#endif
+ void setHasMarkupTruncation(bool b) { m_hasMarkupTruncation = b; }
+ bool hasMarkupTruncation() const { return m_hasMarkupTruncation; }
+
RootInlineBox* createAndAppendRootInlineBox();
bool generatesLineBoxesForInlineChild(RenderObject*);
@@ -1119,9 +1122,10 @@
RenderObjectChildList m_children;
RenderLineBoxList m_lineBoxes; // All of the root line boxes created for this block flow. For example, <div>Hello<br>world.</div> will have two total lines for the <div>.
- mutable signed m_lineHeight : 30;
+ mutable signed m_lineHeight : 29;
bool m_beingDestroyed : 1;
bool m_hasPositionedFloats : 1;
+ bool m_hasMarkupTruncation : 1;
// RenderRubyBase objects need to be able to split and merge, moving their children around
// (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline).
Modified: trunk/Source/WebCore/rendering/RenderObject.h (109657 => 109658)
--- trunk/Source/WebCore/rendering/RenderObject.h 2012-03-03 09:09:54 UTC (rev 109657)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2012-03-03 09:12:21 UTC (rev 109658)
@@ -746,9 +746,6 @@
// Applied as a "slop" to dirty rect checks during the outline painting phase's dirty-rect checks.
LayoutUnit maximalOutlineSize(PaintPhase) const;
- void setHasMarkupTruncation(bool b = true) { m_bitfields.setHasMarkupTruncation(b); }
- bool hasMarkupTruncation() const { return m_bitfields.hasMarkupTruncation(); }
-
enum SelectionState {
SelectionNone, // The object is not selected.
SelectionStart, // The object either contains the start of a selection run or is the start of a run
@@ -934,7 +931,6 @@
, m_childrenInline(false)
, m_marginBeforeQuirk(false)
, m_marginAfterQuirk(false)
- , m_hasMarkupTruncation(false)
, m_hasColumns(false)
, m_selectionState(SelectionNone)
{
@@ -978,7 +974,6 @@
ADD_BOOLEAN_BITFIELD(childrenInline, ChildrenInline);
ADD_BOOLEAN_BITFIELD(marginBeforeQuirk, MarginBeforeQuirk);
ADD_BOOLEAN_BITFIELD(marginAfterQuirk, MarginAfterQuirk);
- ADD_BOOLEAN_BITFIELD(hasMarkupTruncation, HasMarkupTruncation);
ADD_BOOLEAN_BITFIELD(hasColumns, HasColumns);
private:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
