View Details Raw Unified Return to Bug 49532
| Differences between
and this patch
Collapse All Expand All
- a/WebCore/ChangeLog +10 lines
Lines 1-3 a/WebCore/ChangeLog_sec1
1 
2010-11-15  Carlos Garcia Campos  <cgarcia@igalia.com>
2 

            

            

              3
              
        Reviewed by NOBODY (OOPS!).

            

            

              4
              

            

            

              5
              
        [GTK] Use gdk_pixbuf_get_from_surface() when available

            

            

              6
              
        https://bugs.webkit.org/show_bug.cgi?id=49532

            

            

              7
              

            

            

              8
              
        * platform/graphics/gtk/GdkCairoUtilities.cpp:

            

            

              9
              
        (cairoImageSurfaceToGdkPixbuf):

            

            

              10
              

            

        

          1
          
2010-11-14  David Hyatt  <hyatt@apple.com>

          11
          
2010-11-14  David Hyatt  <hyatt@apple.com>

        

        

          2
          

          12
          

        

        

          3
          
        Back out the italics portion of the previous patch until I can figure out why it

          13
          
        Back out the italics portion of the previous patch until I can figure out why it

        



-
  a/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp
    
      +9 lines
    




  

    
      
            Lines 29-34
      
      
      
        a/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp_sec1
      
    
  

        

          29
          
#include <cairo.h>

          29
          
#include <cairo.h>

        

        

          30
          
#include <gtk/gtk.h>

          30
          
#include <gtk/gtk.h>

        

        

          31
          

          31
          

        

            

              
              
              32
              
#ifndef GTK_API_VERSION_2

            

            

              33
              
GdkPixbuf* cairoImageSurfaceToGdkPixbuf(cairo_surface_t* surface)

            

            

              34
              
{

            

            

              35
              
    return gdk_pixbuf_get_from_surface(surface, 0, 0,

            

            

              36
              
                                       cairo_image_surface_get_width(surface),

            

            

              37
              
                                       cairo_image_surface_get_height(surface));

            

            

              38
              
}

            

            

              39
              
#else

            

        

          32
          
static inline unsigned char* getCairoSurfacePixel(unsigned char* data, unsigned x, unsigned y, unsigned rowStride)

          40
          
static inline unsigned char* getCairoSurfacePixel(unsigned char* data, unsigned x, unsigned y, unsigned rowStride)

        

        

          33
          
{

          41
          
{

        

        

          34
          
    return data + (y * rowStride) + x * 4;

          42
          
    return data + (y * rowStride) + x * 4;

        

  

    
      
            Lines 92-94
      
      GdkPixbuf* cairoImageSurfaceToGdkPixbuf(cairo_surface_t* surface)
      
        a/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp_sec2
      
    
  

        

          92
          
    return dest;

          100
          
    return dest;

        

        

          93
          
}

          101
          
}

        

        

          94
          

          102
          

        

            

              
              
              103
              
#endif // GTK_API_VERSION_2

            






  

  Return to Bug 49532