From 1f66b60c347109d87e5ff79acb6f04b98b438388 Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Tue, 8 May 2012 14:36:07 -0700
Subject: [PATCH] Bug 745145, part 4: Rename some things. r=mounir

--HG--
rename : hal/fallback/FallbackScreenOrientation.cpp => hal/fallback/FallbackScreenConfiguration.cpp
---
 hal/Makefile.in                                          | 9 ++++-----
 ...enOrientation.cpp => FallbackScreenConfiguration.cpp} | 4 ++--
 widget/android/AndroidBridge.h                           | 8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename hal/fallback/{FallbackScreenOrientation.cpp => FallbackScreenConfiguration.cpp} (91%)

diff --git a/hal/Makefile.in b/hal/Makefile.in
index c13d610f0bf..398cecc7a0f 100644
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -91,6 +91,7 @@ CPPSRCS += \
 else ifeq (Linux,$(OS_TARGET))
 CPPSRCS += \
   LinuxPower.cpp \
+  FallbackScreenConfiguration.cpp \
   FallbackSensor.cpp \
   FallbackVibration.cpp \
   $(NULL)
@@ -104,6 +105,7 @@ CPPSRCS += \
   WindowsBattery.cpp \
   WindowsSensor.cpp \
   FallbackVibration.cpp \
+  FallbackScreenConfiguration.cpp \
   FallbackPower.cpp \
   $(NULL)
 else ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -111,6 +113,7 @@ CPPSRCS += \
   FallbackBattery.cpp \
   FallbackVibration.cpp \
   FallbackPower.cpp \
+  FallbackScreenConfiguration.cpp \
   $(NULL)
 CMMSRCS += \
   CocoaSensor.mm \
@@ -122,6 +125,7 @@ CPPSRCS += \
   FallbackSensor.cpp \
   FallbackVibration.cpp \
   FallbackPower.cpp \
+  FallbackScreenConfiguration.cpp \
   $(NULL)
 endif
 
@@ -141,11 +145,6 @@ ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += FallbackNetwork.cpp
 endif
 
-# Fallbacks for backends implemented on Gonk and Android only.
-ifeq (,$(filter android gonk,$(MOZ_WIDGET_TOOLKIT)))
-CPPSRCS += FallbackScreenOrientation.cpp
-endif
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/hal/fallback/FallbackScreenOrientation.cpp b/hal/fallback/FallbackScreenConfiguration.cpp
similarity index 91%
rename from hal/fallback/FallbackScreenOrientation.cpp
rename to hal/fallback/FallbackScreenConfiguration.cpp
index 779f92cf858..ae458b96abd 100644
--- a/hal/fallback/FallbackScreenOrientation.cpp
+++ b/hal/fallback/FallbackScreenConfiguration.cpp
@@ -40,8 +40,8 @@ GetCurrentScreenConfiguration(hal::ScreenConfiguration* aScreenConfiguration)
   screen->GetColorDepth(&colorDepth);
   screen->GetPixelDepth(&pixelDepth);
   orientation = rect.width >= rect.height
-      ? dom::eScreenOrientation_LandscapePrimary
-      : dom::eScreenOrientation_PortraitPrimary;
+                ? dom::eScreenOrientation_LandscapePrimary
+                : dom::eScreenOrientation_PortraitPrimary;
 
   *aScreenConfiguration =
       hal::ScreenConfiguration(rect, orientation, colorDepth, pixelDepth);
diff --git a/widget/android/AndroidBridge.h b/widget/android/AndroidBridge.h
index c5860e698f9..3b95059706e 100644
--- a/widget/android/AndroidBridge.h
+++ b/widget/android/AndroidBridge.h
@@ -378,10 +378,10 @@ public:
     void AddPluginView(jobject view, const gfxRect& rect);
     void RemovePluginView(jobject view);
 
-    // This method doesn't take a ScreenOrientation because it's an enum and
-    // that would require including the header which requires include IPC
-    // headers which requires including basictypes.h which requires a lot of
-    // changes...
+    // These methods don't use a ScreenOrientation because it's an
+    // enum and that would require including the header which requires
+    // include IPC headers which requires including basictypes.h which
+    // requires a lot of changes...
     uint32_t GetScreenOrientation();
     void EnableScreenOrientationNotifications();
     void DisableScreenOrientationNotifications();