Show
Ignore:
Timestamp:
08/15/08 13:25:16 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35774

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/BAL/WKAL/Concretizations/Widgets/Gtk/BCRenderThemeGtk.cpp

    r308 r437  
    2222 
    2323#include "config.h" 
     24#include "RenderThemeGtk.h" 
     25 
     26#include "AffineTransform.h" 
     27#include "GraphicsContext.h" 
    2428#include "NotImplemented.h" 
    2529#include "RenderObject.h" 
    26 #include "RenderThemeGtk.h" 
    2730#include "gtkdrawing.h" 
    2831 
    …… 
    153156    } 
    154157 
    155     IntPoint pos = i.context->translatePoint(rect.location()); 
     158    AffineTransform ctm = i.context->getCTM(); 
     159 
     160    IntPoint pos = ctm.mapPoint(rect.location()); 
    156161    GdkRectangle gdkRect = IntRect(pos.x(), pos.y(), rect.width(), rect.height()); 
    157162    GtkTextDirection direction = gtkTextDirection(o->style()->direction()); 
    …… 
    165170    gdkClipRect.width = clipX2 - clipX1; 
    166171    gdkClipRect.height = clipY2 - clipY1; 
    167     IntPoint clipPos = i.context->translatePoint(IntPoint(clipX1, clipY1)); 
     172    IntPoint clipPos = ctm.mapPoint(IntPoint(clipX1, clipY1)); 
    168173    gdkClipRect.x = clipPos.x(); 
    169174    gdkClipRect.y = clipPos.y();