Fix line-endings in gfxWindowsPlatform.
authorBas Schouten <bschouten@mozilla.com>
Mon, 16 Aug 2010 09:15:03 +0200
changeset 50660 3fc41668b25c0c748671964328c5310df4377eda
parent 50659 66415a668c19b5c4c576d9c5d26e7001c419d43c
child 50661 f2959b949445151d97201953aced0b969be702e2
push idunknown
push userunknown
push dateunknown
milestone2.0b4pre
Fix line-endings in gfxWindowsPlatform.
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -132,26 +132,26 @@ static FT_Library gPlatformFTLibrary = N
 // DirectWrite is not available on all platforms, we need to use the function
 // pointer.
 typedef HRESULT (WINAPI*DWriteCreateFactoryFunc)(
   __in   DWRITE_FACTORY_TYPE factoryType,
   __in   REFIID iid,
   __out  IUnknown **factory
 );
 #endif
-
-#ifdef CAIRO_HAS_D2D_SURFACE
-typedef HRESULT (WINAPI*D3D10CreateDevice1Func)(
-  IDXGIAdapter *pAdapter,
-  D3D10_DRIVER_TYPE DriverType,
-  HMODULE Software,
-  UINT Flags,
-  D3D10_FEATURE_LEVEL1 HardwareLevel,
-  UINT SDKVersion,
-  ID3D10Device1 **ppDevice
+
+#ifdef CAIRO_HAS_D2D_SURFACE
+typedef HRESULT (WINAPI*D3D10CreateDevice1Func)(
+  IDXGIAdapter *pAdapter,
+  D3D10_DRIVER_TYPE DriverType,
+  HMODULE Software,
+  UINT Flags,
+  D3D10_FEATURE_LEVEL1 HardwareLevel,
+  UINT SDKVersion,
+  ID3D10Device1 **ppDevice
 );
 #endif
 
 static __inline void
 BuildKeyNameFromFontName(nsAString &aName)
 {
     if (aName.Length() >= LF_FACESIZE)
         aName.Truncate(LF_FACESIZE - 1);
@@ -188,48 +188,48 @@ gfxWindowsPlatform::gfxWindowsPlatform()
     bool isVistaOrHigher = versionInfo.dwMajorVersion >= 6;
 
 #ifdef CAIRO_HAS_D2D_SURFACE
     NS_RegisterMemoryReporter(new D2DCacheReporter());
     mD2DDevice = NULL;
 
     if (isVistaOrHigher && 0) {
         // We need a DWriteFactory to work.
-        HMODULE d3d10module = LoadLibraryA("d3d10_1.dll");
-        D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func)
+        HMODULE d3d10module = LoadLibraryA("d3d10_1.dll");
+        D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func)
             GetProcAddress(d3d10module, "D3D10CreateDevice1");
         nsRefPtr<ID3D10Device1> device;
 
         if (createD3DDevice) {
             // We try 10.0 first even though we prefer 10.1, since we want to
             // fail as fast as possible if 10.x isn't supported.
-            HRESULT hr = createD3DDevice(
-	        NULL, 
-	        D3D10_DRIVER_TYPE_HARDWARE,
-	        NULL,
-	        D3D10_CREATE_DEVICE_BGRA_SUPPORT |
-	        D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
-	        D3D10_FEATURE_LEVEL_10_0,
-	        D3D10_1_SDK_VERSION,
+            HRESULT hr = createD3DDevice(
+	        NULL, 
+	        D3D10_DRIVER_TYPE_HARDWARE,
+	        NULL,
+	        D3D10_CREATE_DEVICE_BGRA_SUPPORT |
+	        D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
+	        D3D10_FEATURE_LEVEL_10_0,
+	        D3D10_1_SDK_VERSION,
 	        getter_AddRefs(device));
 
             if (SUCCEEDED(hr)) {
                 // We have 10.0, let's try 10.1.
                 // XXX - This adds an additional 10-20ms for people who are
                 // getting direct2d. We'd really like to do something more
                 // clever.
                 nsRefPtr<ID3D10Device1> device1;
-                hr = createD3DDevice(
-	            NULL, 
-	            D3D10_DRIVER_TYPE_HARDWARE,
-	            NULL,
-	            D3D10_CREATE_DEVICE_BGRA_SUPPORT |
-	            D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
-	            D3D10_FEATURE_LEVEL_10_1,
-	            D3D10_1_SDK_VERSION,
+                hr = createD3DDevice(
+	            NULL, 
+	            D3D10_DRIVER_TYPE_HARDWARE,
+	            NULL,
+	            D3D10_CREATE_DEVICE_BGRA_SUPPORT |
+	            D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
+	            D3D10_FEATURE_LEVEL_10_1,
+	            D3D10_1_SDK_VERSION,
 	            getter_AddRefs(device1));
 
                 if (SUCCEEDED(hr)) {
                     device = device1;
                 }
 
                 mD2DDevice = cairo_d2d_create_device_from_d3d10device(device);
                 if (mD2DDevice) {