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

[Adele]

adele       05/12/20 10:29:13

  Modified:    .        ChangeLog
               WebCoreSupport.subproj WebTextRenderer.m
  Log:
          Reviewed by Darin, committed by Adele.
  
          - fix deployment builds broken by the ATSUI multiple renderers patch
          http://bugzilla.opendarwin.org/show_bug.cgi?id=6153
  
          * WebCoreSupport.subproj/WebTextRenderer.m:
          (createATSULayoutParameters): Assign initial values, which will never be used,
          to substituteRenderer and firstSmallCap, to avoid uninitialized variable warnings.
  
  Revision  Changes    Path
  1.3416    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3415
  retrieving revision 1.3416
  diff -u -r1.3415 -r1.3416
  --- ChangeLog	20 Dec 2005 17:05:56 -0000	1.3415
  +++ ChangeLog	20 Dec 2005 18:29:04 -0000	1.3416
  @@ -1,3 +1,14 @@
  +2005-12-20  Mitz Pettel  <opendarwin.org at mitzpettel.com>
  +
  +        Reviewed by Darin, committed by Adele.
  +
  +        - fix deployment builds broken by the ATSUI multiple renderers patch
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=6153
  +
  +        * WebCoreSupport.subproj/WebTextRenderer.m:
  +        (createATSULayoutParameters): Assign initial values, which will never be used,
  +        to substituteRenderer and firstSmallCap, to avoid uninitialized variable warnings.
  +
   2005-12-20  Geoffrey Garen  <ggaren at apple.com>
   
           Reviewed by John.
  
  
  
  1.207     +2 -2      WebKit/WebCoreSupport.subproj/WebTextRenderer.m
  
  Index: WebTextRenderer.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebTextRenderer.m,v
  retrieving revision 1.206
  retrieving revision 1.207
  diff -u -r1.206 -r1.207
  --- WebTextRenderer.m	19 Dec 2005 22:16:24 -0000	1.206
  +++ WebTextRenderer.m	20 Dec 2005 18:29:13 -0000	1.207
  @@ -1289,7 +1289,7 @@
       UniCharArrayOffset substituteOffset = runFrom;
       UniCharCount substituteLength;
       UniCharArrayOffset lastOffset;
  -    WebTextRenderer *substituteRenderer;
  +    WebTextRenderer *substituteRenderer = 0;;
   
       while (substituteOffset < runTo) {
           lastOffset = substituteOffset;
  @@ -1308,10 +1308,10 @@
           }
   
           bool isSmallCap = false;
  +        UniCharArrayOffset firstSmallCap = 0;
           WebTextRenderer *r = renderer;
           UniCharArrayOffset i;
           for (i = lastOffset;  ; i++) {
  -            UniCharArrayOffset firstSmallCap;
               if (i == substituteOffset || i == substituteOffset + substituteLength) {
                   if (isSmallCap) {
                       isSmallCap = false;