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

[darin]

The following commit has been merged in the debian/unstable branch:
commit ab2dbdbb5c4734f502912e7eb909755b7676caef
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 8 22:51:24 2003 +0000

            Reviewed by Dave.
    
            - fixed regression caused by my last check-in; need to use the KHTMLView layout function
    
            * kwq/KWQWidget.mm: (QWidget::setFocus): Use KHTMLView's layout instead of RenderCanvas's.
    
    	- fixed 3251913 -- when form field has focus, dragging across text elsewhere does not select it
    
            * khtml/xml/dom_docimpl.cpp:
            (DocumentImpl::setSelection): Remove setFocusNode(0) call. Apparently not needed these days.
            I tested and everything works fine without it, and its side effect was the bug above.
            (DocumentImpl::setFocusNode): Remove clearSelection() call for similar reasons.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4318 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 54e7714..744c284 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,20 @@
 2003-05-08  Darin Adler  <darin at apple.com>
 
+        Reviewed by Dave.
+
+        - fixed regression caused by my last check-in; need to use the KHTMLView layout function
+
+        * kwq/KWQWidget.mm: (QWidget::setFocus): Use KHTMLView's layout instead of RenderCanvas's.
+
+	- fixed 3251913 -- when form field has focus, dragging across text elsewhere does not select it
+
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::setSelection): Remove setFocusNode(0) call. Apparently not needed these days.
+        I tested and everything works fine without it, and its side effect was the bug above.
+        (DocumentImpl::setFocusNode): Remove clearSelection() call for similar reasons.
+
+2003-05-08  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
 	- fixed 3251985 -- REGRESSION: tabbing doesn't scroll text fields into view any more
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 54e7714..744c284 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,20 @@
 2003-05-08  Darin Adler  <darin at apple.com>
 
+        Reviewed by Dave.
+
+        - fixed regression caused by my last check-in; need to use the KHTMLView layout function
+
+        * kwq/KWQWidget.mm: (QWidget::setFocus): Use KHTMLView's layout instead of RenderCanvas's.
+
+	- fixed 3251913 -- when form field has focus, dragging across text elsewhere does not select it
+
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::setSelection): Remove setFocusNode(0) call. Apparently not needed these days.
+        I tested and everything works fine without it, and its side effect was the bug above.
+        (DocumentImpl::setFocusNode): Remove clearSelection() call for similar reasons.
+
+2003-05-08  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
 	- fixed 3251985 -- REGRESSION: tabbing doesn't scroll text fields into view any more
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 385dca3..1815684 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -1071,10 +1071,6 @@ void DocumentImpl::setVisuallyOrdered()
 
 void DocumentImpl::setSelection(NodeImpl* s, int sp, NodeImpl* e, int ep)
 {
-#if APPLE_CHANGES
-    // With Macintosh UI, you can't have both a selection and a focused node.
-    setFocusNode(0);
-#endif
     if ( m_render )
         static_cast<RenderCanvas*>(m_render)->setSelection(s->renderer(),sp,e->renderer(),ep);
 }
@@ -2049,10 +2045,6 @@ void DocumentImpl::setFocusNode(NodeImpl *newFocusNode)
                 else if (static_cast<RenderWidget*>(m_focusNode->renderer())->widget())
                     static_cast<RenderWidget*>(m_focusNode->renderer())->widget()->setFocus();
             }
-#if APPLE_CHANGES
-            // With Macintosh UI, you can't have both a selection and a focused node.
-            clearSelection();
-#endif
         }
 
         updateRendering();
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 8f5a5f0..0f25ac2 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -195,7 +195,9 @@ void QWidget::setFocus()
     RenderWidget *renderWidget = dynamic_cast<RenderWidget *>(const_cast<QObject *>(eventFilterObject()));
     int x, y;
     if (renderWidget) {
-        renderWidget->canvas()->layoutIfNeeded();
+        if (renderWidget->canvas()->needsLayout()) {
+            renderWidget->view()->layout();
+        }
         if (renderWidget->absolutePosition(x, y)) {
             renderWidget->view()->addChild(this, x, y);
         }

-- 
WebKit Debian packaging