From 428f362cd50364b7e143636aae94fc073a92de8d Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 19 Apr 2013 16:05:15 -0400
Subject: [PATCH] Backed out changeset 93099b76959f (bug 829954) because of
 Windows reftest failures on a CLOSED TREE

---
 gfx/2d/Blur.cpp                  |  6 +-----
 gfx/2d/gfx2d.vcxproj             |  3 ---
 gfx/2d/unittest/TestScaling.h    | 36 ++++++++++++++++----------------
 gfx/2d/unittest/unittest.vcxproj |  2 --
 4 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/gfx/2d/Blur.cpp b/gfx/2d/Blur.cpp
index 80c6714840c..77f5ee3c5a5 100644
--- a/gfx/2d/Blur.cpp
+++ b/gfx/2d/Blur.cpp
@@ -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());
     }
   }
diff --git a/gfx/2d/gfx2d.vcxproj b/gfx/2d/gfx2d.vcxproj
index 4bb94599c90..dfd0a1f1bea 100644
--- a/gfx/2d/gfx2d.vcxproj
+++ b/gfx/2d/gfx2d.vcxproj
@@ -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">
diff --git a/gfx/2d/unittest/TestScaling.h b/gfx/2d/unittest/TestScaling.h
index e9bd1a8e022..928dda45c67 100644
--- a/gfx/2d/unittest/TestScaling.h
+++ b/gfx/2d/unittest/TestScaling.h
@@ -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();
+};
diff --git a/gfx/2d/unittest/unittest.vcxproj b/gfx/2d/unittest/unittest.vcxproj
index b88c5fc4ead..7ddf9253039 100644
--- a/gfx/2d/unittest/unittest.vcxproj
+++ b/gfx/2d/unittest/unittest.vcxproj
@@ -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">