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

[Darin]

darin       05/10/21 09:35:26

  Modified:    .        ChangeLog
               WebCoreSupport.subproj WebTextRenderer.m
  Log:
          Reviewed and landed by Darin.
  
          - fixed a couple regressions caused by my last check-in
            http://bugzilla.opendarwin.org/show_bug.cgi?id=5437
            http://bugzilla.opendarwin.org/show_bug.cgi?id=5443
  
          * WebCoreSupport.subproj/WebTextRenderer.m:
          (-[WebTextRenderer CG_drawHighlightForRun:style:geometry:]): Compute background width
          correctly, by subtracting position after run from position before run.
          (addDirectionalOverride): Make the range include only the characters between the
          directional override characters, not the directional override characters themselves.
          (initializeWidthIterator): Correctly compute "widthToStart" based on the offset to
          the beginning of the run, not to the end of the run!
  
  Revision  Changes    Path
  1.3355    +18 -1     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3354
  retrieving revision 1.3355
  diff -u -r1.3354 -r1.3355
  --- ChangeLog	20 Oct 2005 06:02:28 -0000	1.3354
  +++ ChangeLog	21 Oct 2005 16:35:22 -0000	1.3355
  @@ -1,3 +1,19 @@
  +2005-10-21  Mitz Pettel  <opendarwin.org at mitzpettel.com>
  +
  +        Reviewed and landed by Darin.
  +
  +        - fixed a couple regressions caused by my last check-in
  +          http://bugzilla.opendarwin.org/show_bug.cgi?id=5437
  +          http://bugzilla.opendarwin.org/show_bug.cgi?id=5443
  +
  +        * WebCoreSupport.subproj/WebTextRenderer.m:
  +        (-[WebTextRenderer CG_drawHighlightForRun:style:geometry:]): Compute background width
  +        correctly, by subtracting position after run from position before run.
  +        (addDirectionalOverride): Make the range include only the characters between the
  +        directional override characters, not the directional override characters themselves.
  +        (initializeWidthIterator): Correctly compute "widthToStart" based on the offset to
  +        the beginning of the run, not to the end of the run!
  +
   2005-10-19  Darin Adler  <darin at apple.com>
   
           Reviewed by Maciej.
  @@ -29986,7 +30002,8 @@
   
   2003-01-23  Trey Matteson  <trey at apple.com>
   
  -        3155162 - cursor changes to I-beam after dragging image        3154468 - no mouseup event comes through after text snippet drag
  +        3155162 - cursor changes to I-beam after dragging image
  +        3154468 - no mouseup event comes through after text snippet drag
   
           During AK dragging the system takes over the event stream and we never get any mouse
           move or up events.  It also changes the cursor behind out back.  When done
  
  
  
  1.199     +4 -4      WebKit/WebCoreSupport.subproj/WebTextRenderer.m
  
  Index: WebTextRenderer.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebTextRenderer.m,v
  retrieving revision 1.198
  retrieving revision 1.199
  diff -u -r1.198 -r1.199
  --- WebTextRenderer.m	20 Oct 2005 06:02:38 -0000	1.198
  +++ WebTextRenderer.m	21 Oct 2005 16:35:25 -0000	1.199
  @@ -866,7 +866,7 @@
       advanceWidthIterator(&it, run->from, 0, 0, 0);
       float beforeWidth = it.runWidthSoFar;
       advanceWidthIterator(&it, run->to, 0, 0, 0);
  -    float backgroundWidth = it.runWidthSoFar;
  +    float backgroundWidth = it.runWidthSoFar - beforeWidth;
       if (style->rtl) {
           advanceWidthIterator(&it, run->length, 0, 0, 0);
           float afterWidth = it.runWidthSoFar;
  @@ -1309,8 +1309,8 @@
   
       WebCoreTextRun runWithOverride;
   
  -    runWithOverride.from = from;
  -    runWithOverride.to = to + 2;
  +    runWithOverride.from = from + 1;
  +    runWithOverride.to = to + 1;
       runWithOverride.length = run->length + 2;
       runWithOverride.characters = charactersWithOverride;
   
  @@ -1660,7 +1660,7 @@
           startPositionRun.to = run->length;
           WidthIterator startPositionIterator;
           initializeWidthIterator(&startPositionIterator, renderer, &startPositionRun, style);
  -        advanceWidthIterator(&startPositionIterator, run->to, 0, 0, 0);
  +        advanceWidthIterator(&startPositionIterator, run->from, 0, 0, 0);
           iterator->widthToStart = startPositionIterator.runWidthSoFar;
       }
   }