[webkit-changes] cvs commit: WebCore/kwq KWQPainter.mm

[Adele]

adele       05/09/12 17:28:06

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               kwq      Tag: Safari-2-0-branch KWQPainter.mm
  Log:
          Reviewed by Justin and Adele.
  
          A workaround for a GCC bug, Justin to file a radar with a reduction soon.
  
          * kwq/KWQPainter.mm:
          (QPainter::drawFloatPixmap):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.24  +9 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.23
  retrieving revision 1.1.2.24
  diff -u -r1.1.2.23 -r1.1.2.24
  --- ChangeLog	9 Sep 2005 18:30:52 -0000	1.1.2.23
  +++ ChangeLog	13 Sep 2005 00:28:05 -0000	1.1.2.24
  @@ -1,3 +1,12 @@
  +2005-09-12  Timothy Hatcher  <timothy at apple.com>
  +
  +        Reviewed by Justin and Adele.
  +
  +        A workaround for a GCC bug, Justin to file a radar with a reduction soon.
  +
  +        * kwq/KWQPainter.mm:
  +        (QPainter::drawFloatPixmap):
  +
   === WebCore-416.7 ===
   
   2005-09-09  Adele Peterson  <adele at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.124.8.4 +20 -13    WebCore/kwq/KWQPainter.mm
  
  Index: KWQPainter.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQPainter.mm,v
  retrieving revision 1.124.8.3
  retrieving revision 1.124.8.4
  diff -u -r1.124.8.3 -r1.124.8.4
  --- KWQPainter.mm	16 Aug 2005 01:42:48 -0000	1.124.8.3
  +++ KWQPainter.mm	13 Sep 2005 00:28:06 -0000	1.124.8.4
  @@ -560,21 +560,28 @@
   {
       if (data->state.paintingDisabled)
           return;
  -        
  -    if (sw == -1)
  -        sw = pixmap.width();
  -    if (sh == -1)
  -        sh = pixmap.height();
  -
  -    if (w == -1)
  -        w = pixmap.width();
  -    if (h == -1)
  -        h = pixmap.height();
   
  -    NSRect inRect = NSMakeRect(x, y, w, h);
  -    NSRect fromRect = NSMakeRect(sx, sy, sw, sh);
  -    
  +    // As a workaround for a GCC bug, we moved KWQ_BLOCK_EXCEPTIONS from just above [pixmap.imageRender ...] to here
  +    // and we created 4 temporary variables to hold the function arguments
       KWQ_BLOCK_EXCEPTIONS;
  +
  +    float tsw = sw;
  +    float tsh = sh;
  +    float tw = w;
  +    float th = h;
  +
  +    if (tsw == -1)
  +        tsw = pixmap.width();
  +    if (tsh == -1)
  +        tsh = pixmap.height();
  +    if (tw == -1)
  +        tw = pixmap.width();
  +    if (th == -1)
  +        th = pixmap.height();
  +
  +    NSRect inRect = NSMakeRect(x, y, tw, th);
  +    NSRect fromRect = NSMakeRect(sx, sy, tsw, tsh);
  +
       [pixmap.imageRenderer drawImageInRect:inRect
                                         fromRect:fromRect compositeOperator:(NSCompositingOperation)compositeOperator context:context];
       KWQ_UNBLOCK_EXCEPTIONS;