Reviewed by Darin.

        no need to calculate linewidth multiple times in findnextlinebreak()
        http://bugzilla.opendarwin.org/show_bug.cgi?id=5319

        No test case needed, this is a simple optimization.

        * khtml/rendering/bidi.cpp:
        (khtml::RenderBlock::findNextLineBreak):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@10845 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-12-19 b/WebCore/ChangeLog-2005-12-19
index fbbfc6aec34022724d98f02b09b5e1a361e24a84..d4abde6e78b052f461a7091812fbca3f2d53dd98 100644 (file)
--- a/WebCore/ChangeLog-2005-12-19
+++ b/WebCore/ChangeLog-2005-12-19
@@ -1,3 +1,15 @@
+2005-10-13  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Darin.
+
+        no need to calculate linewidth multiple times in findnextlinebreak()
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=5319
+
+        No test case needed, this is a simple optimization.
+
+        * khtml/rendering/bidi.cpp:
+        (khtml::RenderBlock::findNextLineBreak):
+
 2005-10-13  Geoffrey Garen  <ggaren@apple.com>
 
         - Fixed <rdar://problem/4259434> Safari crashes in HTMLTokenizer::~HTMLTokenizer() 

diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 37127e6e41516cc392a4702dab0b754b93c0e962..46ab01038019d984ada17b37d9a7c03cf42c7fb7 100644 (file)
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1941,7 +1941,8 @@ int RenderBlock::skipWhitespace(BidiIterator &it, BidiState &bidi)
 
 BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi)
 {
-    int width = lineWidth(m_height);
+    // eliminate spaces at beginning of line
+    int width = skipWhitespace(start, bidi);
     int w = 0;
     int tmpW = 0;
 #ifdef DEBUG_LINEBREAKS
@@ -1949,8 +1950,6 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
     kdDebug(6041) << "sol: " << start.obj << " " << start.pos << endl;
 #endif
 
-    // eliminate spaces at beginning of line
-    width = skipWhitespace(start, bidi);
     if (start.atEnd())
         return start;