[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

Sat Sep 26 05:44:10 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit a298c29d678df53695479e6b536f484ec2e15066
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 5 17:32:34 2001 +0000

    Finished in khtml/rendering directory
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/Makefile.in b/WebCore/Makefile.in
index 3eb9c59..c50c4f1 100644
--- a/WebCore/Makefile.in
+++ b/WebCore/Makefile.in
@@ -26,6 +26,7 @@ SUBDIRS = \
 	src/kdelibs/khtml/xml \
 	src/kdelibs/khtml/java \
 	src/kdelibs/khtml/html \
+	src/kdelibs/khtml/rendering \
 	$(NULL)
 
 #----------------------------------------------------------------------
diff --git a/WebCore/configure b/WebCore/configure
index af0e7fb..5c7a904 100644
--- a/WebCore/configure
+++ b/WebCore/configure
@@ -563,6 +563,7 @@ SUBDIRS='
 	src/kdelibs/khtml/xml
 	src/kdelibs/khtml/java
 	src/kdelibs/khtml/html
+	src/kdelibs/khtml/rendering
 '
 for subdir in $SUBDIRS; do
 	if (test -f "./$subdir/MakeSystemChanges.sh"); then
@@ -607,7 +608,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:611: checking host system type" >&5
+echo "configure:612: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -638,7 +639,7 @@ esac
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:642: checking for $ac_word" >&5
+echo "configure:643: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -668,7 +669,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:672: checking for $ac_word" >&5
+echo "configure:673: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -719,7 +720,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:723: checking for $ac_word" >&5
+echo "configure:724: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -751,7 +752,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:755: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:756: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -762,12 +763,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 766 "configure"
+#line 767 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -793,12 +794,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:797: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:798: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:802: checking whether we are using GNU C" >&5
+echo "configure:803: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -807,7 +808,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -826,7 +827,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:830: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:831: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -867,7 +868,7 @@ CXXFLAGS=$CFLAGS
  
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:871: checking how to run the C preprocessor" >&5
+echo "configure:872: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -882,13 +883,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 886 "configure"
+#line 887 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -899,13 +900,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 903 "configure"
+#line 904 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -916,13 +917,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 920 "configure"
+#line 921 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -949,7 +950,7 @@ echo "$ac_t""$CPP" 1>&6
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:953: checking for $ac_word" >&5
+echo "configure:954: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -983,7 +984,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:987: checking for yywrap in -l$ac_lib" >&5
+echo "configure:988: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -991,7 +992,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 995 "configure"
+#line 996 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1002,7 +1003,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:1006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1025,7 +1026,7 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:1029: checking lex output file root" >&5
+echo "configure:1030: checking lex output file root" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1046,7 +1047,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:1050: checking whether yytext is a pointer" >&5
+echo "configure:1051: checking whether yytext is a pointer" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1058,14 +1059,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 1062 "configure"
+#line 1063 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -1091,7 +1092,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:1096: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1132,7 +1133,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1136: checking for $ac_word" >&5
+echo "configure:1137: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1171,7 +1172,7 @@ YACCFLAGS="-d"
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1175: checking for $ac_word" >&5
+echo "configure:1176: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1207,7 +1208,7 @@ ARFLAGS="cr"
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1211: checking for $ac_word" >&5
+echo "configure:1212: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1244,7 +1245,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1248: checking for $ac_word" >&5
+echo "configure:1249: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_SED'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1279,7 +1280,7 @@ if test -z "$ac_cv_prog_SED"; then
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1283: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1284: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1317,7 +1318,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1321: checking for a BSD compatible install" >&5
+echo "configure:1322: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1396,12 +1397,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1400: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1401: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1405 "configure"
+#line 1406 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -1409,7 +1410,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:1413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -1434,7 +1435,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1438: checking for opendir in -ldir" >&5
+echo "configure:1439: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1442,7 +1443,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1446 "configure"
+#line 1447 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1453,7 +1454,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1475,7 +1476,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1479: checking for opendir in -lx" >&5
+echo "configure:1480: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1483,7 +1484,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1487 "configure"
+#line 1488 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1494,7 +1495,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1517,12 +1518,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1521: checking for ANSI C header files" >&5
+echo "configure:1522: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1526 "configure"
+#line 1527 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1530,7 +1531,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1547,7 +1548,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1551 "configure"
+#line 1552 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1565,7 +1566,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1569 "configure"
+#line 1570 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1586,7 +1587,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1590 "configure"
+#line 1591 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1597,7 +1598,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1624,17 +1625,17 @@ for ac_hdr in sys/param.h sys/mman.h sys/time.h sys/cdefs.h fnmatch.h sysent.h s
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1628: checking for $ac_hdr" >&5
+echo "configure:1629: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1633 "configure"
+#line 1634 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1663,12 +1664,12 @@ done
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1667: checking for working const" >&5
+echo "configure:1668: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1672 "configure"
+#line 1673 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1717,7 +1718,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1738,21 +1739,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1742: checking for inline" >&5
+echo "configure:1743: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1749 "configure"
+#line 1750 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1778,12 +1779,12 @@ EOF
 esac
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1782: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1783: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1787 "configure"
+#line 1788 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1792,7 +1793,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1817,12 +1818,12 @@ fi
 for ac_func in socket vsnprintf seteuid setegid random strfmon stpcpy mkstemp gettimeofday setenv unsetenv mkstemps
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1821: checking for $ac_func" >&5
+echo "configure:1822: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1826 "configure"
+#line 1827 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1845,7 +1846,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1878,12 +1879,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:1882: checking for pid_t" >&5
+echo "configure:1883: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1887 "configure"
+#line 1888 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1912,17 +1913,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:1916: checking for vfork.h" >&5
+echo "configure:1917: checking for vfork.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1921 "configure"
+#line 1922 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1947,18 +1948,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:1951: checking for working vfork" >&5
+echo "configure:1952: checking for working vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:1957: checking for vfork" >&5
+echo "configure:1958: checking for vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1962 "configure"
+#line 1963 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -1981,7 +1982,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
@@ -2003,7 +2004,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 2007 "configure"
+#line 2008 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -2098,7 +2099,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_vfork_works=yes
 else
@@ -2125,17 +2126,17 @@ for ac_hdr in ieeefp.h float.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2129: checking for $ac_hdr" >&5
+echo "configure:2130: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2134 "configure"
+#line 2135 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2162,7 +2163,7 @@ fi
 done
 
 echo $ac_n "checking for isinf in -lm""... $ac_c" 1>&6
-echo "configure:2166: checking for isinf in -lm" >&5
+echo "configure:2167: checking for isinf in -lm" >&5
 ac_lib_var=`echo m'_'isinf | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2170,7 +2171,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2174 "configure"
+#line 2175 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2181,7 +2182,7 @@ int main() {
 isinf()
 ; return 0; }
 EOF
-if { (eval echo configure:2185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2207,7 +2208,7 @@ else
 fi
 
 echo $ac_n "checking for finite in -lm""... $ac_c" 1>&6
-echo "configure:2211: checking for finite in -lm" >&5
+echo "configure:2212: checking for finite in -lm" >&5
 ac_lib_var=`echo m'_'finite | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2215,7 +2216,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2219 "configure"
+#line 2220 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2226,7 +2227,7 @@ int main() {
 finite()
 ; return 0; }
 EOF
