[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 6cae97b8eb70fc4dd8e9ed2b559ea5d426d879ec
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 14 23:02:28 2004 +0000

            Reviewed by Darin, coded by Maciej.
    
            - fixed extra repaints when doing auto-fill checks on all pages that have pop-up buttons
    
            * kwq/KWQComboBox.mm:
            (QComboBox::populateMenu): Set the populating-menu flag and clear it when done.
            (-[KWQPopUpButton setPopulatingMenu:]): Added. Sets flag.
            (-[KWQPopUpButton setNeedsDisplayInRect:]): Do nothing if the flag is set.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6608 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e57fb0f..9ba3bb6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2004-05-14  Darin Adler  <darin at apple.com>
 
+        Reviewed by Darin, coded by Maciej.
+
+        - fixed extra repaints when doing auto-fill checks on all pages that have pop-up buttons
+
+        * kwq/KWQComboBox.mm:
+        (QComboBox::populateMenu): Set the populating-menu flag and clear it when done.
+        (-[KWQPopUpButton setPopulatingMenu:]): Added. Sets flag.
+        (-[KWQPopUpButton setNeedsDisplayInRect:]): Do nothing if the flag is set.
+
+2004-05-14  Darin Adler  <darin at apple.com>
+
         Reviewed by Dave.
 
         - fixed <rdar://problem/3650026>: "background property doesn't work right on webdevtips.com due to background:inherit"
diff --git a/WebCore/kwq/KWQComboBox.mm b/WebCore/kwq/KWQComboBox.mm
index 4204e06..f5ae61b 100644
--- a/WebCore/kwq/KWQComboBox.mm
+++ b/WebCore/kwq/KWQComboBox.mm
@@ -62,7 +62,10 @@ enum {
 @interface KWQPopUpButton : NSPopUpButton <KWQWidgetHolder>
 {
     BOOL inNextValidKeyView;
+    BOOL populatingMenu;
 }
+- (void)setPopulatingMenu:(BOOL)populating;
+
 @end
 
 QComboBox::QComboBox()
@@ -345,6 +348,7 @@ void QComboBox::populateMenu()
         KWQ_BLOCK_EXCEPTIONS;
 
         KWQPopUpButton *button = getView();
+	[button setPopulatingMenu:YES];
         [button removeAllItems];
         QValueListConstIterator<KWQListBoxItem> i = const_cast<const QValueList<KWQListBoxItem> &>(_items).begin();
         QValueListConstIterator<KWQListBoxItem> e = const_cast<const QValueList<KWQListBoxItem> &>(_items).end();
@@ -356,6 +360,7 @@ void QComboBox::populateMenu()
             setTitle(menuItem, *i);
         }
         [button selectItemAtIndex:_currentItem];
+	[button setPopulatingMenu:NO];
 
         KWQ_UNBLOCK_EXCEPTIONS;
 
@@ -508,4 +513,16 @@ void QComboBox::populate()
     return view;
 }
 
+- (void)setPopulatingMenu:(BOOL)populating
+{
+    populatingMenu = populating;
+}
+
+- (void)setNeedsDisplayInRect:(NSRect)rect
+{
+    if (!populatingMenu) {
+	[super setNeedsDisplayInRect:rect];
+    }
+}
+
 @end

-- 
WebKit Debian packaging