Bug 666664 - Patch to fix warnings in gfx/thebes/gfxContext.cpp. r=BenWa
authorStephen Perry <stevoooo@gmail.com>
Tue, 06 Mar 2012 16:44:18 -0500
changeset 88359 6317057db545e4770adc26a5c4a30a414bf97228
parent 88358 a4d1da7fb5bbb2de1898d4f52ed7e08c758d2752
child 88360 ecdf3748265e3f244bb39246044659566f7a1105
push id6816
push userb56girard@gmail.com
push dateTue, 06 Mar 2012 21:46:25 +0000
treeherdermozilla-inbound@ecdf3748265e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBenWa
bugs666664
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 666664 - Patch to fix warnings in gfx/thebes/gfxContext.cpp. r=BenWa
gfx/thebes/gfxContext.cpp
--- 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];