-if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2252,7 +2253,7 @@ else
 fi
 
 echo $ac_n "checking for _finite in -lm""... $ac_c" 1>&6
-echo "configure:2256: checking for _finite in -lm" >&5
+echo "configure:2257: checking for _finite in -lm" >&5
 ac_lib_var=`echo m'_'_finite | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2260,7 +2261,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2264 "configure"
+#line 2265 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2271,7 +2272,7 @@ int main() {
 _finite()
 ; return 0; }
 EOF
-if { (eval echo configure:2275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2297,7 +2298,7 @@ else
 fi
 
 echo $ac_n "checking for isnan in -lm""... $ac_c" 1>&6
-echo "configure:2301: checking for isnan in -lm" >&5
+echo "configure:2302: checking for isnan in -lm" >&5
 ac_lib_var=`echo m'_'isnan | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2305,7 +2306,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2309 "configure"
+#line 2310 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2316,7 +2317,7 @@ int main() {
 isnan()
 ; return 0; }
 EOF
-if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2457,6 +2458,7 @@ trap 'rm -fr `echo "Makefile
 	src/kdelibs/khtml/xml/Makefile
 	src/kdelibs/khtml/java/Makefile
 	src/kdelibs/khtml/html/Makefile
+	src/kdelibs/khtml/rendering/Makefile
  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -2566,6 +2568,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
 	src/kdelibs/khtml/xml/Makefile
 	src/kdelibs/khtml/java/Makefile
 	src/kdelibs/khtml/html/Makefile
+	src/kdelibs/khtml/rendering/Makefile
 "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
diff --git a/WebCore/configure.in b/WebCore/configure.in
index dd030b3..270319a 100644
--- a/WebCore/configure.in
+++ b/WebCore/configure.in
@@ -47,6 +47,7 @@ SUBDIRS='
 	src/kdelibs/khtml/xml
 	src/kdelibs/khtml/java
 	src/kdelibs/khtml/html
+	src/kdelibs/khtml/rendering
 '
 for subdir in $SUBDIRS; do
 	if (test -f "./$subdir/MakeSystemChanges.sh"); then
@@ -201,5 +202,6 @@ AC_OUTPUT(
 	src/kdelibs/khtml/xml/Makefile
 	src/kdelibs/khtml/java/Makefile
 	src/kdelibs/khtml/html/Makefile
+	src/kdelibs/khtml/rendering/Makefile
 )
 
diff --git a/WebCore/khtml/css/Makefile.in.apple b/WebCore/khtml/css/Makefile.in.apple
index 6d2532f..771031f 100644
--- a/WebCore/khtml/css/Makefile.in.apple
+++ b/WebCore/khtml/css/Makefile.in.apple
@@ -54,6 +54,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR)/src/kwq/qt \
 	-I$(TOPSRCDIR)/src/kwq/dcop \
 	-I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/src/kwq/kdeui \
 	-I$(TOPSRCDIR)/src/kwq/kio \
 	-I$(TOPSRCDIR)/src/kwq/kparts \
 	-I../dom \
diff --git a/WebCore/khtml/dom/Makefile.in.apple b/WebCore/khtml/dom/Makefile.in.apple
index 30d91c6..1ef72ac 100644
--- a/WebCore/khtml/dom/Makefile.in.apple
+++ b/WebCore/khtml/dom/Makefile.in.apple
@@ -39,6 +39,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR)/src/kwq/qt \
 	-I$(TOPSRCDIR)/src/kwq/dcop \
 	-I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/src/kwq/kdeui \
 	-I$(TOPSRCDIR)/src/kwq/kio \
 	-I$(TOPSRCDIR)/src/kwq/kparts \
 	-I../css \
