[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_Corrected_b?=
From:       Allan Sandfeld Jensen <carewolf () cinex ! carewolf ! com>
Date:       2011-03-24 20:34:12
Message-ID: 20110324203412.ADADCA60B9 () git ! kde ! org
[Download RAW message or body]

Git commit eb453701c361437c8003333fb138cf88be821e6b by Allan Sandfeld Jensen.
Committed on 21/03/2011 at 16:08.
Pushed by carewolf into branch 'KDE/4.6'.

Corrected backgroundlayer operators

Operator= and operator== lacked handling some parameters

M  +3    -1    khtml/rendering/render_style.cpp     

http://commits.kde.org/kdelibs/eb453701c361437c8003333fb138cf88be821e6b

diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp
index c37f3bb..f653706 100644
--- a/khtml/rendering/render_style.cpp
+++ b/khtml/rendering/render_style.cpp
@@ -164,6 +164,7 @@ 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;
@@ -177,7 +178,8 @@ 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_repeatSet == o.m_repeatSet && +           m_imageSet == o.m_imageSet && \
m_attachmentSet == o.m_attachmentSet &&  m_clipSet == o.clipSet && +           \
                m_originSet == o.m_originSet && 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]