Bug 924444: Fix various integer comparison warnings in QuartzSupport.mm. r=mstange
authorJosh Aas <joshmoz@gmail.com>
Wed, 09 Oct 2013 00:42:26 -0500
changeset 150144 a78b66ab1e0a414a86f4b4217f04e292516e2527
parent 150143 05266767e5325fff404249774b4ec48ddcf3449c
child 150145 7dbde6e65e55cbc88d0fb3f4ca5a3e6122213c35
push id34770
push userjosh@mozilla.com
push dateWed, 09 Oct 2013 05:43:15 +0000
treeherdermozilla-inbound@a78b66ab1e0a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange
bugs924444
milestone27.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 924444: Fix various integer comparison warnings in QuartzSupport.mm. r=mstange
gfx/2d/QuartzSupport.h
gfx/2d/QuartzSupport.mm
--- a/gfx/2d/QuartzSupport.h
+++ b/gfx/2d/QuartzSupport.h
@@ -82,18 +82,18 @@ private:
   void *mWrapperCALayer;
   GLuint                    mFBOTexture;
   _CGLContextObject        *mOpenGLContext;
   CGImageRef                mCGImage;
   void                     *mCGData;
   mozilla::RefPtr<MacIOSurface> mIOSurface;
   uint32_t                  mFBO;
   uint32_t                  mIOTexture;
-  uint32_t                  mUnsupportedWidth;
-  uint32_t                  mUnsupportedHeight;
+  int                       mUnsupportedWidth;
+  int                       mUnsupportedHeight;
   AllowOfflineRendererEnum  mAllowOfflineRenderer;
   double                    mContentsScaleFactor;
 };
 
 enum CGContextType {
   CG_CONTEXT_TYPE_UNKNOWN = 0,
   // These are found by inspection, it's possible they could be changed
   CG_CONTEXT_TYPE_BITMAP = 4,
--- a/gfx/2d/QuartzSupport.mm
+++ b/gfx/2d/QuartzSupport.mm
@@ -802,17 +802,18 @@ void nsCARenderer::AttachIOSurface(RefPt
                                            mIOSurface->GetDevicePixelHeight(),
                                            GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
                                            mIOSurface->mIOSurfacePtr, 0);
     ::glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
 
     // Rebind the FBO to make it live
     ::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, mFBO);
 
-    if (mIOSurface->GetWidth() != width || mIOSurface->GetHeight() != height) {
+    if (static_cast<int>(mIOSurface->GetWidth()) != width ||
+        static_cast<int>(mIOSurface->GetHeight()) != height) {
       width = mIOSurface->GetWidth();
       height = mIOSurface->GetHeight();
       SetBounds(width, height);
       SetViewport(width, height);
     }
 
     if (oldContext) {
       ::CGLSetCurrentContext(oldContext);