Changeset 76744 in webkit

Timestamp:

Jan 26, 2011 5:45:56 PM (13 years ago)

Author:

tkent@chromium.org

Message:

2011-01-26 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

[Chromium] WebFrame::forms() should not return empty WebFormElements
​https://bugs.webkit.org/show_bug.cgi?id=53204

• src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::forms):
  • Should iterate by forms->length(), not the number of HTMLElements.
  • Do not increment the index for "temp" if a node is not an HTMLElement.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-01-26  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [Chromium] WebFrame::forms() should not return empty WebFormElements
+        https://bugs.webkit.org/show_bug.cgi?id=53204
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::forms):
+         - Should iterate by forms->length(), not the number of HTMLElements.
+         - Do not increment the index for "temp" if a node is not an HTMLElement.
+
 2011-01-26  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -686 +686 @@
 
     WebVector<WebFormElement> temp(formCount);
-    for (size_t i = 0; i < formCount; ++i) {
-        Node* node = forms->item(i);
+    unsigned i = 0;
+    for (size_t sourceIndex = 0; i < forms->length(); ++sourceIndex) {
+        Node* node = forms->item(sourceIndex);
         // Strange but true, sometimes item can be 0.
         if (node && node->isHTMLElement())
-            temp[i] = static_cast<HTMLFormElement*>(node);
-    }
+            temp[i++] = static_cast<HTMLFormElement*>(node);
+    }
+    ASSERT(i == formCount);
     results.swap(temp);
 }