зеркало из https://github.com/mozilla/gecko-dev.git
Bug 660657 - Make nsCSSRendering::Init return void; r=roc
This commit is contained in:
Родитель
471e6d31d0
Коммит
90dd851282
|
@ -379,14 +379,10 @@ static nscolor MakeBevelColor(mozilla::css::Side whichSide, PRUint8 style,
|
|||
static InlineBackgroundData* gInlineBGData = nsnull;
|
||||
|
||||
// Initialize any static variables used by nsCSSRendering.
|
||||
nsresult nsCSSRendering::Init()
|
||||
void nsCSSRendering::Init()
|
||||
{
|
||||
NS_ASSERTION(!gInlineBGData, "Init called twice");
|
||||
gInlineBGData = new InlineBackgroundData();
|
||||
if (!gInlineBGData)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// Clean up any global variables used by nsCSSRendering.
|
||||
|
|
|
@ -54,7 +54,7 @@ struct nsCSSRendering {
|
|||
/**
|
||||
* Initialize any static variables used by nsCSSRendering.
|
||||
*/
|
||||
static nsresult Init();
|
||||
static void Init();
|
||||
|
||||
/**
|
||||
* Clean up any static variables used by nsCSSRendering.
|
||||
|
|
|
@ -186,11 +186,7 @@ nsLayoutStatics::Initialize()
|
|||
return rv;
|
||||
}
|
||||
|
||||
rv = nsCSSRendering::Init();
|
||||
if (NS_FAILED(rv)) {
|
||||
NS_ERROR("Could not initialize nsCSSRendering");
|
||||
return rv;
|
||||
}
|
||||
nsCSSRendering::Init();
|
||||
|
||||
rv = nsTextFrameTextRunCache::Init();
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче