Changeset 74937 in webkit

Timestamp:

Jan 3, 2011, 1:40:58 PM (14 years ago)

Author:

mitz@apple.com

Message:

Shrink RootInlineBox
​https://bugs.webkit.org/show_bug.cgi?id=51847

Reviewed by Darin Adler.

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::alignBoxesInBlockDirection): Changed to use the baselineType()
accessor.

• rendering/RootInlineBox.h: Rolled m_baselineType into a bitfield. Changed its type to

unsigned because otherwise MSVC treats it as signed.
(WebCore::RootInlineBox::baselineType): Added a cast.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RootInlineBox.cpp (modified) (2 diffs)
• rendering/RootInlineBox.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-03  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Shrink RootInlineBox
+        https://bugs.webkit.org/show_bug.cgi?id=51847
+
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::alignBoxesInBlockDirection): Changed to use the baselineType()
+        accessor.
+        * rendering/RootInlineBox.h: Rolled m_baselineType into a bitfield. Changed its type to
+        unsigned because otherwise MSVC treats it as signed.
+        (WebCore::RootInlineBox::baselineType): Added a cast.
+
 2011-01-03  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebCore/rendering/RootInlineBox.cpp

@@ -239 +239 @@
 
     computeLogicalBoxHeights(maxPositionTop, maxPositionBottom, maxAscent, maxDescent, setMaxAscent, setMaxDescent, noQuirksMode,
-                             textBoxDataMap, m_baselineType, verticalPositionCache);
+                             textBoxDataMap, baselineType(), verticalPositionCache);
 
     if (maxAscent + maxDescent < max(maxPositionTop, maxPositionBottom))
@@ -253 +253 @@
     bool hasAnnotationsAfter = false;
     placeBoxesInBlockDirection(heightOfBlock, maxHeight, maxAscent, noQuirksMode, lineTop, lineBottom, setLineTop,
-                               lineTopIncludingMargins, lineBottomIncludingMargins, hasAnnotationsBefore, hasAnnotationsAfter, m_baselineType);
+                               lineTopIncludingMargins, lineBottomIncludingMargins, hasAnnotationsBefore, hasAnnotationsAfter, baselineType());
     m_hasAnnotationsBefore = hasAnnotationsBefore;
     m_hasAnnotationsAfter = hasAnnotationsAfter;

trunk/WebCore/rendering/RootInlineBox.h

@@ -127 +127 @@
     virtual void removeLineBoxFromRenderObject();
     
-    FontBaseline baselineType() const { return m_baselineType; }
+    FontBaseline baselineType() const { return static_cast<FontBaseline>(m_baselineType); }
 
     bool hasAnnotationsBefore() const { return m_hasAnnotationsBefore; }
@@ -159 +159 @@
 
     // Whether or not this line uses alphabetic or ideographic baselines by default.
-    FontBaseline m_baselineType;
+    unsigned m_baselineType : 1; // FontBaseline
     
     // If the line contains any ruby runs, then this will be true.