[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 4066d0b8b40024efa7b38f2e31a4795900a78794
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 20 05:16:32 2003 +0000

    	Fix for 3483130, repaint doesn't occur when font is decreased dynamically when at the bottom of
    	amazon.com.
    
            Reviewed by john
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::setZoomFactor):
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge setTextSizeMultiplier:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5840 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 03cf335..e1bcd5d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-12-19  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3483130, repaint doesn't occur when font is decreased dynamically when at the bottom of
+	amazon.com.
+	
+        Reviewed by john
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::setZoomFactor):
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge setTextSizeMultiplier:]):
+
 2003-12-19  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3515590.  Return Undefined to JS for applet if
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 7f36cff..68a74c8 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4159,6 +4159,9 @@ void KHTMLPart::setZoomFactor (int percent)
   d->m_paDecZoomFactor->setEnabled( d->m_zoomFactor > minZoom );
   d->m_paIncZoomFactor->setEnabled( d->m_zoomFactor < maxZoom );
 #endif
+
+  if (d->m_doc && d->m_doc->renderer() && d->m_doc->renderer()->needsLayout())
+    view()->layout();
 }
 
 void KHTMLPart::setJSStatusBarText( const QString &text )
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index b46e476..cbc7156 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -867,9 +867,6 @@ static HTMLFormElementImpl *formElementFromDOMElement(id <WebDOMElement>element)
         return;
     }
     _part->setZoomFactor(newZoomFactor);
-    // setZoomFactor will trigger a timed layout, but we want to do the layout before
-    // we do any drawing. This takes care of that. Without this we redraw twice.
-    [self setNeedsLayout];
 }
 
 - (CFStringEncoding)textEncoding

-- 
WebKit Debian packaging