Backed out changeset 93099b76959f (bug 829954) because of Windows reftest failures on a CLOSED TREE

This commit is contained in:
Ehsan Akhgari 2013-04-19 16:05:15 -04:00
Родитель c0dcd7d853
Коммит 52c6308a4c
4 изменённых файлов: 19 добавлений и 28 удалений

Просмотреть файл

@ -385,11 +385,7 @@ AlphaBoxBlur::AlphaBoxBlur(const Rect& aRect,
// in our blurring code.
CheckedInt<int32_t> size = CheckedInt<int32_t>(mStride) * mRect.height + 3;
if (size.isValid()) {
mData = new (nothrow) uint8_t[size.value()];
if (!mData) {
return;
}
mData = new uint8_t[size.value()];
memset(mData, 0, size.value());
}
}

Просмотреть файл

@ -12,18 +12,15 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{49E973D7-53C9-3D66-BE58-52125FAE193D}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

Просмотреть файл

@ -2,21 +2,21 @@
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#pragma once
#include "TestBase.h"
class TestScaling : public TestBase
{
public:
TestScaling();
void BasicHalfScale();
void DoubleHalfScale();
void UnevenHalfScale();
void OddStrideHalfScale();
void VerticalHalfScale();
void HorizontalHalfScale();
void MixedHalfScale();
};
#pragma once
#include "TestBase.h"
class TestScaling : public TestBase
{
public:
TestScaling();
void BasicHalfScale();
void DoubleHalfScale();
void UnevenHalfScale();
void OddStrideHalfScale();
void VerticalHalfScale();
void HorizontalHalfScale();
void MixedHalfScale();
};

Просмотреть файл

@ -19,14 +19,12 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">