--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -91,18 +91,18 @@ private:
     mozilla::AlignedStorage2<mozilla::gfx::SurfacePattern> mSurfacePattern;
   };
 
   gfxContext *mContext;
   Pattern *mPattern;
 };
 
 gfxContext::gfxContext(gfxASurface *surface)
-  : mSurface(surface)
-  , mRefCairo(NULL)
+  : mRefCairo(NULL)
+  , mSurface(surface)
 {
   MOZ_COUNT_CTOR(gfxContext);
 
   mCairo = cairo_create(surface->CairoSurface());
   mFlags = surface->GetDefaultContextFlags();
   if (mSurface->GetRotateForLandscape()) {
     // Rotate page 90 degrees to draw landscape page on portrait paper
     gfxIntSize size = mSurface->GetSize();
@@ -1261,18 +1261,16 @@ gfxContext::ClipContainsRect(const gfxRe
   } else {
     unsigned int lastReset = 0;
     for (int i = mStateStack.Length() - 2; i > 0; i--) {
       if (mStateStack[i].clipWasReset) {
         lastReset = i;
       }
     }
 
-    bool result = true;
-
     // Since we always return false when the clip list contains a
     // non-rectangular clip or a non-rectilinear transform, our 'total' clip
     // is always a rectangle if we hit the end of this function.
     Rect clipBounds(0, 0, Float(mDT->GetSize().width), Float(mDT->GetSize().height));
 
     for (unsigned int i = lastReset; i < mStateStack.Length(); i++) {
       for (unsigned int c = 0; c < mStateStack[i].pushedClips.Length(); c++) {
         AzureState::PushedClip &clip = mStateStack[i].pushedClips[c];