1 files changed, 10 insertions, 13 deletions
diff --git a/skia/ext/bitmap_platform_device.h b/skia/ext/bitmap_platform_device.h
index d33ae73..fcc8644c 100644
--- a/skia/ext/bitmap_platform_device.h
+++ b/skia/ext/bitmap_platform_device.h
@@ -8,23 +8,20 @@
 
 #if defined(WIN32)
 #include "skia/ext/bitmap_platform_device_win.h"
-namespace gfx {
-
-typedef BitmapPlatformDeviceWin BitmapPlatformDevice;
-
-}  // namespace gfx
 #elif defined(__APPLE__)
 #include "skia/ext/bitmap_platform_device_mac.h"
-namespace gfx {
-
-typedef BitmapPlatformDeviceMac BitmapPlatformDevice;
-
-}  // namespace gfx
 #elif defined(__linux__)
 #include "skia/ext/bitmap_platform_device_linux.h"
-namespace gfx {
+#endif
 
-typedef BitmapPlatformDeviceLinux BitmapPlatformDevice;
+namespace skia {
 
-}  // namespace gfx
+#if defined(WIN32)
+typedef BitmapPlatformDeviceWin BitmapPlatformDevice;
+#elif defined(__APPLE__)
+typedef BitmapPlatformDeviceMac BitmapPlatformDevice;
+#elif defined(__linux__)
+typedef BitmapPlatformDeviceLinux BitmapPlatformDevice;
 #endif
+
+}  // namespace skia