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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 090f6231804b06a7aa56f113e4c71e653a966fce
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 26 23:00:34 2004 +0000

    	3566668 - REGRESSION (125-128): autofill of popup lists is broken
    	3571271 - autofill parsing of field names should treat _ as a word separator
    
            Reviewed by Chris, Darin
    
            * kwq/KWQComboBox.h:
            * kwq/KWQComboBox.mm:
            (QComboBox::populate):   New virtual method to force any lazy field population to happen.
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::matchLabelsAgainstElement):  Change _ to ' ', to make it a word separator.
            * kwq/KWQWidget.h:
            (QWidget::populate):  Implement populate to fill out the menu's data.
            * kwq/WebCoreBridge.mm:
            (viewForElement):    Make sure widget is populated before handing it out.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6118 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e0771ed..717acf5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2004-02-26  Trey Matteson  <trey at apple.com>
+
+	3566668 - REGRESSION (125-128): autofill of popup lists is broken
+	3571271 - autofill parsing of field names should treat _ as a word separator
+
+        Reviewed by Chris, Darin
+
+        * kwq/KWQComboBox.h:
+        * kwq/KWQComboBox.mm:
+        (QComboBox::populate):   New virtual method to force any lazy field population to happen.
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::matchLabelsAgainstElement):  Change _ to ' ', to make it a word separator.
+        * kwq/KWQWidget.h:
+        (QWidget::populate):  Implement populate to fill out the menu's data.
+        * kwq/WebCoreBridge.mm:
+        (viewForElement):    Make sure widget is populated before handing it out.
+
 2004-02-26  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Chris
diff --git a/WebCore/kwq/KWQComboBox.h b/WebCore/kwq/KWQComboBox.h
index bf3a3a9..b3712b4 100644
--- a/WebCore/kwq/KWQComboBox.h
+++ b/WebCore/kwq/KWQComboBox.h
@@ -63,6 +63,7 @@ public:
 
     void setWritingDirection(QPainter::TextDirection);
 
+    virtual void populate();
     void populateMenu();
     
 private:
diff --git a/WebCore/kwq/KWQComboBox.mm b/WebCore/kwq/KWQComboBox.mm
index 757d271..ccc1886 100644
--- a/WebCore/kwq/KWQComboBox.mm
+++ b/WebCore/kwq/KWQComboBox.mm
@@ -320,6 +320,11 @@ void QComboBox::populateMenu()
     }
 }
 
+void QComboBox::populate()
+{
+    populateMenu();
+}
+
 @implementation KWQPopUpButtonCell
 
 - (id)initWithQComboBox:(QComboBox *)b
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index af273a4..855b0dd 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -480,8 +480,9 @@ NSString *KWQKHTMLPart::searchForLabelsBeforeElement(NSArray *labels, ElementImp
 NSString *KWQKHTMLPart::matchLabelsAgainstElement(NSArray *labels, ElementImpl *element)
 {
     QString name = element->getAttribute(ATTR_NAME).string();
-    // Make numbers in field names behave like word boundaries, e.g., "address2"
+    // Make numbers and _'s in field names behave like word boundaries, e.g., "address2"
     name.replace(QRegExp("[[:digit:]]"), " ");
+    name.replace("_", " ");
     
     QRegExp *regExp = regExpForLabels(labels);
     // Use the largest match we can find in the whole name string
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 0038f52..5777282 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -145,7 +145,8 @@ public:
     NSView *getView() const;
     NSView *getOuterView() const;
     void setView(NSView *aView);
-    
+    virtual void populate() {};
+
     void displayRect(int x, int y, int w, int h);
     void lockDrawingFocus();
     void unlockDrawingFocus();
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index f828636..c97c24a 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -733,6 +733,7 @@ static NSView *viewForElement(DOM::ElementImpl *elementImpl)
     if (renderer && renderer->isWidget()) {
         QWidget *widget = static_cast<const RenderWidget *>(renderer)->widget();
         if (widget) {
+            widget->populate();
             return widget->getView();
         }
     }

-- 
WebKit Debian packaging