[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit b874a453b53d750c37dbbd96620c9dacb503e1d6
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 31 01:51:46 2003 +0000

    	Fix for 3469330, the Marquee data in RenderStyle needs a copy constructor hack like all the other
    	objects do.
    
            * khtml/rendering/render_style.cpp:
            (direction):
            * khtml/rendering/render_style.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5337 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 61a37c4..1feab33 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-10-30  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3469330, the Marquee data in RenderStyle needs a copy constructor hack like all the other
+	objects do.
+
+        * khtml/rendering/render_style.cpp:
+        (direction):
+        * khtml/rendering/render_style.h:
+
+2003-10-30  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3469206, images didn't paint outlines any more.  They were bailing early because I forgot to
 	add a check for my new PaintAction.
 	
diff --git a/WebCore/khtml/rendering/render_style.cpp b/WebCore/khtml/rendering/render_style.cpp
index 08c922c..f28a62e 100644
--- a/WebCore/khtml/rendering/render_style.cpp
+++ b/WebCore/khtml/rendering/render_style.cpp
@@ -139,6 +139,11 @@ StyleMarqueeData::StyleMarqueeData()
     loops = -1; // Loop forever by default. Matches WinIE.
 }
 
+StyleMarqueeData::StyleMarqueeData(const StyleMarqueeData& o)
+:Shared<StyleMarqueeData>(), increment(o.increment), speed(o.speed), loops(o.loops),
+ behavior(o.behavior), direction(o.direction) 
+{}
+
 bool StyleMarqueeData::operator==(const StyleMarqueeData& o) const
 {
     return (increment == o.increment && speed == o.speed && direction == o.direction &&
diff --git a/WebCore/khtml/rendering/render_style.h b/WebCore/khtml/rendering/render_style.h
index 8c1a2f8..84a1724 100644
--- a/WebCore/khtml/rendering/render_style.h
+++ b/WebCore/khtml/rendering/render_style.h
@@ -416,6 +416,7 @@ class StyleMarqueeData : public Shared<StyleMarqueeData>
 {
 public:
     StyleMarqueeData();
+    StyleMarqueeData(const StyleMarqueeData& o);
     
     bool operator==(const StyleMarqueeData& o) const;
     bool operator!=(const StyleMarqueeData& o) const {

-- 
WebKit Debian packaging