Merge 86219 - 2011-05-10 Kent Tamura <tkent@chromium.org>

Source/WebKit/chromium/src/WebFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 687 matching lines @@
         return WebDocument();
     return WebDocument(m_frame->document());
 }
 
 void WebFrameImpl::forms(WebVector<WebFormElement>& results) const
 {
     if (!m_frame)
         return;
 
     RefPtr<HTMLCollection> forms = m_frame->document()->forms();
-    size_t formCount = 0;
-    for (size_t i = 0; i < forms->length(); ++i) {
+    size_t sourceLength = forms->length();
+    Vector<WebFormElement> temp;
+    temp.reserveCapacity(sourceLength);
+    for (size_t i = 0; i < sourceLength; ++i) {
         Node* node = forms->item(i);
+        // Strange but true, sometimes node can be 0.
         if (node && node->isHTMLElement())
-            ++formCount;
+            temp.append(WebFormElement(static_cast<HTMLFormElement*>(node)));
     }
-
-    WebVector<WebFormElement> temp(formCount);
-    size_t j = 0;
-    for (size_t sourceIndex = 0; j < forms->length(); ++sourceIndex) {
-        Node* node = forms->item(sourceIndex);
-        // Strange but true, sometimes item can be 0.
-        if (node && node->isHTMLElement())
-            temp[j++] = static_cast<HTMLFormElement*>(node);
-    }
-    ASSERT(j == formCount);
-    results.swap(temp);
+    results.assign(temp);
 }
 
 WebAnimationController* WebFrameImpl::animationController()
 {
     return &m_animationController;
 }
 
 WebPerformance WebFrameImpl::performance() const
 {
     if (!m_frame || !m_frame->domWindow())
@@ skipping 1631 matching lines @@
 
     String scriptResult;
     if (!result.getString(scriptResult))
         return;
 
     if (!m_frame->navigationScheduler()->locationChangePending())
         m_frame->document()->loader()->writer()->replaceDocument(scriptResult);
 }
 
 } // namespace WebKit