зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1287653 - Strip EOL whitespace from gfx/thebes/gfxWindowsPlatform.cpp.
MozReview-Commit-ID: BEi4lo83HAK
This commit is contained in:
Родитель
477cad8749
Коммит
cd95c17d9a
|
@ -338,10 +338,10 @@ gfxWindowsPlatform::gfxWindowsPlatform()
|
|||
mUseClearTypeForDownloadableFonts = UNINITIALIZED_VALUE;
|
||||
mUseClearTypeAlways = UNINITIALIZED_VALUE;
|
||||
|
||||
/*
|
||||
* Initialize COM
|
||||
*/
|
||||
CoInitialize(nullptr);
|
||||
/*
|
||||
* Initialize COM
|
||||
*/
|
||||
CoInitialize(nullptr);
|
||||
|
||||
RegisterStrongMemoryReporter(new GfxD2DVramReporter());
|
||||
RegisterStrongMemoryReporter(new GPUAdapterReporter());
|
||||
|
@ -355,9 +355,9 @@ gfxWindowsPlatform::~gfxWindowsPlatform()
|
|||
|
||||
mozilla::gfx::Factory::D2DCleanup();
|
||||
|
||||
/*
|
||||
* Uninitialize COM
|
||||
*/
|
||||
/*
|
||||
* Uninitialize COM
|
||||
*/
|
||||
CoUninitialize();
|
||||
}
|
||||
|
||||
|
@ -1054,7 +1054,7 @@ gfxWindowsPlatform::UseClearTypeAlways()
|
|||
return mUseClearTypeAlways;
|
||||
}
|
||||
|
||||
void
|
||||
void
|
||||
gfxWindowsPlatform::GetDLLVersion(char16ptr_t aDLLPath, nsAString& aVersion)
|
||||
{
|
||||
DWORD versInfoSize, vers[4] = {0};
|
||||
|
@ -1062,18 +1062,18 @@ gfxWindowsPlatform::GetDLLVersion(char16ptr_t aDLLPath, nsAString& aVersion)
|
|||
aVersion.AssignLiteral(u"0.0.0.0");
|
||||
versInfoSize = GetFileVersionInfoSizeW(aDLLPath, nullptr);
|
||||
AutoTArray<BYTE,512> versionInfo;
|
||||
|
||||
|
||||
if (versInfoSize == 0 ||
|
||||
!versionInfo.AppendElements(uint32_t(versInfoSize)))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!GetFileVersionInfoW(aDLLPath, 0, versInfoSize,
|
||||
if (!GetFileVersionInfoW(aDLLPath, 0, versInfoSize,
|
||||
LPBYTE(versionInfo.Elements())))
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
UINT len = 0;
|
||||
VS_FIXEDFILEINFO *fileInfo = nullptr;
|
||||
|
@ -1085,7 +1085,7 @@ gfxWindowsPlatform::GetDLLVersion(char16ptr_t aDLLPath, nsAString& aVersion)
|
|||
return;
|
||||
}
|
||||
|
||||
DWORD fileVersMS = fileInfo->dwFileVersionMS;
|
||||
DWORD fileVersMS = fileInfo->dwFileVersionMS;
|
||||
DWORD fileVersLS = fileInfo->dwFileVersionLS;
|
||||
|
||||
vers[0] = HIWORD(fileVersMS);
|
||||
|
@ -1098,7 +1098,7 @@ gfxWindowsPlatform::GetDLLVersion(char16ptr_t aDLLPath, nsAString& aVersion)
|
|||
aVersion.Assign(NS_ConvertUTF8toUTF16(buf));
|
||||
}
|
||||
|
||||
void
|
||||
void
|
||||
gfxWindowsPlatform::GetCleartypeParams(nsTArray<ClearTypeParameterInfo>& aParams)
|
||||
{
|
||||
HKEY hKey, subKey;
|
||||
|
@ -1170,7 +1170,7 @@ gfxWindowsPlatform::GetCleartypeParams(nsTArray<ClearTypeParameterInfo>& aParams
|
|||
foundData = true;
|
||||
ctinfo.clearTypeLevel = value;
|
||||
}
|
||||
|
||||
|
||||
size = sizeof(value);
|
||||
subrv = RegQueryValueExW(subKey, L"EnhancedContrastLevel",
|
||||
nullptr, &type, (LPBYTE)&value, &size);
|
||||
|
@ -1210,7 +1210,7 @@ gfxWindowsPlatform::FontsPrefsChanged(const char *aPref)
|
|||
clearTextFontCaches = false;
|
||||
}
|
||||
|
||||
if (clearTextFontCaches) {
|
||||
if (clearTextFontCaches) {
|
||||
gfxFontCache *fc = gfxFontCache::GetCache();
|
||||
if (fc) {
|
||||
fc->Flush();
|
||||
|
|
Загрузка…
Ссылка в новой задаче