corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Continuing nsIPresContext deCOMtamination (bug 229371). Remove GetImageLoadFlags (unused). Make failure to fetch the LookAndFeel service cause Init() to fail, don't null check it after that, and inlined the getter. Move IOService caching to nsImageFrame, the only user of it. r+sr=bzbarsky.

Browse Source
This commit is contained in:
bryner@brianryner.com
2004-01-21 09:35:59 +00:00
parent 4b56396523
commit c4277278e2
38 changed files with 193 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
layout/html/base/src/nsTextFrame.cpp
View File

@@ -568,12 +568,11 @@ public:
// Get colors from look&feel
mSelectionBGColor = NS_RGB(0, 0, 0);
mSelectionTextColor = NS_RGB(255, 255, 255);
nsILookAndFeel* look = nsnull;
if (NS_SUCCEEDED(aPresContext->GetLookAndFeel(&look)) && look) {
look->GetColor(nsILookAndFeel::eColor_TextSelectBackground, mSelectionBGColor);
look->GetColor(nsILookAndFeel::eColor_TextSelectForeground, mSelectionTextColor);
NS_RELEASE(look);
}
nsILookAndFeel* look = aPresContext->LookAndFeel();
look->GetColor(nsILookAndFeel::eColor_TextSelectBackground,
mSelectionBGColor);
look->GetColor(nsILookAndFeel::eColor_TextSelectForeground,
mSelectionTextColor);
// Get the word and letter spacing
mWordSpacing = 0;
@@ -1021,15 +1020,15 @@ DrawSelectionIterator::DrawSelectionIterator(nsIContent *aContent,
}
// Get background colors for disabled selection at attention-getting selection (used with type ahead find)
nsCOMPtr<nsILookAndFeel> look;
if (NS_SUCCEEDED(aPresContext->GetLookAndFeel(getter_AddRefs(look))) && look) {
look->GetColor(nsILookAndFeel::eColor_TextSelectBackgroundAttention, mAttentionColor);
look->GetColor(nsILookAndFeel::eColor_TextSelectBackgroundDisabled, mDisabledColor);
mDisabledColor = EnsureDifferentColors(mDisabledColor, mOldStyle.mSelectionBGColor);
mAttentionColor = EnsureDifferentColors(mAttentionColor, mOldStyle.mSelectionBGColor);
}
else
mDisabledColor = mAttentionColor = mOldStyle.mSelectionBGColor;
nsILookAndFeel *look = aPresContext->LookAndFeel();
look->GetColor(nsILookAndFeel::eColor_TextSelectBackgroundAttention,
mAttentionColor);
look->GetColor(nsILookAndFeel::eColor_TextSelectBackgroundDisabled,
mDisabledColor);
mDisabledColor = EnsureDifferentColors(mDisabledColor,
mOldStyle.mSelectionBGColor);
mAttentionColor = EnsureDifferentColors(mAttentionColor,
mOldStyle.mSelectionBGColor);
if (!aSelDetails)
{