зеркало из https://github.com/mozilla/gecko-dev.git
Bug 660525 Remove useless uses of PromiseFlatString r=joedrew!
This commit is contained in:
Родитель
935e50b305
Коммит
c0001b3ae1
|
@ -253,7 +253,7 @@ protected:
|
|||
}
|
||||
|
||||
fprintf (stderr, "=== Source:\n%s\n", aShaderSource);
|
||||
fprintf (stderr, "=== Log:\n%s\n", nsPromiseFlatCString(log).get());
|
||||
fprintf (stderr, "=== Log:\n%s\n", log.get());
|
||||
fprintf (stderr, "============\n");
|
||||
|
||||
if (!success) {
|
||||
|
@ -307,7 +307,7 @@ protected:
|
|||
} else {
|
||||
fprintf (stderr, "=== PROGRAM LINKING WARNINGS ===\n");
|
||||
}
|
||||
fprintf (stderr, "=== Log:\n%s\n", nsPromiseFlatCString(log).get());
|
||||
fprintf (stderr, "=== Log:\n%s\n", log.get());
|
||||
fprintf (stderr, "============\n");
|
||||
}
|
||||
|
||||
|
|
|
@ -1730,7 +1730,7 @@ GLContext::UseBlitProgram()
|
|||
fGetShaderInfoLog(shaders[i], len, (GLint*) &len, (char*) log.BeginWriting());
|
||||
log.SetLength(len);
|
||||
|
||||
printf_stderr("Shader %d compilation failed:\n%s\n", nsPromiseFlatCString(log).get());
|
||||
printf_stderr("Shader %d compilation failed:\n%s\n", log.get());
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1754,7 +1754,7 @@ GLContext::UseBlitProgram()
|
|||
fGetProgramInfoLog(mBlitProgram, len, (GLint*) &len, (char*) log.BeginWriting());
|
||||
log.SetLength(len);
|
||||
|
||||
printf_stderr("Program linking failed:\n%s\n", nsPromiseFlatCString(log).get());
|
||||
printf_stderr("Program linking failed:\n%s\n", log.get());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -875,10 +875,9 @@ void gfxFontUtils::GetPrefsFontList(const char *aPrefName, nsTArray<nsString>& a
|
|||
|
||||
// append each font name to the list
|
||||
nsAutoString fontname;
|
||||
nsPromiseFlatString fonts(fontlistValue);
|
||||
const PRUnichar *p, *p_end;
|
||||
fonts.BeginReading(p);
|
||||
fonts.EndReading(p_end);
|
||||
fontlistValue.BeginReading(p);
|
||||
fontlistValue.EndReading(p_end);
|
||||
|
||||
while (p < p_end) {
|
||||
const PRUnichar *nameStart = p;
|
||||
|
|
|
@ -435,7 +435,7 @@ GDIFontEntry::InitLogFont(const nsAString& aName,
|
|||
mLogFont.lfWeight = mWeight;
|
||||
|
||||
int len = NS_MIN<int>(aName.Length(), LF_FACESIZE - 1);
|
||||
memcpy(&mLogFont.lfFaceName, nsPromiseFlatString(aName).get(), len * 2);
|
||||
memcpy(&mLogFont.lfFaceName, aName.get(), len * 2);
|
||||
mLogFont.lfFaceName[len] = '\0';
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче