diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-03 17:11:27 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-03 17:11:27 +0000 |
| commit | d0abc1a165ce7130e802d892e1417617a99a3ba0 (patch) | |
| tree | 7dc885cf1d4bca7a30bfa8877164008c4966f6b3 /khtml/rendering/render_style.cpp | |
| parent | c5415f69834f13834179331af41329980fe8a3e8 (diff) | |
| download | tdelibs-d0abc1a165ce7130e802d892e1417617a99a3ba0.tar.gz tdelibs-d0abc1a165ce7130e802d892e1417617a99a3ba0.zip | |
Merge commit 1170303 from the Enterprise branch
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1171389 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/rendering/render_style.cpp')
| -rw-r--r-- | khtml/rendering/render_style.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp index 18c520ad4..a71dd4116 100644 --- a/khtml/rendering/render_style.cpp +++ b/khtml/rendering/render_style.cpp @@ -429,7 +429,7 @@ bool StyleCSS3NonInheritedData::operator==(const StyleCSS3NonInheritedData& o) c } StyleCSS3InheritedData::StyleCSS3InheritedData() -:Shared<StyleCSS3InheritedData>(), textShadow(0) +:Shared<StyleCSS3InheritedData>(), textShadow(0), wordWrap(RenderStyle::initialWordWrap()) #ifdef APPLE_CHANGES , userModify(READ_ONLY), textSizeAdjust(RenderStyle::initialTextSizeAdjust()) #endif @@ -441,6 +441,7 @@ StyleCSS3InheritedData::StyleCSS3InheritedData(const StyleCSS3InheritedData& o) :Shared<StyleCSS3InheritedData>() { textShadow = o.textShadow ? new ShadowData(*o.textShadow) : 0; + wordWrap = o.wordWrap; #ifdef APPLE_CHANGES userModify = o.userModify; textSizeAdjust = o.textSizeAdjust; @@ -454,7 +455,7 @@ StyleCSS3InheritedData::~StyleCSS3InheritedData() bool StyleCSS3InheritedData::operator==(const StyleCSS3InheritedData& o) const { - return shadowDataEquivalent(o) + return shadowDataEquivalent(o) && (wordWrap == o.wordWrap) #ifdef APPLE_CHANGES && (userModify == o.userModify) && (textSizeAdjust == o.textSizeAdjust) #endif |