HaikuDepot: Removed no longer needed info from GlyphInfo.

src/apps/haiku-depot/textview/ParagraphLayout.cpp

@@ -320,8 +320,6 @@ ParagraphLayout::_Layout()
 //				advanceX = tabOffset - x;
 //		}
 
-		glyph.advanceX = advanceX;
-
 		if (glyph.charCode == '\n') {
 			nextLine = true;
 			lineBreak = true;
@@ -461,8 +459,7 @@ ParagraphLayout::_AppendGlyphInfo(uint32 charCode, float width,
 
 	width += style.GlyphSpacing();
 	
-	GlyphInfo glyph(charCode, 0.0f, width, width, 0, style);
+	return fGlyphInfos.Add(GlyphInfo(charCode, 0.0f, width, 0));
-	return fGlyphInfos.Add(glyph);
 }
 
 

src/apps/haiku-depot/textview/ParagraphLayout.h

@@ -23,21 +23,16 @@ public:
 		charCode(0),
 		x(0.0f),
 		width(0.0f),
-		advanceX(0.0f),
+		lineIndex(0)
-		lineIndex(0),
-		style()
 	{
 	}
 
-	GlyphInfo(uint32 charCode, float x, float width, float advanceX,
+	GlyphInfo(uint32 charCode, float x, float width, int32 lineIndex)
-			int32 lineIndex, const CharacterStyle& style)
 		:
 		charCode(charCode),
 		x(x),
 		width(width),
-		advanceX(advanceX),
+		lineIndex(lineIndex)
-		lineIndex(lineIndex),
-		style(style)
 	{
 	}
 	
@@ -46,9 +41,7 @@ public:
 		charCode(other.charCode),
 		x(other.x),
 		width(other.width),
-		advanceX(other.advanceX),
+		lineIndex(other.lineIndex)
-		lineIndex(other.lineIndex),
-		style(other.style)
 	{
 	}
 
@@ -57,9 +50,7 @@ public:
 		charCode = other.charCode;
 		x = other.x;
 		width = other.width;
-		advanceX = other.advanceX;
 		lineIndex = other.lineIndex;
-		style = other.style;
 		return *this;
 	}
 
@@ -68,9 +59,7 @@ public:
 		return charCode == other.charCode
 			&& x == other.x
 			&& width == other.width
-			&& advanceX == other.advanceX
+			&& lineIndex == other.lineIndex;
-			&& lineIndex == other.lineIndex
-			&& style == other.style;
 	}
 
 	bool operator!=(const GlyphInfo& other) const
@@ -83,11 +72,8 @@ public:
 
 	float					x;
 	float					width;
-	float					advanceX;
 
 	int32					lineIndex;
-
-	CharacterStyle			style;
 };