diff --git a/WebCore/khtml/misc/Makefile.in.apple b/WebCore/khtml/misc/Makefile.in.apple
index 8450be7..76f3d6e 100644
--- a/WebCore/khtml/misc/Makefile.in.apple
+++ b/WebCore/khtml/misc/Makefile.in.apple
@@ -53,6 +53,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR)/src/kwq \
 	-I$(TOPSRCDIR)/src/kwq/qt \
 	-I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/src/kwq/kdeui \
 	-I$(TOPSRCDIR)/src/kwq/kio \
 	-I$(TOPSRCDIR)/src/kwq/dcop \
 	-I../dom \
diff --git a/WebCore/khtml/html/Makefile.in.apple b/WebCore/khtml/rendering/Makefile.in.apple
similarity index 86%
copy from WebCore/khtml/html/Makefile.in.apple
copy to WebCore/khtml/rendering/Makefile.in.apple
index 4eff431..a660a74 100644
--- a/WebCore/khtml/html/Makefile.in.apple
+++ b/WebCore/khtml/rendering/Makefile.in.apple
@@ -21,7 +21,7 @@ CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
 OBJECTS = $(CXXOBJECTS)
 
-LIBRARY = libkhtmlhtml.a
+LIBRARY = libkhtmlrendering.a
 
 CLEAN_FILES = $(OBJECTS) \
 	$(LIBRARY) \
@@ -32,22 +32,25 @@ CLEAN_FILES = $(OBJECTS) \
 # Set flags for this directory
 
 CXXFLAGS = $(BASECXXFLAGS) \
+        -DNEED_BOGUS_X_DEFINES \
 	-I$(TOPSRCDIR)/src/kwq \
 	-I$(TOPSRCDIR)/src/kwq/qt \
 	-I$(TOPSRCDIR)/src/kwq/dcop \
 	-I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/src/kwq/kfile \
 	-I$(TOPSRCDIR)/src/kwq/kio \
 	-I$(TOPSRCDIR)/src/kwq/kdeui \
 	-I$(TOPSRCDIR)/src/kwq/kparts \
 	-I../../kdecore \
 	-I../../kjs \
-	-I.. \
+	-I../html \
+	-I../java \
 	-I../misc \
 	-I../css \
 	-I../dom \
 	-I../xml \
-	-I../rendering \
 	-I. \
+	-I.. \
 	-I$(TOPSRCDIR) \
 	$(NULL)
 
@@ -65,12 +68,16 @@ depend: Makefile.dep
 Makefile.dep: $(SOURCES) $(HEADERS)
 	$(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
 
-htmltokenizer.cpp: htmltokenizer.moc
-htmltokenizer.moc:
+render_form.cpp: render_form.moc
+render_form.moc:
+	touch $@
+
+render_frames.cpp: render_frames.moc
+render_frames.moc:
 	touch $@
 
-html_documentimpl.cpp: html_documentimpl.moc
-html_documentimpl.moc:
+render_replaced.cpp: render_replaced.moc
+render_replaced.moc:
 	touch $@
 
 #----------------------------------------------------------------------
diff --git a/WebCore/khtml/xml/Makefile.in.apple b/WebCore/khtml/xml/Makefile.in.apple
index 2d06b3a..8be561b 100644
--- a/WebCore/khtml/xml/Makefile.in.apple
+++ b/WebCore/khtml/xml/Makefile.in.apple
@@ -53,6 +53,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
     -I$(TOPSRCDIR)/src/kwq \
     -I$(TOPSRCDIR)/src/kwq/qt \
     -I$(TOPSRCDIR)/src/kwq/kdecore \
+    -I$(TOPSRCDIR)/src/kwq/kdeui \
     -I../css \
     -I../dom \
     -I../html \
diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index 7ee0284..b72fe27 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -31,6 +31,7 @@ class QString;
 class QColor {
 public:
     QColor();
+    QColor(int,int,int);
     QColor(const char *);
 
     QString name() const;
diff --git a/WebCore/kwq/KWQDateTime.h b/WebCore/kwq/KWQDateTime.h
index c670a7c..a20a495 100644
--- a/WebCore/kwq/KWQDateTime.h
+++ b/WebCore/kwq/KWQDateTime.h
@@ -32,8 +32,10 @@ public:
     QTime(int h, int m);
     QTime(const QTime &other);
 
+    bool isNull() const;
     void start();
     int msec() const;
+    int elapsed() const;
 };
 
 class QDate {
diff --git a/WebCore/kwq/KWQFontInfo.h b/WebCore/kwq/KWQFontInfo.h
index c498abe..8af1145 100644
--- a/WebCore/kwq/KWQFontInfo.h
+++ b/WebCore/kwq/KWQFontInfo.h
@@ -26,4 +26,12 @@
 #ifndef QFONTINFO_H_
 #define QFONTINFO_H_
 
+class QFontInfo {
+public:
+    QFontInfo(const QFont &);
+    QFontInfo( const QFontInfo & );
+
+    bool fixedPitch() const;
+};
+
 #endif
diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index 8a6f2b4..976043c 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -39,12 +39,15 @@ public:
 
     int ascent() const;
     int height() const;
-    int width() const;
+    int width(QChar) const;
     int width(char) const;
-    int width(QString) const;
+    int width(const QString &, int len = -1) const;
     int descent() const;
+    QRect boundingRect( const QString &, int len = -1 ) const;
     QRect boundingRect(QChar) const;
     QSize size(int flags, const QString& str, int len=-1, int tabstops=0, int *tabarray=0, char **intern=0 ) const;
+    int rightBearing(QChar) const;
+    int leftBearing(QChar) const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQMemArray.h b/WebCore/kwq/KWQMemArray.h
index f6e3f88..38d27c8 100644
--- a/WebCore/kwq/KWQMemArray.h
+++ b/WebCore/kwq/KWQMemArray.h
@@ -39,6 +39,7 @@ public:
     uint count() const;
     bool resize(uint size);
     QArray<T>& duplicate(const T*, int);
+    bool fill(const T &d, int size = -1);
     
     T &operator[](int) const;
 };
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index a9dd820..5309336 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -41,9 +41,12 @@ public:
     };
 
     enum AlignmentFlags {
+        AlignLeft,
         AlignCenter,
+        AlignRight,
         WordBreak,
         ShowPrefix,
+        DontClip,
     };
 
     enum PenStyle {
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index 044150c..36ac7d1 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -58,6 +58,7 @@ public:
     void killTimer(int);
     void killTimers();
     void installEventFilter(const QObject *);
+    void removeEventFilter(const QObject *);
     void blockSignals(bool);
 };
 
