Bug 740200 - Removed some white space
☠☠ backed out by 25ee493a6e17 ☠ ☠
authorAnthony Jones <ajones@mozilla.com>
Thu, 19 Sep 2013 16:29:51 +1200
changeset 147839 3b248c5a0dc223fc21e6305099b01891c9b5908a
parent 147838 3466e81d3a414ea3fcf6f210da8104ae8ab1bef4
child 147840 d871c0d615105982da5782a61d7ead122247e32b
push id25317
push useremorley@mozilla.com
push dateThu, 19 Sep 2013 14:37:38 +0000
treeherdermozilla-central@70a765607344 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs740200
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 740200 - Removed some white space
gfx/thebes/gfxXlibNativeRenderer.cpp
gfx/thebes/gfxXlibNativeRenderer.h
--- a/gfx/thebes/gfxXlibNativeRenderer.cpp
+++ b/gfx/thebes/gfxXlibNativeRenderer.cpp
@@ -137,31 +137,31 @@ gfxXlibNativeRenderer::DrawDirect(gfxCon
     cairo_t *cr = ctx->GetCairo();
 
     /* Check that the target surface is an xlib surface. */
     cairo_surface_t *target = cairo_get_group_target (cr);
     if (cairo_surface_get_type (target) != CAIRO_SURFACE_TYPE_XLIB) {
         NATIVE_DRAWING_NOTE("FALLBACK: non-X surface");
         return false;
     }
-    
+
     cairo_matrix_t matrix;
     cairo_get_matrix (cr, &matrix);
     double device_offset_x, device_offset_y;
     cairo_surface_get_device_offset (target, &device_offset_x, &device_offset_y);
 
     /* Draw() checked that the matrix contained only a very-close-to-integer
        translation.  Here (and in several other places and thebes) device
        offsets are assumed to be integer. */
     NS_ASSERTION(int32_t(device_offset_x) == device_offset_x &&
                  int32_t(device_offset_y) == device_offset_y,
                  "Expected integer device offsets");
     nsIntPoint offset(NS_lroundf(matrix.x0 + device_offset_x),
                       NS_lroundf(matrix.y0 + device_offset_y));
-    
+
     int max_rectangles = 0;
     if (flags & DRAW_SUPPORTS_CLIP_RECT) {
       max_rectangles = 1;
     }
     if (flags & DRAW_SUPPORTS_CLIP_LIST) {
       max_rectangles = MAX_STATIC_CLIP_RECTANGLES;
     }
 
@@ -188,50 +188,50 @@ gfxXlibNativeRenderer::DrawDirect(gfxCon
                                rectangles, max_rectangles, &rect_count);
     cairo_set_matrix (cr, &matrix);
     if (!have_rectangular_clip)
         return false;
 
     /* Stop now if everything is clipped out */
     if (needs_clip && rect_count == 0)
         return true;
-      
+
     /* Check that the screen is supported.
        Visuals belong to screens, so, if alternate visuals are not supported,
-       then alternate screens cannot be supported. */  
+       then alternate screens cannot be supported. */
     bool supports_alternate_visual =
         (flags & DRAW_SUPPORTS_ALTERNATE_VISUAL) != 0;
     bool supports_alternate_screen = supports_alternate_visual &&
         (flags & DRAW_SUPPORTS_ALTERNATE_SCREEN);
     if (!supports_alternate_screen &&
         cairo_xlib_surface_get_screen (target) != screen) {
         NATIVE_DRAWING_NOTE("FALLBACK: non-default screen");
         return false;
     }
-        
+
     /* Check that there is a visual */
     Visual *target_visual = cairo_xlib_surface_get_visual (target);
     if (!target_visual) {
         NATIVE_DRAWING_NOTE("FALLBACK: no Visual for surface");
         return false;
-    }        
+    }
     /* Check that the visual is supported */
     if (!supports_alternate_visual && target_visual != visual) {
         // Only the format of the visual is important (not the GLX properties)
         // for Xlib or XRender drawing.
         XRenderPictFormat *target_format =
             cairo_xlib_surface_get_xrender_format (target);
         if (!target_format ||
             (target_format !=
              XRenderFindVisualFormat (DisplayOfScreen(screen), visual))) {
             NATIVE_DRAWING_NOTE("FALLBACK: unsupported Visual");
             return false;
         }
     }
-  
+
     /* we're good to go! */
     NATIVE_DRAWING_NOTE("TAKING FAST PATH\n");
     cairo_surface_flush (target);
     nsRefPtr<gfxASurface> surface = gfxASurface::Wrap(target);
     nsresult rv = DrawWithXlib(static_cast<gfxXlibSurface*>(surface.get()),
                                offset, rectangles,
                                needs_clip ? rect_count : 0);
     if (NS_SUCCEEDED(rv)) {
--- a/gfx/thebes/gfxXlibNativeRenderer.h
+++ b/gfx/thebes/gfxXlibNativeRenderer.h
@@ -84,16 +84,16 @@ public:
      * otherwise *resultSurface is set to nullptr.
      */
     void Draw(gfxContext* ctx, nsIntSize size,
               uint32_t flags, Screen *screen, Visual *visual,
               DrawOutput* result);
 
 private:
     bool DrawDirect(gfxContext *ctx, nsIntSize bounds,
-                      uint32_t flags, Screen *screen, Visual *visual);
+                    uint32_t flags, Screen *screen, Visual *visual);
 
     bool DrawOntoTempSurface(gfxXlibSurface *tempXlibSurface,
-                               nsIntPoint offset);
+                             nsIntPoint offset);
 
 };
 
 #endif /*GFXXLIBNATIVERENDER_H_*/