From bcbc0acd1e8f6a42e4ad5d3f52be505a9c47d36f Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Mon, 26 May 2014 12:44:43 -0400 Subject: [PATCH] Bug 1015981 - Replace using namespace mozilla::css with qualified class name. r=botond --- gfx/layers/apz/src/AsyncPanZoomController.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp index a24465fd3e1..223f366b6b9 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.cpp +++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp @@ -129,8 +129,6 @@ WidgetModifiersToDOMModifiers(mozilla::Modifiers aModifiers) namespace mozilla { namespace layers { -using namespace mozilla::css; - typedef mozilla::layers::AllowedTouchBehavior AllowedTouchBehavior; typedef GeckoContentController::APZStateChange APZStateChange; @@ -291,7 +289,7 @@ static const double ALLOWED_DIRECT_PAN_ANGLE = M_PI / 3.0; // 60 degrees /** * Computed time function used for sampling frames of a zoom to animation. */ -StaticAutoPtr gComputedTimingFunction; +StaticAutoPtr gComputedTimingFunction; /** * Maximum zoom amount, always used, even if a page asks for higher. @@ -471,7 +469,7 @@ AsyncPanZoomController::InitializeGlobalState() return; sInitialized = true; - gComputedTimingFunction = new ComputedTimingFunction(); + gComputedTimingFunction = new css::ComputedTimingFunction(); gComputedTimingFunction->Init( nsTimingFunction(NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE)); ClearOnShutdown(&gComputedTimingFunction);