diff --git a/WebCore/kwq/KWQPainter.h b/WebCore/kwq/KWQPainter.h
index cfb663a..89fb79e 100644
--- a/WebCore/kwq/KWQPainter.h
+++ b/WebCore/kwq/KWQPainter.h
@@ -33,6 +33,7 @@
 #include "qpen.h"
 #include "qregion.h"
 #include "qpoint.h"
+#include "qstring.h"
 #include "qfontmetrics.h"
 
 class QFont;
@@ -48,6 +49,7 @@ public:
     QPainter();
     QPainter(const QPaintDevice *);
     
+    const QFont &font() const;
     void setFont(const QFont &);
     QFontMetrics fontMetrics() const;
     const QPen &pen() const;
@@ -58,6 +60,9 @@ public:
 
     QRect xForm(const QRect &) const;
 
+    void save();
+    void restore();
+    
     void drawRect(int, int, int, int);
     void fillRect(int, int, int, int, const QBrush &);
     void drawLine(int, int, int, int);
@@ -69,7 +74,10 @@ public:
     void drawPixmap(const QPoint &, const QPixmap &);
     void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
     void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
+    void drawText(int x, int y, const QString &, int len = -1);
     void drawText(int, int, int, int, AlignmentFlags, const QString &);
+    void drawText(int, int, int, int, int flags, const QString&, int len = -1, QRect *br=0, char **internal=0);
+
     void setClipping(bool);
     void setClipRegion(const QRegion &);
     const QRegion &clipRegion() const;
diff --git a/WebCore/kwq/KWQPen.h b/WebCore/kwq/KWQPen.h
index bc1a666..822e8a4 100644
--- a/WebCore/kwq/KWQPen.h
+++ b/WebCore/kwq/KWQPen.h
@@ -27,11 +27,14 @@
 #define QPEN_H_
 
 #include "qnamespace.h"
