From 0d60b06b516046b4602a51899d51d6568cdd1a66 Mon Sep 17 00:00:00 2001 From: kipp Date: Mon, 27 Apr 1998 21:21:42 +0000 Subject: [PATCH] Init nsStyleText values using new nsStyleValue git-svn-id: svn://10.0.0.236/trunk@712 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsStyleContext.cpp | 11 ++++++----- mozilla/layout/base/src/nsStyleContext.cpp | 11 ++++++----- mozilla/layout/style/nsStyleContext.cpp | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp index 1d2c47db000..d702d1b7bc3 100644 --- a/mozilla/content/base/src/nsStyleContext.cpp +++ b/mozilla/content/base/src/nsStyleContext.cpp @@ -270,12 +270,13 @@ struct StyleTextImpl: public nsStyleText { mTextAlign = NS_STYLE_TEXT_ALIGN_LEFT; mTextDecoration = NS_STYLE_TEXT_DECORATION_NONE; mTextTransform = NS_STYLE_TEXT_TRANSFORM_NONE; - mVerticalAlign = NS_STYLE_VERTICAL_ALIGN_BASELINE; + mVerticalAlignFlags = NS_STYLE_VERTICAL_ALIGN_BASELINE; mWhiteSpace = NS_STYLE_WHITESPACE_NORMAL; - mLetterSpacing = 0; - mLineHeight = 0; - mTextIndent = 0; - mWordSpacing = 0; + mLetterSpacing.coord = 0; + mLineHeight.coord = 0; + mTextIndent.coord = 0; + mWordSpacing.coord = 0; + mVerticalAlign.coord = 0; } ~StyleTextImpl() { } diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp index 1d2c47db000..d702d1b7bc3 100644 --- a/mozilla/layout/base/src/nsStyleContext.cpp +++ b/mozilla/layout/base/src/nsStyleContext.cpp @@ -270,12 +270,13 @@ struct StyleTextImpl: public nsStyleText { mTextAlign = NS_STYLE_TEXT_ALIGN_LEFT; mTextDecoration = NS_STYLE_TEXT_DECORATION_NONE; mTextTransform = NS_STYLE_TEXT_TRANSFORM_NONE; - mVerticalAlign = NS_STYLE_VERTICAL_ALIGN_BASELINE; + mVerticalAlignFlags = NS_STYLE_VERTICAL_ALIGN_BASELINE; mWhiteSpace = NS_STYLE_WHITESPACE_NORMAL; - mLetterSpacing = 0; - mLineHeight = 0; - mTextIndent = 0; - mWordSpacing = 0; + mLetterSpacing.coord = 0; + mLineHeight.coord = 0; + mTextIndent.coord = 0; + mWordSpacing.coord = 0; + mVerticalAlign.coord = 0; } ~StyleTextImpl() { } diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp index 1d2c47db000..d702d1b7bc3 100644 --- a/mozilla/layout/style/nsStyleContext.cpp +++ b/mozilla/layout/style/nsStyleContext.cpp @@ -270,12 +270,13 @@ struct StyleTextImpl: public nsStyleText { mTextAlign = NS_STYLE_TEXT_ALIGN_LEFT; mTextDecoration = NS_STYLE_TEXT_DECORATION_NONE; mTextTransform = NS_STYLE_TEXT_TRANSFORM_NONE; - mVerticalAlign = NS_STYLE_VERTICAL_ALIGN_BASELINE; + mVerticalAlignFlags = NS_STYLE_VERTICAL_ALIGN_BASELINE; mWhiteSpace = NS_STYLE_WHITESPACE_NORMAL; - mLetterSpacing = 0; - mLineHeight = 0; - mTextIndent = 0; - mWordSpacing = 0; + mLetterSpacing.coord = 0; + mLineHeight.coord = 0; + mTextIndent.coord = 0; + mWordSpacing.coord = 0; + mVerticalAlign.coord = 0; } ~StyleTextImpl() { }