[webkit-changes] cvs commit: WebCore/khtml/editing visible_text.cpp

[Alexey]

ap          05/12/30 13:23:32

  Modified:    .        ChangeLog
               khtml/editing visible_text.cpp
  Log:
          - Fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6289
          REGRESSION: firstCharacterForRange(0, 0) returns a 0x0 rect
  
          * khtml/editing/visible_text.cpp:
          (khtml::TextIterator::rangeFromLocationAndLength):
          Only special-case (0, 0) ranges for empty documents.
  
  Revision  Changes    Path
  1.69      +9 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- ChangeLog	30 Dec 2005 20:43:09 -0000	1.68
  +++ ChangeLog	30 Dec 2005 21:23:32 -0000	1.69
  @@ -1,3 +1,12 @@
  +2005-12-30  Alexey Proskuryakov  <ap at nypop.com>
  +
  +        - Fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6289
  +        REGRESSION: firstCharacterForRange(0, 0) returns a 0x0 rect
  +
  +        * khtml/editing/visible_text.cpp:
  +        (khtml::TextIterator::rangeFromLocationAndLength):
  +        Only special-case (0, 0) ranges for empty documents.
  +
   2005-12-29  Geoffrey Garen  <ggaren at apple.com>
   
           Added test case for <rdar://problem/4268278> Submitting a form in onUnload event
  
  
  
  1.46      +2 -1      WebCore/khtml/editing/visible_text.cpp
  
  Index: visible_text.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/visible_text.cpp,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- visible_text.cpp	28 Dec 2005 18:21:50 -0000	1.45
  +++ visible_text.cpp	30 Dec 2005 21:23:32 -0000	1.46
  @@ -997,7 +997,8 @@
   
       TextIterator it(rangeOfContents(doc).get());
       
  -    if (rangeLocation == 0 && rangeLength == 0) {
  +    // FIXME: the atEnd() check shouldn't be necessary, workaround for <http://bugzilla.opendarwin.org/show_bug.cgi?id=6289>.
  +    if (rangeLocation == 0 && rangeLength == 0 && it.atEnd()) {
           int exception = 0;
           textRunRange = it.range();