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

[Eric]

eseidel     05/10/11 02:11:49

  Modified:    .        ChangeLog
               WebCore+SVG DrawCanvasItem.mm DrawView.mm
               kwq      KWQSlot.mm
  Log:
  Bug #: 5301
  Submitted by: Julien Palmas <julien.palmas at mac.com>
  Reviewed by: eseidel
          Fixes WebCore+SVG build under gcc 3.3
          http://bugzilla.opendarwin.org/show_bug.cgi?id=5301
  
          * WebCore+SVG/DrawCanvasItem.mm:
          * WebCore+SVG/DrawView.mm:
          (-[DrawDocument drawRect:initWithDrawView:]):
          * kwq/KWQSlot.mm:
  
  Revision  Changes    Path
  1.230     +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.229
  retrieving revision 1.230
  diff -u -r1.229 -r1.230
  --- ChangeLog	11 Oct 2005 06:55:25 -0000	1.229
  +++ ChangeLog	11 Oct 2005 09:11:45 -0000	1.230
  @@ -1,3 +1,15 @@
  +2005-10-11  Julien Palmas <julien.palmas at mac.com>>
  +
  +        Reviewed by eseidel.
  +
  +        Fixes WebCore+SVG build under gcc 3.3
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=5301
  +
  +        * WebCore+SVG/DrawCanvasItem.mm:
  +        * WebCore+SVG/DrawView.mm:
  +        (-[DrawDocument drawRect:initWithDrawView:]):
  +        * kwq/KWQSlot.mm:
  +
   2005-10-10  Geoffrey Garen  <ggaren at apple.com>
   
           - Fixed <rdar://problem/4245682> Regression: CrashTracer: 923 crashes 
  
  
  
  1.6       +6 -0      SVGSupport/WebCore+SVG/DrawCanvasItem.mm
  
  Index: DrawCanvasItem.mm
  ===================================================================
  RCS file: /cvs/root/SVGSupport/WebCore+SVG/DrawCanvasItem.mm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DrawCanvasItem.mm	5 Oct 2005 05:36:54 -0000	1.5
  +++ DrawCanvasItem.mm	11 Oct 2005 09:11:48 -0000	1.6
  @@ -29,6 +29,10 @@
   #import <kcanvas/KCanvas.h>
   #import <kcanvas/KCanvasItem.h>
   
  +#import <qapplication.h>
  +
  +#define id ID_HACK
  +
   #import <kdom/Namespace.h>
   #import <kdom/Helper.h>
   #import <kdom/DOMString.h>
  @@ -38,6 +42,8 @@
   #import <ksvg2/svg/SVGRectElementImpl.h>
   #import <ksvg2/svg/SVGPathElementImpl.h>
   
  +#undef id
  +
   #import "KWQTextStream.h"
   
   using namespace KDOM;
  
  
  
  1.8       +5 -0      SVGSupport/WebCore+SVG/DrawView.mm
  
  Index: DrawView.mm
  ===================================================================
  RCS file: /cvs/root/SVGSupport/WebCore+SVG/DrawView.mm,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DrawView.mm	5 Oct 2005 05:36:54 -0000	1.7
  +++ DrawView.mm	11 Oct 2005 09:11:48 -0000	1.8
  @@ -90,6 +90,11 @@
       KCanvasViewQuartz *canvasView;
       KRenderingDeviceContextQuartz *quartzContext;
   }
  +
  +- (DrawDocument *)document;
  +- (void)setDocument:(DrawDocument *)doc;
  +- (void)drawRect:(NSRect)dirtyViewRect;
  +
   @end 
   
   @implementation DrawViewPrivate
  
  
  
  1.36      +2 -0      WebCore/kwq/KWQSlot.mm
  
  Index: KWQSlot.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQSlot.mm,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- KWQSlot.mm	3 Oct 2005 21:13:09 -0000	1.35
  +++ KWQSlot.mm	11 Oct 2005 09:11:49 -0000	1.36
  @@ -35,7 +35,9 @@
   #import "render_layer.h"
   #import "xmlhttprequest.h"
   #ifdef SVG_SUPPORT
  +#define id ID_HACK
   #import "ksvg2/misc/KSVGTimeScheduler.h"
  +#undef id
   #endif
   
   using DOM::DocumentImpl;