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

--HG--
rename : hal/fallback/FallbackScreenOrientation.cpp => hal/fallback/FallbackScreenConfiguration.cpp
This commit is contained in:
Chris Jones 2012-05-08 14:36:07 -07:00
parent 653c0b6136
commit 1f66b60c34
3 changed files with 10 additions and 11 deletions

View File

@ -91,6 +91,7 @@ CPPSRCS += \
else ifeq (Linux,$(OS_TARGET)) else ifeq (Linux,$(OS_TARGET))
CPPSRCS += \ CPPSRCS += \
LinuxPower.cpp \ LinuxPower.cpp \
FallbackScreenConfiguration.cpp \
FallbackSensor.cpp \ FallbackSensor.cpp \
FallbackVibration.cpp \ FallbackVibration.cpp \
$(NULL) $(NULL)
@ -104,6 +105,7 @@ CPPSRCS += \
WindowsBattery.cpp \ WindowsBattery.cpp \
WindowsSensor.cpp \ WindowsSensor.cpp \
FallbackVibration.cpp \ FallbackVibration.cpp \
FallbackScreenConfiguration.cpp \
FallbackPower.cpp \ FallbackPower.cpp \
$(NULL) $(NULL)
else ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) else ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@ -111,6 +113,7 @@ CPPSRCS += \
FallbackBattery.cpp \ FallbackBattery.cpp \
FallbackVibration.cpp \ FallbackVibration.cpp \
FallbackPower.cpp \ FallbackPower.cpp \
FallbackScreenConfiguration.cpp \
$(NULL) $(NULL)
CMMSRCS += \ CMMSRCS += \
CocoaSensor.mm \ CocoaSensor.mm \
@ -122,6 +125,7 @@ CPPSRCS += \
FallbackSensor.cpp \ FallbackSensor.cpp \
FallbackVibration.cpp \ FallbackVibration.cpp \
FallbackPower.cpp \ FallbackPower.cpp \
FallbackScreenConfiguration.cpp \
$(NULL) $(NULL)
endif endif
@ -141,11 +145,6 @@ ifneq (android,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += FallbackNetwork.cpp CPPSRCS += FallbackNetwork.cpp
endif 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)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -40,8 +40,8 @@ GetCurrentScreenConfiguration(hal::ScreenConfiguration* aScreenConfiguration)
screen->GetColorDepth(&colorDepth); screen->GetColorDepth(&colorDepth);
screen->GetPixelDepth(&pixelDepth); screen->GetPixelDepth(&pixelDepth);
orientation = rect.width >= rect.height orientation = rect.width >= rect.height
? dom::eScreenOrientation_LandscapePrimary ? dom::eScreenOrientation_LandscapePrimary
: dom::eScreenOrientation_PortraitPrimary; : dom::eScreenOrientation_PortraitPrimary;
*aScreenConfiguration = *aScreenConfiguration =
hal::ScreenConfiguration(rect, orientation, colorDepth, pixelDepth); hal::ScreenConfiguration(rect, orientation, colorDepth, pixelDepth);

View File

@ -378,10 +378,10 @@ public:
void AddPluginView(jobject view, const gfxRect& rect); void AddPluginView(jobject view, const gfxRect& rect);
void RemovePluginView(jobject view); void RemovePluginView(jobject view);
// This method doesn't take a ScreenOrientation because it's an enum and // These methods don't use a ScreenOrientation because it's an
// that would require including the header which requires include IPC // enum and that would require including the header which requires
// headers which requires including basictypes.h which requires a lot of // include IPC headers which requires including basictypes.h which
// changes... // requires a lot of changes...
uint32_t GetScreenOrientation(); uint32_t GetScreenOrientation();
void EnableScreenOrientationNotifications(); void EnableScreenOrientationNotifications();
void DisableScreenOrientationNotifications(); void DisableScreenOrientationNotifications();