Bug 745145, part 4: Rename some things. r=mounir

--HG--
rename : hal/fallback/FallbackScreenOrientation.cpp => hal/fallback/FallbackScreenConfiguration.cpp

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

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);

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();