Attachment #763556 for bug #841442

Attachment #763556: interdiff for bug #841442

View | Details | Raw Unified | Return to bug 841442
Collapse All | Expand All






/* static */ already_AddRefed<nsFormData>
nsFormData::Constructor(const GlobalObject& aGlobal,
                        const Optional<NonNull<HTMLFormElement> >& aFormElement,
                        ErrorResult& aRv)
{
  nsRefPtr<nsFormData> formData = new nsFormData(aGlobal.Get());
  if (aFormElement.WasPassed()) {
    // TODO: this should ...Value().WalkFromElements(formData); - Bug 883827
    aRv = aFormElement.Value().get()->WalkFormElements(formData);
  }
  return formData.forget();
}

// -------------------------------------------------------------------------
// nsIXHRSendable

NS_IMETHODIMP





nsresult
HTMLFormElement::RemoveElementFromTable(nsGenericHTMLFormElement* aElement,
                                        const nsAString& aName,
                                        RemoveElementReason aRemoveReason)
{
  // If the element is being removed from the form, we have to remove it from
  // the past names map.
  if (aRemoveReason == ElementRemoved) {
    uint32_t oldCount = mPastNameLookupTable.Count();
    mPastNameLookupTable.Enumerate(RemovePastNames, aElement);
    if (oldCount != mPastNameLookupTable.Count()) {
      ++mExpandoAndGeneration.generation;
    }
  }

  return mControls->RemoveElementFromTable(aElement, aName);
}

already_AddRefed<nsISupports>
HTMLFormElement::NamedGetter(const nsAString& aName, bool &aFound)
{
  aFound = true;

  nsCOMPtr<nsISupports> result = DoResolveName(aName, true);
  if (result) {
  if (result && element) {
    AddToPastNamesMap(aName, result);
    return result.forget();
  }

  result = mImageNameLookupTable.GetWeak(aName);
  if (result) {
  if (result && element) {
    AddToPastNamesMap(aName, result);
    return result.forget();
  }

  result = mPastNameLookupTable.GetWeak(aName);
  if (result) {
    return result.forget();
    return element.forget();
  }

  aFound = false;
  return nullptr;
}

void
HTMLFormElement::GetSupportedNames(nsTArray<nsString >& aRetval)
{
  mControls->GetSupportedNames(aRetval);
}

already_AddRefed<nsISupports>
HTMLFormElement::FindNamedItem(const nsAString& aName,
                               nsWrapperCache** aCache)
{
  // FIXME Get the wrapper cache from DoResolveName.

  bool found;
  nsCOMPtr<nsISupports> result = NamedGetter(aName, found);
    AddToPastNamesMap(aName, result);
    return result.forget();
  }

  result = mImageNameLookupTable.GetWeak(aName);
  if (result) {
    *aCache = nullptr;
    AddToPastNamesMap(aName, result);
    return result.forget();
  }

  result = mPastNameLookupTable.GetWeak(aName);
  if (result) {
    *aCache = nullptr;
    return result.forget();
  }

  return nullptr;
}






  bool CheckValidity()
  {
    return CheckFormValidity(nullptr);
  }

  Element*
  IndexedGetter(uint32_t aIndex, bool &aFound);

  already_AddRefed<nsISupports>
  NamedGetter(const nsAString& aName, bool &aFound);

  void GetSupportedNames(nsTArray<nsString >& aRetval);

  js::ExpandoAndGeneration mExpandoAndGeneration;

protected:
  virtual JSObject* WrapNode(JSContext* aCx,





  void operator=(U* t) {
    ptr = t->ToAStringPtr();
    MOZ_ASSERT(ptr);
#ifdef DEBUG
    inited = true;
#endif
  }

  T*
  operator->() const
  {
    MOZ_ASSERT(inited);
    MOZ_ASSERT(ptr, "NonNull<T> was set to null");
    return get();
  }

  T** Slot() {
#ifdef DEBUG
    inited = true;
#endif
    return &ptr;
  }

  T* Ptr() {

(-)a/dom/webidl/HTMLFormElement.webidl (-1 / +1 lines)

Line	Link Here

Lines 34-48 interface HTMLFormElement : HTMLElement	Link Here

  [Constant]

  [Constant]

  readonly attribute HTMLCollection elements;

  readonly attribute HTMLCollection elements;

  [Pure]

  [Pure]

  readonly attribute long length;

  readonly attribute long length;

  getter Element (unsigned long index);

  getter Element (unsigned long index);

  // TODO this should be: getter (RadioNodeList or HTMLInputElement or HTMLImageElement) (DOMString name);

  // TODO this should be: getter (RadioNodeList or HTMLInputElement or HTMLImageElement) (DOMString name);

  getter Element (DOMString name);

  getter nsISupports (DOMString name);

  [Throws]

  [Throws]

  void submit();

  void submit();

  void reset();

  void reset();

  boolean checkValidity();

  boolean checkValidity();

};

};

Return to bug 841442