[webkit-changes] cvs commit: WebKit/WebCoreSupport.subproj WebTextRenderer.m

[Darin]

darin       05/10/06 14:19:48

  Modified:    .        ChangeLog
               WebCoreSupport.subproj WebTextRenderer.m
  Log:
          - fixed compiling on Deployment
  
          * WebCoreSupport.subproj/WebTextRenderer.m: (-[WebTextRenderer initWithFont:]):
          Put initialFont inside !LOG_DISABLED.
  
  Revision  Changes    Path
  1.3343    +7 -0      WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3342
  retrieving revision 1.3343
  diff -u -r1.3342 -r1.3343
  --- ChangeLog	6 Oct 2005 21:14:13 -0000	1.3342
  +++ ChangeLog	6 Oct 2005 21:19:43 -0000	1.3343
  @@ -1,5 +1,12 @@
   2005-10-06  Darin Adler  <darin at apple.com>
   
  +        - fixed compiling on Deployment
  +
  +        * WebCoreSupport.subproj/WebTextRenderer.m: (-[WebTextRenderer initWithFont:]):
  +        Put initialFont inside !LOG_DISABLED.
  +
  +2005-10-06  Darin Adler  <darin at apple.com>
  +
           Reviewed by Eric.
   
           - tweaked formatting
  
  
  
  1.196     +2 -0      WebKit/WebCoreSupport.subproj/WebTextRenderer.m
  
  Index: WebTextRenderer.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebTextRenderer.m,v
  retrieving revision 1.195
  retrieving revision 1.196
  diff -u -r1.195 -r1.196
  --- WebTextRenderer.m	6 Oct 2005 21:14:23 -0000	1.195
  +++ WebTextRenderer.m	6 Oct 2005 21:19:47 -0000	1.196
  @@ -347,7 +347,9 @@
           
           // Try setting up the alternate font.
           // This is a last ditch effort to use a substitute font when something has gone wrong.
  +#if !ERROR_DISABLED
           NSFont *initialFont = font.font;
  +#endif
           font.font = [[NSFontManager sharedFontManager] convertFont:font.font toFamily:fallbackFontFamily];
   #if !ERROR_DISABLED
           NSString *filePath = pathFromFont(initialFont);