+#include "qcolor.h"
 
 class QPen : public Qt {
 public:
     QPen();
     QPen(const QColor &color, uint width=0, PenStyle style=SolidLine);
+
+    const QColor &color() const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQPtrVector.h b/WebCore/kwq/KWQPtrVector.h
index fcd1aff..064baae 100644
--- a/WebCore/kwq/KWQPtrVector.h
+++ b/WebCore/kwq/KWQPtrVector.h
@@ -31,10 +31,25 @@
 
 typedef void *Item;
 
-template<class T> class QVector : public QCollection {
+class QGVector : public QCollection {
+public:
+    virtual int compareItems(Item, Item);
+};
+
+template<class T> class QVector : public QGVector  {
 public:
     QVector();
     QVector(uint);
+
+    bool isEmpty() const;
+    uint count() const;
+    uint size() const;
+    bool remove(uint);
+    bool resize(uint);
+    bool insert(uint, const T *);
+    T *at(int) const;
+
+    T *operator[](int) const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index e79aa61..546ffea 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -37,6 +37,8 @@ public:
     int y() const;
     int left() const;
     int top() const;
+    int right() const;
+    int bottom() const;
     int width() const;
     int height() const;
     bool isNull() const;
@@ -46,6 +48,7 @@ public:
     void setWidth(int);
     void setHeight(int);
     QRect intersect(const QRect &) const;
+    bool intersects(const QRect &) const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index 3084a8c..10f416a 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -27,6 +27,7 @@
 #define QSCROLLVIEW_H_
 
 #include "qframe.h"
+#include "qwidget.h"
 #include "qscrollbar.h"
 
 class QScrollView : public QFrame {
@@ -46,6 +47,11 @@ public:
     QScrollBar *verticalScrollBar() const;
     virtual void setVScrollBarMode(ScrollBarMode);
     virtual void setHScrollBarMode(ScrollBarMode);
+    virtual void addChild(QWidget* child, int x=0, int y=0);
+    void removeChild(QWidget* child);
+    virtual void resizeContents(int w, int h);
+    void updateContents(int x, int y, int w, int h);
+    void repaintContents(int x, int y, int w, int h, bool erase=TRUE);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index fd431a1..49ac0a8 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -60,6 +60,8 @@ public:
     uchar cell() const;
     uchar row() const;
     Direction direction() const;
+    bool mirrored() const;
+    QChar mirroredChar() const;
 
     friend inline int operator==(char, QChar);
     friend inline int operator==(QChar, char);
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index ba27c90..91a27a8 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -28,6 +28,7 @@
 
 #include "qobject.h"
 #include "qpaintdevice.h"
+#include "qpainter.h"
 #include "qpoint.h"
 #include "qsize.h"
 #include "qpalette.h"
@@ -58,7 +59,6 @@ public:
     virtual void resize(int,int);
     void resize(const QSize &);
     QPoint pos() const;
-    virtual void show();
     virtual void move(const QPoint &);
     void move(int, int);
     QWidget *topLevelWidget() const;
@@ -85,6 +85,9 @@ public:
     virtual void setCursor(const QCursor &);
     bool event(QEvent *);
     bool focusNextPrevChild(bool);
+    virtual void show();
+    virtual void hide();
+    bool hasMouseTracking() const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qarray.h b/WebCore/kwq/qt/qarray.h
index f6e3f88..38d27c8 100644
--- a/WebCore/kwq/qt/qarray.h
+++ b/WebCore/kwq/qt/qarray.h
@@ -39,6 +39,7 @@ public:
     uint count() const;
     bool resize(uint size);
     QArray<T>& duplicate(const T*, int);
+    bool fill(const T &d, int size = -1);
     
     T &operator[](int) const;
 };
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index 7ee0284..b72fe27 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -31,6 +31,7 @@ class QString;
 class QColor {
 public:
     QColor();
+    QColor(int,int,int);
     QColor(const char *);
 
     QString name() const;
diff --git a/WebCore/kwq/qt/qdatetime.h b/WebCore/kwq/qt/qdatetime.h
index c670a7c..a20a495 100644
--- a/WebCore/kwq/qt/qdatetime.h
+++ b/WebCore/kwq/qt/qdatetime.h
@@ -32,8 +32,10 @@ public:
     QTime(int h, int m);
     QTime(const QTime &other);
 
+    bool isNull() const;
     void start();
     int msec() const;
+    int elapsed() const;
 };
 
 class QDate {
diff --git a/WebCore/kwq/qt/qfontinfo.h b/WebCore/kwq/qt/qfontinfo.h
index c498abe..8af1145 100644
--- a/WebCore/kwq/qt/qfontinfo.h
+++ b/WebCore/kwq/qt/qfontinfo.h
@@ -26,4 +26,12 @@
 #ifndef QFONTINFO_H_
 #define QFONTINFO_H_
 
+class QFontInfo {
+public:
+    QFontInfo(const QFont &);
+    QFontInfo( const QFontInfo & );
+
+    bool fixedPitch() const;
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qfontmetrics.h b/WebCore/kwq/qt/qfontmetrics.h
index 8a6f2b4..976043c 100644
--- a/WebCore/kwq/qt/qfontmetrics.h
+++ b/WebCore/kwq/qt/qfontmetrics.h
@@ -39,12 +39,15 @@ public:
 
     int ascent() const;
     int height() const;
-    int width() const;
+    int width(QChar) const;
     int width(char) const;
-    int width(QString) const;
+    int width(const QString &, int len = -1) const;
     int descent() const;
+    QRect boundingRect( const QString &, int len = -1 ) const;
     QRect boundingRect(QChar) const;
     QSize size(int flags, const QString& str, int len=-1, int tabstops=0, int *tabarray=0, char **intern=0 ) const;
+    int rightBearing(QChar) const;
+    int leftBearing(QChar) const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qnamespace.h b/WebCore/kwq/qt/qnamespace.h
index a9dd820..5309336 100644
--- a/WebCore/kwq/qt/qnamespace.h
+++ b/WebCore/kwq/qt/qnamespace.h
@@ -41,9 +41,12 @@ public:
     };
 
     enum AlignmentFlags {
+        AlignLeft,
         AlignCenter,
+        AlignRight,
         WordBreak,
         ShowPrefix,
+        DontClip,
     };
 
     enum PenStyle {
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index 044150c..36ac7d1 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -58,6 +58,7 @@ public:
     void killTimer(int);
     void killTimers();
     void installEventFilter(const QObject *);
+    void removeEventFilter(const QObject *);
     void blockSignals(bool);
 };
 
diff --git a/WebCore/kwq/qt/qpainter.h b/WebCore/kwq/qt/qpainter.h
index cfb663a..89fb79e 100644
--- a/WebCore/kwq/qt/qpainter.h
+++ b/WebCore/kwq/qt/qpainter.h
@@ -33,6 +33,7 @@
 #include "qpen.h"
 #include "qregion.h"
 #include "qpoint.h"
+#include "qstring.h"
 #include "qfontmetrics.h"
 
 class QFont;
@@ -48,6 +49,7 @@ public:
     QPainter();
     QPainter(const QPaintDevice *);
     
+    const QFont &font() const;
     void setFont(const QFont &);
     QFontMetrics fontMetrics() const;
     const QPen &pen() const;
@@ -58,6 +60,9 @@ public:
 
     QRect xForm(const QRect &) const;
 
+    void save();
+    void restore();
+    
     void drawRect(int, int, int, int);
     void fillRect(int, int, int, int, const QBrush &);
     void drawLine(int, int, int, int);
@@ -69,7 +74,10 @@ public:
     void drawPixmap(const QPoint &, const QPixmap &);
     void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
     void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
+    void drawText(int x, int y, const QString &, int len = -1);
     void drawText(int, int, int, int, AlignmentFlags, const QString &);
+    void drawText(int, int, int, int, int flags, const QString&, int len = -1, QRect *br=0, char **internal=0);
+
     void setClipping(bool);
     void setClipRegion(const QRegion &);
     const QRegion &clipRegion() const;
diff --git a/WebCore/kwq/qt/qpen.h b/WebCore/kwq/qt/qpen.h
index bc1a666..822e8a4 100644
--- a/WebCore/kwq/qt/qpen.h
+++ b/WebCore/kwq/qt/qpen.h
@@ -27,11 +27,14 @@
 #define QPEN_H_
 
 #include "qnamespace.h"
+#include "qcolor.h"
 
 class QPen : public Qt {
 public:
     QPen();
     QPen(const QColor &color, uint width=0, PenStyle style=SolidLine);
+
+    const QColor &color() const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
index e79aa61..546ffea 100644
--- a/WebCore/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/qrect.h
@@ -37,6 +37,8 @@ public:
     int y() const;
     int left() const;
     int top() const;
+    int right() const;
+    int bottom() const;
     int width() const;
     int height() const;
     bool isNull() const;
@@ -46,6 +48,7 @@ public:
     void setWidth(int);
     void setHeight(int);
     QRect intersect(const QRect &) const;
+    bool intersects(const QRect &) const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
index 3084a8c..10f416a 100644
--- a/WebCore/kwq/qt/qscrollview.h
+++ b/WebCore/kwq/qt/qscrollview.h
@@ -27,6 +27,7 @@
 #define QSCROLLVIEW_H_
 
 #include "qframe.h"
+#include "qwidget.h"
 #include "qscrollbar.h"
 
 class QScrollView : public QFrame {
@@ -46,6 +47,11 @@ public:
     QScrollBar *verticalScrollBar() const;
     virtual void setVScrollBarMode(ScrollBarMode);
     virtual void setHScrollBarMode(ScrollBarMode);
+    virtual void addChild(QWidget* child, int x=0, int y=0);
+    void removeChild(QWidget* child);
+    virtual void resizeContents(int w, int h);
+    void updateContents(int x, int y, int w, int h);
+    void repaintContents(int x, int y, int w, int h, bool erase=TRUE);
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index fd431a1..49ac0a8 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -60,6 +60,8 @@ public:
     uchar cell() const;
     uchar row() const;
     Direction direction() const;
+    bool mirrored() const;
+    QChar mirroredChar() const;
 
     friend inline int operator==(char, QChar);
     friend inline int operator==(QChar, char);
diff --git a/WebCore/kwq/qt/qvector.h b/WebCore/kwq/qt/qvector.h
index fcd1aff..064baae 100644
--- a/WebCore/kwq/qt/qvector.h
+++ b/WebCore/kwq/qt/qvector.h
@@ -31,10 +31,25 @@
 
 typedef void *Item;
 
-template<class T> class QVector : public QCollection {
+class QGVector : public QCollection {
+public:
+    virtual int compareItems(Item, Item);
+};
+
+template<class T> class QVector : public QGVector  {
 public:
     QVector();
     QVector(uint);
+
+    bool isEmpty() const;
+    uint count() const;
+    uint size() const;
+    bool remove(uint);
+    bool resize(uint);
+    bool insert(uint, const T *);
+    T *at(int) const;
+
+    T *operator[](int) const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index ba27c90..91a27a8 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -28,6 +28,7 @@
 
 #include "qobject.h"
 #include "qpaintdevice.h"
+#include "qpainter.h"
 #include "qpoint.h"
 #include "qsize.h"
 #include "qpalette.h"
@@ -58,7 +59,6 @@ public:
     virtual void resize(int,int);
     void resize(const QSize &);
     QPoint pos() const;
-    virtual void show();
     virtual void move(const QPoint &);
     void move(int, int);
     QWidget *topLevelWidget() const;
@@ -85,6 +85,9 @@ public:
     virtual void setCursor(const QCursor &);
     bool event(QEvent *);
     bool focusNextPrevChild(bool);
+    virtual void show();
+    virtual void hide();
+    bool hasMouseTracking() const;
 };
 
 #endif
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple b/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
index 6d2532f..771031f 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
@@ -54,6 +54,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR)/src/kwq/qt \
 	-I$(TOPSRCDIR)/src/kwq/dcop \
 	-I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/src/kwq/kdeui \
 	-I$(TOPSRCDIR)/src/kwq/kio \
 	-I$(TOPSRCDIR)/src/kwq/kparts \
 	-I../dom \
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple b/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
index 30d91c6..1ef72ac 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
@@ -39,6 +39,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR)/src/kwq/qt \
 	-I$(TOPSRCDIR)/src/kwq/dcop \
 	-I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/src/kwq/kdeui \
 	-I$(TOPSRCDIR)/src/kwq/kio \
 	-I$(TOPSRCDIR)/src/kwq/kparts \
 	-I../css \
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
index 8450be7..76f3d6e 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
@@ -53,6 +53,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR)/src/kwq \
 	-I$(TOPSRCDIR)/src/kwq/qt \
 	-I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/src/kwq/kdeui \
 	-I$(TOPSRCDIR)/src/kwq/kio \
 	-I$(TOPSRCDIR)/src/kwq/dcop \
 	-I../dom \
diff --git a/WebCore/khtml/html/Makefile.in.apple b/WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple
similarity index 86%
copy from WebCore/khtml/html/Makefile.in.apple
copy to WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple
index 4eff431..a660a74 100644
--- a/WebCore/khtml/html/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple
@@ -21,7 +21,7 @@ CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
 OBJECTS = $(CXXOBJECTS)
 
-LIBRARY = libkhtmlhtml.a
+LIBRARY = libkhtmlrendering.a
 
 CLEAN_FILES = $(OBJECTS) \
 	$(LIBRARY) \
@@ -32,22 +32,25 @@ CLEAN_FILES = $(OBJECTS) \
 # Set flags for this directory
 
 CXXFLAGS = $(BASECXXFLAGS) \
+        -DNEED_BOGUS_X_DEFINES \
 	-I$(TOPSRCDIR)/src/kwq \
 	-I$(TOPSRCDIR)/src/kwq/qt \
 	-I$(TOPSRCDIR)/src/kwq/dcop \
 	-I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/src/kwq/kfile \
 	-I$(TOPSRCDIR)/src/kwq/kio \
 	-I$(TOPSRCDIR)/src/kwq/kdeui \
 	-I$(TOPSRCDIR)/src/kwq/kparts \
 	-I../../kdecore \
 	-I../../kjs \
-	-I.. \
+	-I../html \
+	-I../java \
 	-I../misc \
 	-I../css \
 	-I../dom \
 	-I../xml \
-	-I../rendering \
 	-I. \
+	-I.. \
 	-I$(TOPSRCDIR) \
 	$(NULL)
 
@@ -65,12 +68,16 @@ depend: Makefile.dep
 Makefile.dep: $(SOURCES) $(HEADERS)
 	$(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
 
-htmltokenizer.cpp: htmltokenizer.moc
-htmltokenizer.moc:
+render_form.cpp: render_form.moc
+render_form.moc:
+	touch $@
+
+render_frames.cpp: render_frames.moc
+render_frames.moc:
 	touch $@
 
-html_documentimpl.cpp: html_documentimpl.moc
-html_documentimpl.moc:
+render_replaced.cpp: render_replaced.moc
+render_replaced.moc:
 	touch $@
 
 #----------------------------------------------------------------------
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
index 2d06b3a..8be561b 100644
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
@@ -53,6 +53,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
     -I$(TOPSRCDIR)/src/kwq \
     -I$(TOPSRCDIR)/src/kwq/qt \
     -I$(TOPSRCDIR)/src/kwq/kdecore \
+    -I$(TOPSRCDIR)/src/kwq/kdeui \
     -I../css \
     -I../dom \
     -I../html \
diff --git a/WebCore/src/kwq/qt/qarray.h b/WebCore/src/kwq/qt/qarray.h
index f6e3f88..38d27c8 100644
--- a/WebCore/src/kwq/qt/qarray.h
+++ b/WebCore/src/kwq/qt/qarray.h
@@ -39,6 +39,7 @@ public:
     uint count() const;
     bool resize(uint size);
     QArray<T>& duplicate(const T*, int);
+    bool fill(const T &d, int size = -1);
     
     T &operator[](int) const;
 };
diff --git a/WebCore/src/kwq/qt/qcolor.h b/WebCore/src/kwq/qt/qcolor.h
index 7ee0284..b72fe27 100644
--- a/WebCore/src/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/qt/qcolor.h
@@ -31,6 +31,7 @@ class QString;
 class QColor {
 public:
     QColor();
+    QColor(int,int,int);
     QColor(const char *);
 
     QString name() const;
diff --git a/WebCore/src/kwq/qt/qdatetime.h b/WebCore/src/kwq/qt/qdatetime.h
index c670a7c..a20a495 100644
--- a/WebCore/src/kwq/qt/qdatetime.h
+++ b/WebCore/src/kwq/qt/qdatetime.h
@@ -32,8 +32,10 @@ public:
     QTime(int h, int m);
     QTime(const QTime &other);
 
+    bool isNull() const;
     void start();
     int msec() const;
+    int elapsed() const;
 };
 
 class QDate {
diff --git a/WebCore/src/kwq/qt/qfontinfo.h b/WebCore/src/kwq/qt/qfontinfo.h
index c498abe..8af1145 100644
--- a/WebCore/src/kwq/qt/qfontinfo.h
+++ b/WebCore/src/kwq/qt/qfontinfo.h
@@ -26,4 +26,12 @@
 #ifndef QFONTINFO_H_
 #define QFONTINFO_H_
 
+class QFontInfo {
+public:
+    QFontInfo(const QFont &);
+    QFontInfo( const QFontInfo & );
+
+    bool fixedPitch() const;
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qfontmetrics.h b/WebCore/src/kwq/qt/qfontmetrics.h
index 8a6f2b4..976043c 100644
--- a/WebCore/src/kwq/qt/qfontmetrics.h
+++ b/WebCore/src/kwq/qt/qfontmetrics.h
@@ -39,12 +39,15 @@ public:
 
     int ascent() const;
     int height() const;
-    int width() const;
+    int width(QChar) const;
     int width(char) const;
-    int width(QString) const;
+    int width(const QString &, int len = -1) const;
     int descent() const;
+    QRect boundingRect( const QString &, int len = -1 ) const;
     QRect boundingRect(QChar) const;
     QSize size(int flags, const QString& str, int len=-1, int tabstops=0, int *tabarray=0, char **intern=0 ) const;
+    int rightBearing(QChar) const;
+    int leftBearing(QChar) const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qnamespace.h b/WebCore/src/kwq/qt/qnamespace.h
index a9dd820..5309336 100644
--- a/WebCore/src/kwq/qt/qnamespace.h
+++ b/WebCore/src/kwq/qt/qnamespace.h
@@ -41,9 +41,12 @@ public:
     };
 
     enum AlignmentFlags {
+        AlignLeft,
         AlignCenter,
+        AlignRight,
         WordBreak,
         ShowPrefix,
+        DontClip,
     };
 
     enum PenStyle {
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index 044150c..36ac7d1 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -58,6 +58,7 @@ public:
     void killTimer(int);
     void killTimers();
     void installEventFilter(const QObject *);
+    void removeEventFilter(const QObject *);
     void blockSignals(bool);
 };
 
diff --git a/WebCore/src/kwq/qt/qpainter.h b/WebCore/src/kwq/qt/qpainter.h
index cfb663a..89fb79e 100644
--- a/WebCore/src/kwq/qt/qpainter.h
+++ b/WebCore/src/kwq/qt/qpainter.h
@@ -33,6 +33,7 @@
 #include "qpen.h"
 #include "qregion.h"
 #include "qpoint.h"
+#include "qstring.h"
 #include "qfontmetrics.h"
 
 class QFont;
@@ -48,6 +49,7 @@ public:
     QPainter();
     QPainter(const QPaintDevice *);
     
+    const QFont &font() const;
     void setFont(const QFont &);
     QFontMetrics fontMetrics() const;
     const QPen &pen() const;
@@ -58,6 +60,9 @@ public:
 
     QRect xForm(const QRect &) const;
 
+    void save();
+    void restore();
+    
     void drawRect(int, int, int, int);
     void fillRect(int, int, int, int, const QBrush &);
     void drawLine(int, int, int, int);
@@ -69,7 +74,10 @@ public:
     void drawPixmap(const QPoint &, const QPixmap &);
     void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
     void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
+    void drawText(int x, int y, const QString &, int len = -1);
     void drawText(int, int, int, int, AlignmentFlags, const QString &);
+    void drawText(int, int, int, int, int flags, const QString&, int len = -1, QRect *br=0, char **internal=0);
+
     void setClipping(bool);
     void setClipRegion(const QRegion &);
     const QRegion &clipRegion() const;
diff --git a/WebCore/src/kwq/qt/qpen.h b/WebCore/src/kwq/qt/qpen.h
index bc1a666..822e8a4 100644
--- a/WebCore/src/kwq/qt/qpen.h
+++ b/WebCore/src/kwq/qt/qpen.h
@@ -27,11 +27,14 @@
 #define QPEN_H_
 
 #include "qnamespace.h"
+#include "qcolor.h"
 
 class QPen : public Qt {
 public:
     QPen();
     QPen(const QColor &color, uint width=0, PenStyle style=SolidLine);
+
+    const QColor &color() const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/qrect.h
index e79aa61..546ffea 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/qrect.h
@@ -37,6 +37,8 @@ public:
     int y() const;
     int left() const;
     int top() const;
+    int right() const;
+    int bottom() const;
     int width() const;
     int height() const;
     bool isNull() const;
@@ -46,6 +48,7 @@ public:
     void setWidth(int);
     void setHeight(int);
     QRect intersect(const QRect &) const;
+    bool intersects(const QRect &) const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qscrollview.h b/WebCore/src/kwq/qt/qscrollview.h
index 3084a8c..10f416a 100644
--- a/WebCore/src/kwq/qt/qscrollview.h
+++ b/WebCore/src/kwq/qt/qscrollview.h
@@ -27,6 +27,7 @@
 #define QSCROLLVIEW_H_
 
 #include "qframe.h"
+#include "qwidget.h"
 #include "qscrollbar.h"
 
 class QScrollView : public QFrame {
@@ -46,6 +47,11 @@ public:
     QScrollBar *verticalScrollBar() const;
     virtual void setVScrollBarMode(ScrollBarMode);
     virtual void setHScrollBarMode(ScrollBarMode);
+    virtual void addChild(QWidget* child, int x=0, int y=0);
+    void removeChild(QWidget* child);
+    virtual void resizeContents(int w, int h);
+    void updateContents(int x, int y, int w, int h);
+    void repaintContents(int x, int y, int w, int h, bool erase=TRUE);
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index fd431a1..49ac0a8 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -60,6 +60,8 @@ public:
     uchar cell() const;
     uchar row() const;
     Direction direction() const;
+    bool mirrored() const;
+    QChar mirroredChar() const;
 
     friend inline int operator==(char, QChar);
     friend inline int operator==(QChar, char);
diff --git a/WebCore/src/kwq/qt/qvector.h b/WebCore/src/kwq/qt/qvector.h
index fcd1aff..064baae 100644
--- a/WebCore/src/kwq/qt/qvector.h
+++ b/WebCore/src/kwq/qt/qvector.h
@@ -31,10 +31,25 @@
 
 typedef void *Item;
 
-template<class T> class QVector : public QCollection {
+class QGVector : public QCollection {
+public:
+    virtual int compareItems(Item, Item);
+};
+
+template<class T> class QVector : public QGVector  {
 public:
     QVector();
     QVector(uint);
+
+    bool isEmpty() const;
+    uint count() const;
+    uint size() const;
+    bool remove(uint);
+    bool resize(uint);
+    bool insert(uint, const T *);
+    T *at(int) const;
+
+    T *operator[](int) const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index ba27c90..91a27a8 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -28,6 +28,7 @@
 
 #include "qobject.h"
 #include "qpaintdevice.h"
+#include "qpainter.h"
 #include "qpoint.h"
 #include "qsize.h"
 #include "qpalette.h"
@@ -58,7 +59,6 @@ public:
     virtual void resize(int,int);
     void resize(const QSize &);
     QPoint pos() const;
-    virtual void show();
     virtual void move(const QPoint &);
     void move(int, int);
     QWidget *topLevelWidget() const;
@@ -85,6 +85,9 @@ public:
     virtual void setCursor(const QCursor &);
     bool event(QEvent *);
     bool focusNextPrevChild(bool);
+    virtual void show();
+    virtual void hide();
+    bool hasMouseTracking() const;
 };
 
 #endif

-- 
WebKit Debian packaging

