[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 07d212a7852118ee622e7576fcb024ab781a6e1e
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 21:40:58 2011 +0000

    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.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74937 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5163266..279b989 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-03  Dan Bernstein  <mitz at 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 at collabora.co.uk>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/rendering/RootInlineBox.cpp b/WebCore/rendering/RootInlineBox.cpp
index 7c2ac98..710224e 100644
--- a/WebCore/rendering/RootInlineBox.cpp
+++ b/WebCore/rendering/RootInlineBox.cpp
@@ -238,7 +238,7 @@ int RootInlineBox::alignBoxesInBlockDirection(int heightOfBlock, GlyphOverflowAn
     m_baselineType = requiresIdeographicBaseline(textBoxDataMap) ? IdeographicBaseline : AlphabeticBaseline;
 
     computeLogicalBoxHeights(maxPositionTop, maxPositionBottom, maxAscent, maxDescent, setMaxAscent, setMaxDescent, noQuirksMode,
-                             textBoxDataMap, m_baselineType, verticalPositionCache);
+                             textBoxDataMap, baselineType(), verticalPositionCache);
 
     if (maxAscent + maxDescent < max(maxPositionTop, maxPositionBottom))
         adjustMaxAscentAndDescent(maxAscent, maxDescent, maxPositionTop, maxPositionBottom);
@@ -252,7 +252,7 @@ int RootInlineBox::alignBoxesInBlockDirection(int heightOfBlock, GlyphOverflowAn
     bool hasAnnotationsBefore = false;
     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;
     setLineTopBottomPositions(lineTop, lineBottom);
diff --git a/WebCore/rendering/RootInlineBox.h b/WebCore/rendering/RootInlineBox.h
index 9fe80a1..7c4b15c 100644
--- a/WebCore/rendering/RootInlineBox.h
+++ b/WebCore/rendering/RootInlineBox.h
@@ -126,7 +126,7 @@ public:
     virtual void attachLineBoxToRenderObject();
     virtual void removeLineBoxFromRenderObject();
     
-    FontBaseline baselineType() const { return m_baselineType; }
+    FontBaseline baselineType() const { return static_cast<FontBaseline>(m_baselineType); }
 
     bool hasAnnotationsBefore() const { return m_hasAnnotationsBefore; }
     bool hasAnnotationsAfter() const { return m_hasAnnotationsAfter; }
@@ -158,7 +158,7 @@ private:
     int m_blockLogicalHeight;
 
     // 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.
     bool m_hasAnnotationsBefore : 1;

-- 
WebKit Debian packaging