Bug 877728 - Convert the scroll offset out-param to SyncViewportInfo from nsIntPoint to ScreenPoint. r=BenWa

Also deletes a bunch of dead code, and makes some variables local
variables instead of member variables since they are only used in
a single function and don't need to be persisted.
This commit is contained in:
Kartikaya Gupta
2013-06-03 09:53:32 -04:00
parent c299178f3c
commit fb59756245
9 changed files with 25 additions and 41 deletions

View File

@@ -891,7 +891,7 @@ AndroidGeckoLayerClient::SetPageRect(const CSSRect& aCssPageRect)
void
AndroidGeckoLayerClient::SyncViewportInfo(const nsIntRect& aDisplayPort, float aDisplayResolution, bool aLayersUpdated,
nsIntPoint& aScrollOffset, float& aScaleX, float& aScaleY,
ScreenPoint& aScrollOffset, float& aScaleX, float& aScaleY,
gfx::Margin& aFixedLayerMargins, gfx::Point& aOffset)
{
NS_ASSERTION(!isNull(), "SyncViewportInfo called on null layer client!");
@@ -913,7 +913,7 @@ AndroidGeckoLayerClient::SyncViewportInfo(const nsIntRect& aDisplayPort, float a
AndroidViewTransform viewTransform;
viewTransform.Init(viewTransformJObj);
aScrollOffset = nsIntPoint(viewTransform.GetX(env), viewTransform.GetY(env));
aScrollOffset = ScreenPoint(viewTransform.GetX(env), viewTransform.GetY(env));
aScaleX = aScaleY = viewTransform.GetScale(env);
viewTransform.GetFixedLayerMargins(env, aFixedLayerMargins);