- fixed deployment build problems noticed by Grant

        * khtml/rendering/render_flow.cpp:
        (RenderFlow::caretRect):
        * khtml/rendering/render_text.cpp:
        (RenderText::caretRect):

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e84cbac7348051b26d8298da44ae5f0d517d18d6..0f0aa8ffbeac3c019a46a3715b697a1a3598ca1e 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-09-08  Maciej Stachowiak  <mjs@apple.com>
+
+        - fixed deployment build problems noticed by Grant
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::caretRect):
+        * khtml/rendering/render_text.cpp:
+        (RenderText::caretRect):
+
 2004-09-08  David Hyatt  <hyatt@apple.com>
 
        Fix XML so that elements with no namespace never make HTML elements (when their names coincidentally match).

diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 20d34464cc16e26a9eca0ca1fceb46469296c044..bebbf652acc55d617e446fb1fd67d3b9601f2048 100644 (file)
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -513,6 +513,7 @@ QRect RenderFlow::caretRect(int offset, bool override)
         case KHTML_LEFT:
         case TAAUTO:
         case JUSTIFY:
+        default:
             _x = 0;
             break;
         case CENTER:

diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index f0b99102351b1d48c200f3ed8bc2f404e8645dfb..c6adea535676701e66349f5cfa3d53e45f2034d6 100644 (file)
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -667,7 +667,7 @@ QRect RenderText::caretRect(int offset, bool override)
         return QRect(-1, -1, 1, -1);
     }
 
-    int _x, _y, width, height;
+    int _x, _y, height;
 
     height = box->root()->bottomOverflow() - box->root()->topOverflow();
     _y = box->root()->topOverflow();
@@ -688,7 +688,7 @@ QRect RenderText::caretRect(int offset, bool override)
     _x += absx;
     _y += absy;
 
-    return QRect(_x, _y, width, height);
+    return QRect(_x, _y, 1, height);
 }
 
 void RenderText::posOfChar(int chr, int &x, int &y)