Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 899931 - Part c: Cleanup nsListControlFrame::GetOptionText; r=dzbarsky

Browse Source
This commit is contained in:
Ms2ger 2013-08-02 09:07:08 +02:00
parent 702950cf48
commit 29bcd8621d
3 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/forms/nsIListControlFrame.h
View File

@ -29,7 +29,7 @@ public:
/** /**
* Get the display string for an item * Get the display string for an item
*/ */
virtual void GetOptionText(int32_t aIndex, nsAString & aStr) = 0; virtual void GetOptionText(uint32_t aIndex, nsAString& aStr) = 0;
/** /**
* Get the Selected Item's index * Get the Selected Item's index

40
layout/forms/nsListControlFrame.cpp
View File

@ -1158,43 +1158,11 @@ nsListControlFrame::SetComboboxFrame(nsIFrame* aComboboxFrame)
} }
void void
nsListControlFrame::GetOptionText(int32_t aIndex, nsAString & aStr) nsListControlFrame::GetOptionText(uint32_t aIndex, nsAString& aStr)
{ {
aStr.SetLength(0); aStr.Truncate();
nsCOMPtr<nsIDOMHTMLOptionsCollection> options = GetOptions(mContent); if (dom::HTMLOptionElement* optionElement = GetOption(aIndex)) {
optionElement->GetText(aStr);
if (options) {
uint32_t numOptions;
options->GetLength(&numOptions);
if (numOptions != 0) {
nsCOMPtr<nsIDOMHTMLOptionElement> optionElement =
GetOption(options, aIndex);
if (optionElement) {
#if 0 // This is for turning off labels Bug 4050
nsAutoString text;
optionElement->GetLabel(text);
// the return value is always NS_OK from DOMElements
// it is meaningless to check for it
if (!text.IsEmpty()) {
nsAutoString compressText = text;
compressText.CompressWhitespace(true, true);
if (!compressText.IsEmpty()) {
text = compressText;
}
}
if (text.IsEmpty()) {
// the return value is always NS_OK from DOMElements
// it is meaningless to check for it
optionElement->GetText(text);
}
aStr = text;
#else
optionElement->GetText(aStr);
#endif
}
}
} }
} }

2
layout/forms/nsListControlFrame.h
View File

@ -124,7 +124,7 @@ public:
* If the there are zero items then an empty string is returned * If the there are zero items then an empty string is returned
* If there is nothing selected, then the 0th item's text is returned. * If there is nothing selected, then the 0th item's text is returned.
*/ */
virtual void GetOptionText(int32_t aIndex, nsAString & aStr) MOZ_OVERRIDE; virtual void GetOptionText(uint32_t aIndex, nsAString& aStr) MOZ_OVERRIDE;
virtual void CaptureMouseEvents(bool aGrabMouseEvents) MOZ_OVERRIDE; virtual void CaptureMouseEvents(bool aGrabMouseEvents) MOZ_OVERRIDE;
virtual nscoord GetHeightOfARow() MOZ_OVERRIDE; virtual nscoord GetHeightOfARow() MOZ_OVERRIDE;