[Gnash-commit] /srv/bzr/gnash/trunk r11374: TextField.cpp cleanups

[Bob Naugle]

------------------------------------------------------------
revno: 11374
committer: Bob Naugle <address@hidden>
branch nick: trunk
timestamp: Wed 2009-08-05 15:48:45 -0600
message:
  TextField.cpp cleanups
modified:
  libcore/TextField.cpp

=== modified file 'libcore/TextField.cpp'
--- a/libcore/TextField.cpp     2009-08-05 17:08:39 +0000
+++ b/libcore/TextField.cpp     2009-08-05 21:48:45 +0000
@@ -330,7 +330,7 @@
     SWF::TextRecord record;
     size_t i = 0;
     if (_textRecords.size() != 0) {
-        while (i < _recordStarts.size() && m_cursor >= _recordStarts[i]) {
+        while (i < _textRecords.size() && m_cursor >= _recordStarts[i]) {
             ++i;
         }
         return i-1;
@@ -765,7 +765,6 @@
                     setTextValue(s);
                     break;
             }
-            log_debug("m_cursor is %d", m_cursor);
             onChanged();
         }
 
@@ -1445,9 +1444,7 @@
     }
 
     // Add the last line to our output.
-    if (!rec.glyphs().empty()) {
         _textRecords.push_back(rec);
-    }
     
     scrollLines();
 
@@ -2067,8 +2064,6 @@
 
                 // Close out this stretch of glyphs.
                 _textRecords.push_back(rec);
-                ++_glyphcount;
-                _recordStarts.push_back(_glyphcount);
 
                 float previous_x = x;
                 x = std::max(0, getLeftMargin() + getBlockIndent()) + 
PADDING_TWIPS;
@@ -2108,6 +2103,7 @@
                             linestartit++;
                         }
                         _line_starts.insert(linestartit, currentPos);
+                        _recordStarts.push_back(currentPos);
                     }
                 } else {
                     // Move the previous word down onto the next line.
@@ -2136,6 +2132,7 @@
                         ++linestartit;
                     }
                     _line_starts.insert(linestartit, linestartpos);
+                    _recordStarts.push_back(linestartpos);
                 }
 
                 align_line(getTextAlignment(), last_line_start_record, 
previous_x);