[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 7475ec107b51f5aac8c8f056668d257e21cf3cd0
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 6 21:52:47 2003 +0000

    	Refinement of routine that scans the DOM for field labels.
    	We skip nodes that have no renderer, or are invisible.
    
            Reviewed by hyatt.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::searchForLabelsBeforeElement): Added check.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3766 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index bcd960b..65731b1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-03-06  Trey Matteson  <trey at apple.com>
+
+	Refinement of routine that scans the DOM for field labels.
+	We skip nodes that have no renderer, or are invisible.
+
+        Reviewed by hyatt.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::searchForLabelsBeforeElement): Added check.
+
 2003-03-06  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3190580, tables should reset line-height and white-space
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bcd960b..65731b1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-03-06  Trey Matteson  <trey at apple.com>
+
+	Refinement of routine that scans the DOM for field labels.
+	We skip nodes that have no renderer, or are invisible.
+
+        Reviewed by hyatt.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::searchForLabelsBeforeElement): Added check.
+
 2003-03-06  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3190580, tables should reset line-height and white-space
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 708554b..e84f614 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -326,10 +326,10 @@ NSString *KWQKHTMLPart::searchForLabelsBeforeElement(NSArray *labels, DOM::Eleme
         {
             // We hit another form element or the start of the form - bail out
             break;
-        } else if (nodeID == ID_TEXT) {
+        } else if (nodeID == ID_TEXT
+                   && n->renderer() && n->renderer()->style()->visibility() == khtml::VISIBLE)
+        {
             // For each text chunk, run the regexp
-            //??? CDATA_SECTION_NODE too?  See html_formimpl.cpp:2323
-            //??? must we have a renderer?  See khtml_part.cpp:2036
             QString nodeString = n->nodeValue().string();
             // add 100 for slop, to make it more likely that we'll search whole nodes
             if (lengthSearched + nodeString.length() > maxCharsSearched) {

-- 
WebKit Debian packaging