[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 97f49c452a6fa877c909bec39aec46c6503a792c
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 26 23:38:01 2003 +0000

    	Additional cleanup.  Don't need the arg to be a reference param
    	any more.
    
            Reviewed by mjs
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::getTextDecorationColors):
            * khtml/rendering/render_object.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3708 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2476fb9..7c6b04e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-02-26  David Hyatt  <hyatt at apple.com>
+
+	Additional cleanup.  Don't need the arg to be a reference param
+	any more.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::getTextDecorationColors):
+        * khtml/rendering/render_object.h:
+
 2003-02-26  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2476fb9..7c6b04e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-02-26  David Hyatt  <hyatt at apple.com>
+
+	Additional cleanup.  Don't need the arg to be a reference param
+	any more.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::getTextDecorationColors):
+        * khtml/rendering/render_object.h:
+
 2003-02-26  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index d216c86..e151689 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1406,40 +1406,39 @@ InlineBox* RenderObject::createInlineBox()
     return new (renderArena()) InlineBox(this);
 }
 
-void RenderObject::getTextDecorationColors(int& decorations, QColor& underline, QColor& overline,
+void RenderObject::getTextDecorationColors(int decorations, QColor& underline, QColor& overline,
                                            QColor& linethrough, bool quirksMode)
 {
-    int newDecorations = decorations;
     RenderObject* curr = this;
     do {
         int currDecs = curr->style()->textDecoration();
         if (currDecs) {
             if (currDecs & UNDERLINE) {
-                newDecorations &= ~UNDERLINE;
+                decorations &= ~UNDERLINE;
                 underline = curr->style()->color();
             }
             if (currDecs & OVERLINE) {
-                newDecorations &= ~OVERLINE;
+                decorations &= ~OVERLINE;
                 overline = curr->style()->color();
             }
             if (currDecs & LINE_THROUGH) {
-                newDecorations &= ~LINE_THROUGH;
+                decorations &= ~LINE_THROUGH;
                 linethrough = curr->style()->color();
             }
         }
         curr = curr->parent();
         if (curr && curr->isRenderBlock() && curr->continuation())
             curr = curr->continuation();
-    } while (curr && newDecorations && (!quirksMode || !curr->element() ||
-                                        (curr->element()->id() != ID_A && curr->element()->id() != ID_FONT)));
+    } while (curr && decorations && (!quirksMode || !curr->element() ||
+                                     (curr->element()->id() != ID_A && curr->element()->id() != ID_FONT)));
 
     // If we bailed out, use the element we bailed out at (typically a <font> or <a> element).
-    if (newDecorations && curr) {
-        if (newDecorations & UNDERLINE)
+    if (decorations && curr) {
+        if (decorations & UNDERLINE)
             underline = curr->style()->color();
-        if (newDecorations & OVERLINE)
+        if (decorations & OVERLINE)
             overline = curr->style()->color();
-        if (newDecorations & LINE_THROUGH)
+        if (decorations & LINE_THROUGH)
             linethrough = curr->style()->color();
     }        
 }
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index 2d15b6d..3af8665 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -487,7 +487,7 @@ public:
 	return s;
     }
 
-    void getTextDecorationColors(int& decorations, QColor& underline, QColor& overline,
+    void getTextDecorationColors(int decorations, QColor& underline, QColor& overline,
                                  QColor& linethrough, bool quirksMode=false);
 
     enum BorderSide {

-- 
WebKit Debian packaging