Commit ab6e0744 authored by Ed Morley's avatar Ed Morley
Browse files

Merge mozilla-central and mozilla-inbound

parents 973a04fe 01e92007

accessible/src/atk/nsMaiInterfaceDocument.cpp

+0 −18
Original line number Diff line number Diff line
@@ -81,24 +81,6 @@ getDocumentLocaleCB(AtkDocument *aDocument) 
    return nsAccessibleWrap::ReturnString(locale);

}



const gchar *

getDocumentTypeCB(AtkDocument *aDocument)

{

    nsAccessibleWrap *accWrap = GetAccessibleWrap(ATK_OBJECT(aDocument));

    if (!accWrap)

        return nsnull;



    nsCOMPtr<nsIAccessibleDocument> accDocument;

    accWrap->QueryInterface(NS_GET_IID(nsIAccessibleDocument),

                            getter_AddRefs(accDocument));

    NS_ENSURE_TRUE(accDocument, nsnull);



    nsAutoString mimeType;

    nsresult rv = accDocument->GetMimeType(mimeType);

    NS_ENSURE_SUCCESS(rv, nsnull);

    return nsAccessibleWrap::ReturnString(mimeType);

}



static inline GSList *

prependToList(GSList *aList, const char *const aName, const nsAutoString &aValue)

{

accessible/src/base/nsCoreUtils.cpp

+0 −16
Original line number Diff line number Diff line
@@ -660,22 +660,6 @@ nsCoreUtils::GetFirstSensibleColumn(nsITreeBoxObject *aTree) 
  return column.forget();

}



already_AddRefed<nsITreeColumn>

nsCoreUtils::GetLastSensibleColumn(nsITreeBoxObject *aTree)

{

  nsCOMPtr<nsITreeColumns> cols;

  aTree->GetColumns(getter_AddRefs(cols));

  if (!cols)

    return nsnull;



  nsCOMPtr<nsITreeColumn> column;

  cols->GetLastColumn(getter_AddRefs(column));

  if (column && IsColumnHidden(column))

    return GetPreviousSensibleColumn(column);



  return column.forget();

}



PRUint32

nsCoreUtils::GetSensibleColumnCount(nsITreeBoxObject *aTree)

{

accessible/src/base/nsCoreUtils.h

+0 −6
Original line number Diff line number Diff line
@@ -327,12 +327,6 @@ public: 
  static already_AddRefed<nsITreeColumn>

    GetFirstSensibleColumn(nsITreeBoxObject *aTree);



  /**

   * Return last sensible column for the given tree box object.

   */

  static already_AddRefed<nsITreeColumn>

    GetLastSensibleColumn(nsITreeBoxObject *aTree);



  /**

   * Return sensible columns count for the given tree box object.

   */

content/base/src/nsAttrAndChildArray.cpp

+0 −25
Original line number Diff line number Diff line
@@ -366,31 +366,6 @@ nsAttrAndChildArray::AttrAt(PRUint32 aPos) const 
  return &ATTRS(mImpl)[aPos - mapped].mValue;

}



nsresult

nsAttrAndChildArray::SetAttr(nsIAtom* aLocalName, const nsAString& aValue)

{

  PRUint32 i, slotCount = AttrSlotCount();

  for (i = 0; i < slotCount && AttrSlotIsTaken(i); ++i) {

    if (ATTRS(mImpl)[i].mName.Equals(aLocalName)) {

      ATTRS(mImpl)[i].mValue.SetTo(aValue);



      return NS_OK;

    }

  }



  NS_ENSURE_TRUE(slotCount < ATTRCHILD_ARRAY_MAX_ATTR_COUNT,

                 NS_ERROR_FAILURE);



  if (i == slotCount && !AddAttrSlot()) {

    return NS_ERROR_OUT_OF_MEMORY;

  }



  new (&ATTRS(mImpl)[i].mName) nsAttrName(aLocalName);

  new (&ATTRS(mImpl)[i].mValue) nsAttrValue(aValue);



  return NS_OK;

}



nsresult

nsAttrAndChildArray::SetAndTakeAttr(nsIAtom* aLocalName, nsAttrValue& aValue)

{

content/base/src/nsAttrAndChildArray.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ public: 
  PRUint32 AttrCount() const;

  const nsAttrValue* GetAttr(nsIAtom* aLocalName, PRInt32 aNamespaceID = kNameSpaceID_None) const;

  const nsAttrValue* AttrAt(PRUint32 aPos) const;

  nsresult SetAttr(nsIAtom* aLocalName, const nsAString& aValue);

  nsresult SetAndTakeAttr(nsIAtom* aLocalName, nsAttrValue& aValue);

  nsresult SetAndTakeAttr(nsINodeInfo* aName, nsAttrValue& aValue);