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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 5998f1261a08d2633e35b88b011776e6c7cc09df
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 17 01:19:22 2004 +0000

            Reviewed by John.
    
    	<rdar://problem/3697602> REGRESSION (144.2-TOT) Selection highlight does not draw
    
            * khtml/rendering/render_canvas.cpp:
            (RenderCanvas::setSelection):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 97ce926..de01419 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-06-16  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	<rdar://problem/3697602> REGRESSION (144.2-TOT) Selection highlight does not draw
+
+        * khtml/rendering/render_canvas.cpp:
+        (RenderCanvas::setSelection):
+
 === Safari-145 ===
 
 2004-06-16  Richard Williamson   <rjw at apple.com>
diff --git a/WebCore/khtml/rendering/render_canvas.cpp b/WebCore/khtml/rendering/render_canvas.cpp
index eca83aa..67ecf94 100644
--- a/WebCore/khtml/rendering/render_canvas.cpp
+++ b/WebCore/khtml/rendering/render_canvas.cpp
@@ -425,7 +425,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
     
     while (o && o!=e)
     {
-        if (o->style()->userSelect())
+        if (o->style()->userSelect() != SELECT_NONE)
             o->setSelectionState(SelectionInside);
 //      kdDebug( 6040 ) << "setting selected " << o << ", " << o->isText() << endl;
         RenderObject* no = 0;
@@ -446,11 +446,11 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
         o=no;
     }
     
-    if (s->style()->userSelect())
+    if (s->style()->userSelect() != SELECT_NONE)
         s->setSelectionState(SelectionStart);
-    if (e->style()->userSelect())
+    if (e->style()->userSelect() != SELECT_NONE)
         e->setSelectionState(SelectionEnd);
-    if (s == e && s->style()->userSelect())
+    if (s == e && s->style()->userSelect() != SELECT_NONE)
         s->setSelectionState(SelectionBoth);
 
 #if APPLE_CHANGES

-- 
WebKit Debian packaging