[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bkdelibs/KDE/4=2E6=5D_khtml/rendering=3A_Revert_=22C?=
From: Allan Sandfeld Jensen <kde () carewolf ! com>
Date: 2011-03-24 23:27:11
Message-ID: 20110324232711.95CC7A609B () git ! kde ! org
[Download RAW message or body]
Git commit 61d75c0c2ab77e8d0773b260f3ae5b8da67d00db by Allan Sandfeld Jensen.
Committed on 25/03/2011 at 00:12.
Pushed by carewolf into branch 'KDE/4.6'.
Revert "Corrected backgroundlayer operators"
This reverts commit eb453701c361437c8003333fb138cf88be821e6b.
Conflicts:
khtml/rendering/render_style.cpp
M +1 -3 khtml/rendering/render_style.cpp
http://commits.kde.org/kdelibs/61d75c0c2ab77e8d0773b260f3ae5b8da67d00db
diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp
index f5f889a..c37f3bb 100644
--- a/khtml/rendering/render_style.cpp
+++ b/khtml/rendering/render_style.cpp
@@ -164,7 +164,6 @@ BackgroundLayer& BackgroundLayer::operator=(const \
BackgroundLayer& o) {
m_imageSet = o.m_imageSet;
m_attachmentSet = o.m_attachmentSet;
- m_clipSet = o.m_clipSet;
m_originSet = o.m_originSet;
m_repeatSet = o.m_repeatSet;
m_xPosSet = o.m_xPosSet;
@@ -178,8 +177,7 @@ bool BackgroundLayer::operator==(const BackgroundLayer& o) const \
{
return m_image == o.m_image && m_xPosition == o.m_xPosition && m_yPosition == \
o.m_yPosition &&
m_bgAttachment == o.m_bgAttachment && m_bgClip == o.m_bgClip && \
m_bgOrigin == o.m_bgOrigin && m_bgRepeat == o.m_bgRepeat &&
m_backgroundSize.width == o.m_backgroundSize.width && m_bgSizeType == \
o.m_bgSizeType && m_backgroundSize.height == \
o.m_backgroundSize.height &&
- m_imageSet == o.m_imageSet && m_attachmentSet == o.m_attachmentSet && \
m_clipSet == o.m_clipSet &&
- m_originSet == o.m_originSet && m_repeatSet == o.m_repeatSet &&
+ m_imageSet == o.m_imageSet && m_attachmentSet == o.m_attachmentSet && \
m_repeatSet == o.m_repeatSet &&
m_xPosSet == o.m_xPosSet && m_yPosSet == o.m_yPosSet && \
m_backgroundSizeSet == o.m_backgroundSizeSet &&
((m_next && o.m_next) ? *m_next == *o.m_next : m_next == o.m_next);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic