[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.1.3-3-353-gcc96c89

Mike Hommey glandium at debian.org
Tue Mar 31 06:00:03 UTC 2009 

The following commit has been merged in the debian/experimental branch:
commit 898228c05ea158596100d24547e112c10ed8ddd5
Merge: e2326148518ee78bf81af30f3fe7a5ecad76b2b5 e84e6281f7a27620d620e392f4ed1ad6ba6b76d8
Author: Mike Hommey <glandium at debian.org>
Date:   Tue Mar 31 07:57:29 2009 +0200

    Merge branch 'webkit-1.1' into debian/experimental

diff --combined GNUmakefile.in
index 2baa017,8008136..5b5b3d0
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@@ -67,7 -67,7 +67,7 @@@ target_triplet = @target
  bin_PROGRAMS = Programs/jsc$(EXEEXT)
  noinst_PROGRAMS = Programs/minidom$(EXEEXT) \
  	Programs/GtkLauncher$(EXEEXT) Programs/DumpRenderTree$(EXEEXT) \
- 	Programs/UnitTests$(EXEEXT)
+ 	$(am__EXEEXT_1)
  @ENABLE_DEBUG_FALSE at am__append_1 = \
  @ENABLE_DEBUG_FALSE@	$(SYMBOL_VISIBILITY)
  
@@@ -1457,7 -1457,6 +1457,7 @@@ am__libJavaScriptCore_la_SOURCES_DIST 
  	JavaScriptCore/assembler/AssemblerBuffer.h \
  	JavaScriptCore/assembler/MacroAssembler.h \
  	JavaScriptCore/assembler/MacroAssemblerX86.h \
 +	JavaScriptCore/assembler/MacroAssemblerX86_64.h \
  	JavaScriptCore/assembler/MacroAssemblerX86Common.h \
  	JavaScriptCore/os-win32/stdbool.h \
  	JavaScriptCore/os-win32/stdint.h JavaScriptCore/pcre/pcre.h \
@@@ -1967,6 -1966,8 +1967,8 @@@ am__libWebCore_la_SOURCES_DIST = WebCor
  	WebCore/bindings/js/JSInspectorCallbackWrapper.h \
  	WebCore/bindings/js/JSInspectorControllerCustom.cpp \
  	WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp \
+ 	WebCore/bindings/js/JSLazyEventListener.cpp \
+ 	WebCore/bindings/js/JSLazyEventListener.h \
  	WebCore/bindings/js/JSLocationCustom.cpp \
  	WebCore/bindings/js/JSLocationCustom.h \
  	WebCore/bindings/js/JSMessageChannelConstructor.cpp \
@@@ -2151,6 -2152,8 +2153,8 @@@
  	WebCore/dom/CSSMappedAttributeDeclaration.cpp \
  	WebCore/dom/CSSMappedAttributeDeclaration.h \
  	WebCore/dom/CharacterData.cpp WebCore/dom/CharacterData.h \
+ 	WebCore/dom/CheckedRadioButtons.cpp \
+ 	WebCore/dom/CheckedRadioButtons.h \
  	WebCore/dom/ChildNodeList.cpp WebCore/dom/ChildNodeList.h \
  	WebCore/dom/ClassNames.cpp WebCore/dom/ClassNames.h \
  	WebCore/dom/ClassNodeList.cpp WebCore/dom/ClassNodeList.h \
@@@ -2910,6 -2913,8 +2914,8 @@@
  	WebCore/platform/text/TextDirection.h \
  	WebCore/platform/text/TextEncoding.cpp \
  	WebCore/platform/text/TextEncoding.h \
+ 	WebCore/platform/text/TextEncodingDetector.h \
+ 	WebCore/platform/text/TextEncodingDetectorNone.cpp \
  	WebCore/platform/text/TextEncodingRegistry.cpp \
  	WebCore/platform/text/TextEncodingRegistry.h \
  	WebCore/platform/text/TextStream.cpp \
@@@ -4138,6 -4143,7 +4144,7 @@@ am__objects_17 = WebCore/bindings/js/li
  	WebCore/bindings/js/libWebCore_la-JSInspectorCallbackWrapper.lo \
  	WebCore/bindings/js/libWebCore_la-JSInspectorControllerCustom.lo \
  	WebCore/bindings/js/libWebCore_la-JSJavaScriptCallFrameCustom.lo \
+ 	WebCore/bindings/js/libWebCore_la-JSLazyEventListener.lo \
  	WebCore/bindings/js/libWebCore_la-JSLocationCustom.lo \
  	WebCore/bindings/js/libWebCore_la-JSMessageChannelConstructor.lo \
  	WebCore/bindings/js/libWebCore_la-JSMessageChannelCustom.lo \
@@@ -4255,6 -4261,7 +4262,7 @@@
  	WebCore/dom/libWebCore_la-CDATASection.lo \
  	WebCore/dom/libWebCore_la-CSSMappedAttributeDeclaration.lo \
  	WebCore/dom/libWebCore_la-CharacterData.lo \
+ 	WebCore/dom/libWebCore_la-CheckedRadioButtons.lo \
  	WebCore/dom/libWebCore_la-ChildNodeList.lo \
  	WebCore/dom/libWebCore_la-ClassNames.lo \
  	WebCore/dom/libWebCore_la-ClassNodeList.lo \
@@@ -4647,6 -4654,7 +4655,7 @@@
  	WebCore/platform/text/libWebCore_la-TextCodecUTF16.lo \
  	WebCore/platform/text/libWebCore_la-TextCodecUserDefined.lo \
  	WebCore/platform/text/libWebCore_la-TextEncoding.lo \
+ 	WebCore/platform/text/libWebCore_la-TextEncodingDetectorNone.lo \
  	WebCore/platform/text/libWebCore_la-TextEncodingRegistry.lo \
  	WebCore/platform/text/libWebCore_la-TextStream.lo \
  	WebCore/platform/text/libWebCore_la-UnicodeRange.lo \
@@@ -4898,6 -4906,9 +4907,9 @@@ libwebkit_1_0_la_LINK = $(LIBTOOL) --ta
  	$(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) \
  	$(libwebkit_1_0_la_LDFLAGS) $(LDFLAGS) -o $@
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ am__EXEEXT_1 = Programs/unittests/testwebframe$(EXEEXT) \
+ 	Programs/unittests/testwebbackforwardlist$(EXEEXT) \
+ 	Programs/unittests/testwebhistoryitem$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
  am_Programs_DumpRenderTree_OBJECTS = WebKitTools/DumpRenderTree/Programs_DumpRenderTree-GCController.$(OBJEXT) \
  	WebKitTools/DumpRenderTree/Programs_DumpRenderTree-LayoutTestController.$(OBJEXT) \
@@@ -4923,15 -4934,6 +4935,6 @@@ Programs_GtkLauncher_LINK = $(LIBTOOL) 
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(Programs_GtkLauncher_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
  	$(LDFLAGS) -o $@
- am_Programs_UnitTests_OBJECTS =  \
- 	WebKit/gtk/tests/Programs_UnitTests-main.$(OBJEXT)
- Programs_UnitTests_OBJECTS = $(am_Programs_UnitTests_OBJECTS)
- Programs_UnitTests_DEPENDENCIES = libwebkit-1.0.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- Programs_UnitTests_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(Programs_UnitTests_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
  am_Programs_jsc_OBJECTS = JavaScriptCore/Programs_jsc-jsc.$(OBJEXT)
  Programs_jsc_OBJECTS = $(am_Programs_jsc_OBJECTS)
  Programs_jsc_DEPENDENCIES = libJavaScriptCore.la
@@@ -4949,6 -4951,34 +4952,34 @@@ Programs_minidom_DEPENDENCIES = libJava
  Programs_minidom_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(Programs_minidom_CFLAGS) \
  	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ am_Programs_unittests_testwebbackforwardlist_OBJECTS = WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.$(OBJEXT)
+ Programs_unittests_testwebbackforwardlist_OBJECTS =  \
+ 	$(am_Programs_unittests_testwebbackforwardlist_OBJECTS)
+ am__DEPENDENCIES_3 = libwebkit-1.0.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ Programs_unittests_testwebbackforwardlist_DEPENDENCIES =  \
+ 	$(am__DEPENDENCIES_3)
+ Programs_unittests_testwebbackforwardlist_LINK = $(LIBTOOL) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(Programs_unittests_testwebbackforwardlist_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ am_Programs_unittests_testwebframe_OBJECTS = WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.$(OBJEXT)
+ Programs_unittests_testwebframe_OBJECTS =  \
+ 	$(am_Programs_unittests_testwebframe_OBJECTS)
+ Programs_unittests_testwebframe_DEPENDENCIES = $(am__DEPENDENCIES_3)
+ Programs_unittests_testwebframe_LINK = $(LIBTOOL) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(Programs_unittests_testwebframe_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ am_Programs_unittests_testwebhistoryitem_OBJECTS = WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.$(OBJEXT)
+ Programs_unittests_testwebhistoryitem_OBJECTS =  \
+ 	$(am_Programs_unittests_testwebhistoryitem_OBJECTS)
+ Programs_unittests_testwebhistoryitem_DEPENDENCIES =  \
+ 	$(am__DEPENDENCIES_3)
+ Programs_unittests_testwebhistoryitem_LINK = $(LIBTOOL) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(Programs_unittests_testwebhistoryitem_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DEFAULT_INCLUDES = -I. at am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
  am__depfiles_maybe = depfiles
@@@ -4972,14 -5002,20 +5003,20 @@@ SOURCES = $(TestNetscapePlugin_libtestn
  	$(nodist_EXTRA_libWebCore_la_SOURCES) \
  	$(libwebkit_1_0_la_SOURCES) $(nodist_libwebkit_1_0_la_SOURCES) \
  	$(Programs_DumpRenderTree_SOURCES) \
- 	$(Programs_GtkLauncher_SOURCES) $(Programs_UnitTests_SOURCES) \
- 	$(Programs_jsc_SOURCES) $(Programs_minidom_SOURCES)
+ 	$(Programs_GtkLauncher_SOURCES) $(Programs_jsc_SOURCES) \
+ 	$(Programs_minidom_SOURCES) \
+ 	$(Programs_unittests_testwebbackforwardlist_SOURCES) \
+ 	$(Programs_unittests_testwebframe_SOURCES) \
+ 	$(Programs_unittests_testwebhistoryitem_SOURCES)
  DIST_SOURCES = $(am__TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES_DIST) \
  	$(am__libJavaScriptCore_la_SOURCES_DIST) \
  	$(am__libWebCore_la_SOURCES_DIST) $(libwebkit_1_0_la_SOURCES) \
  	$(Programs_DumpRenderTree_SOURCES) \
- 	$(Programs_GtkLauncher_SOURCES) $(Programs_UnitTests_SOURCES) \
- 	$(Programs_jsc_SOURCES) $(Programs_minidom_SOURCES)
+ 	$(Programs_GtkLauncher_SOURCES) $(Programs_jsc_SOURCES) \
+ 	$(Programs_minidom_SOURCES) \
+ 	$(Programs_unittests_testwebbackforwardlist_SOURCES) \
+ 	$(Programs_unittests_testwebframe_SOURCES) \
+ 	$(Programs_unittests_testwebhistoryitem_SOURCES)
  dist_webinspectorDATA_INSTALL = $(INSTALL_DATA)
  dist_webinspectorimagesDATA_INSTALL = $(INSTALL_DATA)
  pkgconfigDATA_INSTALL = $(INSTALL_DATA)
@@@ -5560,6 -5596,9 +5597,9 @@@ IDL_BINDINGS := WebCore/css/CSSCharsetR
  	WebCore/xml/XMLSerializer.idl WebCore/xml/XSLTProcessor.idl \
  	$(am__append_21) $(am__append_27) $(am__append_31) \
  	$(am__append_41) $(am__append_47) $(am__append_68)
+ TEST_PROGS := Programs/unittests/testwebframe \
+ 	Programs/unittests/testwebbackforwardlist \
+ 	Programs/unittests/testwebhistoryitem
  
  # Global flags to CPP
  
@@@ -5720,7 -5759,6 +5760,7 @@@ javascriptcore_sources := JavaScriptCor
  	JavaScriptCore/assembler/AssemblerBuffer.h \
  	JavaScriptCore/assembler/MacroAssembler.h \
  	JavaScriptCore/assembler/MacroAssemblerX86.h \
 +	JavaScriptCore/assembler/MacroAssemblerX86_64.h \
  	JavaScriptCore/assembler/MacroAssemblerX86Common.h \
  	JavaScriptCore/os-win32/stdbool.h \
  	JavaScriptCore/os-win32/stdint.h JavaScriptCore/pcre/pcre.h \
@@@ -6003,6 -6041,8 +6043,8 @@@ webcore_sources := WebCore/WebCorePrefi
  	WebCore/bindings/js/JSInspectorCallbackWrapper.h \
  	WebCore/bindings/js/JSInspectorControllerCustom.cpp \
  	WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp \
+ 	WebCore/bindings/js/JSLazyEventListener.cpp \
+ 	WebCore/bindings/js/JSLazyEventListener.h \
  	WebCore/bindings/js/JSLocationCustom.cpp \
  	WebCore/bindings/js/JSLocationCustom.h \
  	WebCore/bindings/js/JSMessageChannelConstructor.cpp \
@@@ -6187,6 -6227,8 +6229,8 @@@
  	WebCore/dom/CSSMappedAttributeDeclaration.cpp \
  	WebCore/dom/CSSMappedAttributeDeclaration.h \
  	WebCore/dom/CharacterData.cpp WebCore/dom/CharacterData.h \
+ 	WebCore/dom/CheckedRadioButtons.cpp \
+ 	WebCore/dom/CheckedRadioButtons.h \
  	WebCore/dom/ChildNodeList.cpp WebCore/dom/ChildNodeList.h \
  	WebCore/dom/ClassNames.cpp WebCore/dom/ClassNames.h \
  	WebCore/dom/ClassNodeList.cpp WebCore/dom/ClassNodeList.h \
@@@ -6946,6 -6988,8 +6990,8 @@@
  	WebCore/platform/text/TextDirection.h \
  	WebCore/platform/text/TextEncoding.cpp \
  	WebCore/platform/text/TextEncoding.h \
+ 	WebCore/platform/text/TextEncodingDetector.h \
+ 	WebCore/platform/text/TextEncodingDetectorNone.cpp \
  	WebCore/platform/text/TextEncodingRegistry.cpp \
  	WebCore/platform/text/TextEncodingRegistry.h \
  	WebCore/platform/text/TextStream.cpp \
@@@ -7750,29 -7794,35 +7796,35 @@@ Programs_DumpRenderTree_LDADD = 
  @TARGET_X11_TRUE@	-avoid-version \
  @TARGET_X11_TRUE@	-module
  
- Programs_UnitTests_CPPFLAGS = \
- 	-I$(srcdir)/WebKit/gtk \
- 	-I$(top_builddir)/WebKit/gtk \
- 	$(global_cppflags) \
- 	$(javascriptcore_cppflags)
- 
- Programs_UnitTests_SOURCES = \
- 	WebKit/gtk/tests/main.c
- 
- Programs_UnitTests_CFLAGS = \
+ webkit_tests_cflags = \
  	-fno-strict-aliasing \
  	-O2 \
+ 	-I$(srcdir)/JavaScriptCore/ForwardingHeaders \
+ 	-I$(srcdir)/WebKit/gtk \
+ 	-I$(top_builddir)/WebKit/gtk \
  	$(global_cflags) \
  	$(GLIB_CFLAGS) \
  	$(GTK_CFLAGS) \
  	$(LIBSOUP_CFLAGS)
  
- Programs_UnitTests_LDADD = \
+ webkit_tests_ldadd = \
  	libwebkit-1.0.la \
  	$(GTK_LIBS)	\
- 	$(GLIB_LIBS)
+ 	$(GLIB_LIBS) \
+ 	$(LIBSOUP_LIBS)
  
  
+ # Add additional tests here
+ Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
+ Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
+ Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
+ Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c
+ Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
+ Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
+ Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c
+ Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
+ Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
+ 
  # Autogenerated sources
  BUILT_SOURCES := \
  	$(javascriptcore_built_sources) \
@@@ -8612,6 -8662,9 +8664,9 @@@ WebCore/bindings/js/libWebCore_la-JSIns
  WebCore/bindings/js/libWebCore_la-JSJavaScriptCallFrameCustom.lo:  \
  	WebCore/bindings/js/$(am__dirstamp) \
  	WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
+ WebCore/bindings/js/libWebCore_la-JSLazyEventListener.lo:  \
+ 	WebCore/bindings/js/$(am__dirstamp) \
+ 	WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
  WebCore/bindings/js/libWebCore_la-JSLocationCustom.lo:  \
  	WebCore/bindings/js/$(am__dirstamp) \
  	WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
@@@ -8970,6 -9023,9 +9025,9 @@@ WebCore/dom/libWebCore_la-CSSMappedAttr
  WebCore/dom/libWebCore_la-CharacterData.lo:  \
  	WebCore/dom/$(am__dirstamp) \
  	WebCore/dom/$(DEPDIR)/$(am__dirstamp)
+ WebCore/dom/libWebCore_la-CheckedRadioButtons.lo:  \
+ 	WebCore/dom/$(am__dirstamp) \
+ 	WebCore/dom/$(DEPDIR)/$(am__dirstamp)
  WebCore/dom/libWebCore_la-ChildNodeList.lo:  \
  	WebCore/dom/$(am__dirstamp) \
  	WebCore/dom/$(DEPDIR)/$(am__dirstamp)
@@@ -10192,6 -10248,9 +10250,9 @@@ WebCore/platform/text/libWebCore_la-Tex
  WebCore/platform/text/libWebCore_la-TextEncoding.lo:  \
  	WebCore/platform/text/$(am__dirstamp) \
  	WebCore/platform/text/$(DEPDIR)/$(am__dirstamp)
+ WebCore/platform/text/libWebCore_la-TextEncodingDetectorNone.lo:  \
+ 	WebCore/platform/text/$(am__dirstamp) \
+ 	WebCore/platform/text/$(DEPDIR)/$(am__dirstamp)
  WebCore/platform/text/libWebCore_la-TextEncodingRegistry.lo:  \
  	WebCore/platform/text/$(am__dirstamp) \
  	WebCore/platform/text/$(DEPDIR)/$(am__dirstamp)
@@@ -12093,18 -12152,6 +12154,6 @@@ WebKitTools/GtkLauncher/Programs_GtkLau
  Programs/GtkLauncher$(EXEEXT): $(Programs_GtkLauncher_OBJECTS) $(Programs_GtkLauncher_DEPENDENCIES) Programs/$(am__dirstamp)
  	@rm -f Programs/GtkLauncher$(EXEEXT)
  	$(Programs_GtkLauncher_LINK) $(Programs_GtkLauncher_OBJECTS) $(Programs_GtkLauncher_LDADD) $(LIBS)
- WebKit/gtk/tests/$(am__dirstamp):
- 	@$(MKDIR_P) WebKit/gtk/tests
- 	@: > WebKit/gtk/tests/$(am__dirstamp)
- WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp):
- 	@$(MKDIR_P) WebKit/gtk/tests/$(DEPDIR)
- 	@: > WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp)
- WebKit/gtk/tests/Programs_UnitTests-main.$(OBJEXT):  \
- 	WebKit/gtk/tests/$(am__dirstamp) \
- 	WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp)
- Programs/UnitTests$(EXEEXT): $(Programs_UnitTests_OBJECTS) $(Programs_UnitTests_DEPENDENCIES) Programs/$(am__dirstamp)
- 	@rm -f Programs/UnitTests$(EXEEXT)
- 	$(Programs_UnitTests_LINK) $(Programs_UnitTests_OBJECTS) $(Programs_UnitTests_LDADD) $(LIBS)
  JavaScriptCore/Programs_jsc-jsc.$(OBJEXT):  \
  	JavaScriptCore/$(am__dirstamp) \
  	JavaScriptCore/$(DEPDIR)/$(am__dirstamp)
@@@ -12135,6 -12182,33 +12184,33 @@@ JavaScriptCore/API/tests/Programs_minid
  Programs/minidom$(EXEEXT): $(Programs_minidom_OBJECTS) $(Programs_minidom_DEPENDENCIES) Programs/$(am__dirstamp)
  	@rm -f Programs/minidom$(EXEEXT)
  	$(Programs_minidom_LINK) $(Programs_minidom_OBJECTS) $(Programs_minidom_LDADD) $(LIBS)
+ WebKit/gtk/tests/$(am__dirstamp):
+ 	@$(MKDIR_P) WebKit/gtk/tests
+ 	@: > WebKit/gtk/tests/$(am__dirstamp)
+ WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp):
+ 	@$(MKDIR_P) WebKit/gtk/tests/$(DEPDIR)
+ 	@: > WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp)
+ WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.$(OBJEXT):  \
+ 	WebKit/gtk/tests/$(am__dirstamp) \
+ 	WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp)
+ Programs/unittests/$(am__dirstamp):
+ 	@$(MKDIR_P) Programs/unittests
+ 	@: > Programs/unittests/$(am__dirstamp)
+ Programs/unittests/testwebbackforwardlist$(EXEEXT): $(Programs_unittests_testwebbackforwardlist_OBJECTS) $(Programs_unittests_testwebbackforwardlist_DEPENDENCIES) Programs/unittests/$(am__dirstamp)
+ 	@rm -f Programs/unittests/testwebbackforwardlist$(EXEEXT)
+ 	$(Programs_unittests_testwebbackforwardlist_LINK) $(Programs_unittests_testwebbackforwardlist_OBJECTS) $(Programs_unittests_testwebbackforwardlist_LDADD) $(LIBS)
+ WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.$(OBJEXT):  \
+ 	WebKit/gtk/tests/$(am__dirstamp) \
+ 	WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp)
+ Programs/unittests/testwebframe$(EXEEXT): $(Programs_unittests_testwebframe_OBJECTS) $(Programs_unittests_testwebframe_DEPENDENCIES) Programs/unittests/$(am__dirstamp)
+ 	@rm -f Programs/unittests/testwebframe$(EXEEXT)
+ 	$(Programs_unittests_testwebframe_LINK) $(Programs_unittests_testwebframe_OBJECTS) $(Programs_unittests_testwebframe_LDADD) $(LIBS)
+ WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.$(OBJEXT):  \
+ 	WebKit/gtk/tests/$(am__dirstamp) \
+ 	WebKit/gtk/tests/$(DEPDIR)/$(am__dirstamp)
+ Programs/unittests/testwebhistoryitem$(EXEEXT): $(Programs_unittests_testwebhistoryitem_OBJECTS) $(Programs_unittests_testwebhistoryitem_DEPENDENCIES) Programs/unittests/$(am__dirstamp)
+ 	@rm -f Programs/unittests/testwebhistoryitem$(EXEEXT)
+ 	$(Programs_unittests_testwebhistoryitem_LINK) $(Programs_unittests_testwebhistoryitem_OBJECTS) $(Programs_unittests_testwebhistoryitem_LDADD) $(LIBS)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
@@@ -12578,6 -12652,8 +12654,8 @@@
  	-rm -f WebCore/bindings/js/libWebCore_la-JSInspectorControllerCustom.lo
  	-rm -f WebCore/bindings/js/libWebCore_la-JSJavaScriptCallFrameCustom.$(OBJEXT)
  	-rm -f WebCore/bindings/js/libWebCore_la-JSJavaScriptCallFrameCustom.lo
+ 	-rm -f WebCore/bindings/js/libWebCore_la-JSLazyEventListener.$(OBJEXT)
+ 	-rm -f WebCore/bindings/js/libWebCore_la-JSLazyEventListener.lo
  	-rm -f WebCore/bindings/js/libWebCore_la-JSLocationCustom.$(OBJEXT)
  	-rm -f WebCore/bindings/js/libWebCore_la-JSLocationCustom.lo
  	-rm -f WebCore/bindings/js/libWebCore_la-JSMessageChannelConstructor.$(OBJEXT)
@@@ -12850,6 -12926,8 +12928,8 @@@
  	-rm -f WebCore/dom/libWebCore_la-CSSMappedAttributeDeclaration.lo
  	-rm -f WebCore/dom/libWebCore_la-CharacterData.$(OBJEXT)
  	-rm -f WebCore/dom/libWebCore_la-CharacterData.lo
+ 	-rm -f WebCore/dom/libWebCore_la-CheckedRadioButtons.$(OBJEXT)
+ 	-rm -f WebCore/dom/libWebCore_la-CheckedRadioButtons.lo
  	-rm -f WebCore/dom/libWebCore_la-ChildNodeList.$(OBJEXT)
  	-rm -f WebCore/dom/libWebCore_la-ChildNodeList.lo
  	-rm -f WebCore/dom/libWebCore_la-ClassNames.$(OBJEXT)
@@@ -13838,6 -13916,8 +13918,8 @@@
  	-rm -f WebCore/platform/text/libWebCore_la-TextCodecUserDefined.lo
  	-rm -f WebCore/platform/text/libWebCore_la-TextEncoding.$(OBJEXT)
  	-rm -f WebCore/platform/text/libWebCore_la-TextEncoding.lo
+ 	-rm -f WebCore/platform/text/libWebCore_la-TextEncodingDetectorNone.$(OBJEXT)
+ 	-rm -f WebCore/platform/text/libWebCore_la-TextEncodingDetectorNone.lo
  	-rm -f WebCore/platform/text/libWebCore_la-TextEncodingRegistry.$(OBJEXT)
  	-rm -f WebCore/platform/text/libWebCore_la-TextEncodingRegistry.lo
  	-rm -f WebCore/platform/text/libWebCore_la-TextStream.$(OBJEXT)
@@@ -14620,7 -14700,9 +14702,9 @@@
  	-rm -f WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-InspectorClientGtk.lo
  	-rm -f WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-PasteboardHelperGtk.$(OBJEXT)
  	-rm -f WebKit/gtk/WebCoreSupport/libwebkit_1_0_la-PasteboardHelperGtk.lo
- 	-rm -f WebKit/gtk/tests/Programs_UnitTests-main.$(OBJEXT)
+ 	-rm -f WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.$(OBJEXT)
+ 	-rm -f WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.$(OBJEXT)
+ 	-rm -f WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.$(OBJEXT)
  	-rm -f WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.$(OBJEXT)
  	-rm -f WebKit/gtk/webkit/libwebkit_1_0_la-webkitdownload.lo
  	-rm -f WebKit/gtk/webkit/libwebkit_1_0_la-webkitnetworkrequest.$(OBJEXT)
@@@ -14890,6 -14972,7 +14974,7 @@@ distclean-compile
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSInspectorCallbackWrapper.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSInspectorControllerCustom.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSJavaScriptCallFrameCustom.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSLazyEventListener.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSLocationCustom.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSMessageChannelConstructor.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSMessageChannelCustom.Plo at am__quote@
@@@ -15026,6 -15109,7 +15111,7 @@@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-CDATASection.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-CSSMappedAttributeDeclaration.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-CharacterData.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-CheckedRadioButtons.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-ChildNodeList.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-ClassNames.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/dom/$(DEPDIR)/libWebCore_la-ClassNodeList.Plo at am__quote@
@@@ -15519,6 -15603,7 +15605,7 @@@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextCodecUTF16.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextCodecUserDefined.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextEncoding.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextEncodingDetectorNone.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextEncodingRegistry.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextStream.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/text/$(DEPDIR)/libWebCore_la-UnicodeRange.Plo at am__quote@
@@@ -15911,7 -15996,9 +15998,9 @@@
  @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/WebCoreSupport/$(DEPDIR)/libwebkit_1_0_la-FrameLoaderClientGtk.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/WebCoreSupport/$(DEPDIR)/libwebkit_1_0_la-InspectorClientGtk.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/WebCoreSupport/$(DEPDIR)/libwebkit_1_0_la-PasteboardHelperGtk.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/tests/$(DEPDIR)/Programs_UnitTests-main.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebframe-testwebframe.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebhistoryitem-testwebhistoryitem.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitdownload.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitnetworkrequest.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at WebKit/gtk/webkit/$(DEPDIR)/libwebkit_1_0_la-webkitprivate.Plo at am__quote@
@@@ -16025,20 -16112,6 +16114,6 @@@ WebKitTools/GtkLauncher/Programs_GtkLau
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Programs_GtkLauncher_CPPFLAGS) $(CPPFLAGS) $(Programs_GtkLauncher_CFLAGS) $(CFLAGS) -c -o WebKitTools/GtkLauncher/Programs_GtkLauncher-main.obj `if test -f 'WebKitTools/GtkLauncher/main.c'; then $(CYGPATH_W) 'WebKitTools/GtkLauncher/main.c'; else $(CYGPATH_W) '$(srcdir)/WebKitTools/GtkLauncher/main.c'; fi`
  
- WebKit/gtk/tests/Programs_UnitTests-main.o: WebKit/gtk/tests/main.c
- @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Programs_UnitTests_CPPFLAGS) $(CPPFLAGS) $(Programs_UnitTests_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_UnitTests-main.o -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_UnitTests-main.Tpo -c -o WebKit/gtk/tests/Programs_UnitTests-main.o `test -f 'WebKit/gtk/tests/main.c' || echo '$(srcdir)/'`WebKit/gtk/tests/main.c
- @am__fastdepCC_TRUE@	mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_UnitTests-main.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_UnitTests-main.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='WebKit/gtk/tests/main.c' object='WebKit/gtk/tests/Programs_UnitTests-main.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Programs_UnitTests_CPPFLAGS) $(CPPFLAGS) $(Programs_UnitTests_CFLAGS) $(CFLAGS) -c -o WebKit/gtk/tests/Programs_UnitTests-main.o `test -f 'WebKit/gtk/tests/main.c' || echo '$(srcdir)/'`WebKit/gtk/tests/main.c
- 
- WebKit/gtk/tests/Programs_UnitTests-main.obj: WebKit/gtk/tests/main.c
- @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Programs_UnitTests_CPPFLAGS) $(CPPFLAGS) $(Programs_UnitTests_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_UnitTests-main.obj -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_UnitTests-main.Tpo -c -o WebKit/gtk/tests/Programs_UnitTests-main.obj `if test -f 'WebKit/gtk/tests/main.c'; then $(CYGPATH_W) 'WebKit/gtk/tests/main.c'; else $(CYGPATH_W) '$(srcdir)/WebKit/gtk/tests/main.c'; fi`
- @am__fastdepCC_TRUE@	mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_UnitTests-main.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_UnitTests-main.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='WebKit/gtk/tests/main.c' object='WebKit/gtk/tests/Programs_UnitTests-main.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Programs_UnitTests_CPPFLAGS) $(CPPFLAGS) $(Programs_UnitTests_CFLAGS) $(CFLAGS) -c -o WebKit/gtk/tests/Programs_UnitTests-main.obj `if test -f 'WebKit/gtk/tests/main.c'; then $(CYGPATH_W) 'WebKit/gtk/tests/main.c'; else $(CYGPATH_W) '$(srcdir)/WebKit/gtk/tests/main.c'; fi`
- 
  JavaScriptCore/API/tests/Programs_minidom-JSNode.o: JavaScriptCore/API/tests/JSNode.c
  @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Programs_minidom_CPPFLAGS) $(CPPFLAGS) $(Programs_minidom_CFLAGS) $(CFLAGS) -MT JavaScriptCore/API/tests/Programs_minidom-JSNode.o -MD -MP -MF JavaScriptCore/API/tests/$(DEPDIR)/Programs_minidom-JSNode.Tpo -c -o JavaScriptCore/API/tests/Programs_minidom-JSNode.o `test -f 'JavaScriptCore/API/tests/JSNode.c' || echo '$(srcdir)/'`JavaScriptCore/API/tests/JSNode.c
  @am__fastdepCC_TRUE@	mv -f JavaScriptCore/API/tests/$(DEPDIR)/Programs_minidom-JSNode.Tpo JavaScriptCore/API/tests/$(DEPDIR)/Programs_minidom-JSNode.Po
@@@ -16109,6 -16182,48 +16184,48 @@@ JavaScriptCore/API/tests/Programs_minid
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Programs_minidom_CPPFLAGS) $(CPPFLAGS) $(Programs_minidom_CFLAGS) $(CFLAGS) -c -o JavaScriptCore/API/tests/Programs_minidom-minidom.obj `if test -f 'JavaScriptCore/API/tests/minidom.c'; then $(CYGPATH_W) 'JavaScriptCore/API/tests/minidom.c'; else $(CYGPATH_W) '$(srcdir)/JavaScriptCore/API/tests/minidom.c'; fi`
  
+ WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.o: WebKit/gtk/tests/testwebbackforwardlist.c
+ @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebbackforwardlist_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.o -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Tpo -c -o WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.o `test -f 'WebKit/gtk/tests/testwebbackforwardlist.c' || echo '$(srcdir)/'`WebKit/gtk/tests/testwebbackforwardlist.c
+ @am__fastdepCC_TRUE@	mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='WebKit/gtk/tests/testwebbackforwardlist.c' object='WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebbackforwardlist_CFLAGS) $(CFLAGS) -c -o WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.o `test -f 'WebKit/gtk/tests/testwebbackforwardlist.c' || echo '$(srcdir)/'`WebKit/gtk/tests/testwebbackforwardlist.c
+ 
+ WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.obj: WebKit/gtk/tests/testwebbackforwardlist.c
+ @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebbackforwardlist_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.obj -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Tpo -c -o WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.obj `if test -f 'WebKit/gtk/tests/testwebbackforwardlist.c'; then $(CYGPATH_W) 'WebKit/gtk/tests/testwebbackforwardlist.c'; else $(CYGPATH_W) '$(srcdir)/WebKit/gtk/tests/testwebbackforwardlist.c'; fi`
+ @am__fastdepCC_TRUE@	mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='WebKit/gtk/tests/testwebbackforwardlist.c' object='WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebbackforwardlist_CFLAGS) $(CFLAGS) -c -o WebKit/gtk/tests/Programs_unittests_testwebbackforwardlist-testwebbackforwardlist.obj `if test -f 'WebKit/gtk/tests/testwebbackforwardlist.c'; then $(CYGPATH_W) 'WebKit/gtk/tests/testwebbackforwardlist.c'; else $(CYGPATH_W) '$(srcdir)/WebKit/gtk/tests/testwebbackforwardlist.c'; fi`
+ 
+ WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.o: WebKit/gtk/tests/testwebframe.c
+ @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebframe_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.o -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebframe-testwebframe.Tpo -c -o WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.o `test -f 'WebKit/gtk/tests/testwebframe.c' || echo '$(srcdir)/'`WebKit/gtk/tests/testwebframe.c
+ @am__fastdepCC_TRUE@	mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebframe-testwebframe.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebframe-testwebframe.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='WebKit/gtk/tests/testwebframe.c' object='WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebframe_CFLAGS) $(CFLAGS) -c -o WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.o `test -f 'WebKit/gtk/tests/testwebframe.c' || echo '$(srcdir)/'`WebKit/gtk/tests/testwebframe.c
+ 
+ WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.obj: WebKit/gtk/tests/testwebframe.c
+ @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebframe_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.obj -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebframe-testwebframe.Tpo -c -o WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.obj `if test -f 'WebKit/gtk/tests/testwebframe.c'; then $(CYGPATH_W) 'WebKit/gtk/tests/testwebframe.c'; else $(CYGPATH_W) '$(srcdir)/WebKit/gtk/tests/testwebframe.c'; fi`
+ @am__fastdepCC_TRUE@	mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebframe-testwebframe.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebframe-testwebframe.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='WebKit/gtk/tests/testwebframe.c' object='WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebframe_CFLAGS) $(CFLAGS) -c -o WebKit/gtk/tests/Programs_unittests_testwebframe-testwebframe.obj `if test -f 'WebKit/gtk/tests/testwebframe.c'; then $(CYGPATH_W) 'WebKit/gtk/tests/testwebframe.c'; else $(CYGPATH_W) '$(srcdir)/WebKit/gtk/tests/testwebframe.c'; fi`
+ 
+ WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.o: WebKit/gtk/tests/testwebhistoryitem.c
+ @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebhistoryitem_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.o -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebhistoryitem-testwebhistoryitem.Tpo -c -o WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.o `test -f 'WebKit/gtk/tests/testwebhistoryitem.c' || echo '$(srcdir)/'`WebKit/gtk/tests/testwebhistoryitem.c
+ @am__fastdepCC_TRUE@	mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebhistoryitem-testwebhistoryitem.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebhistoryitem-testwebhistoryitem.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='WebKit/gtk/tests/testwebhistoryitem.c' object='WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebhistoryitem_CFLAGS) $(CFLAGS) -c -o WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.o `test -f 'WebKit/gtk/tests/testwebhistoryitem.c' || echo '$(srcdir)/'`WebKit/gtk/tests/testwebhistoryitem.c
+ 
+ WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.obj: WebKit/gtk/tests/testwebhistoryitem.c
+ @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebhistoryitem_CFLAGS) $(CFLAGS) -MT WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.obj -MD -MP -MF WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebhistoryitem-testwebhistoryitem.Tpo -c -o WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.obj `if test -f 'WebKit/gtk/tests/testwebhistoryitem.c'; then $(CYGPATH_W) 'WebKit/gtk/tests/testwebhistoryitem.c'; else $(CYGPATH_W) '$(srcdir)/WebKit/gtk/tests/testwebhistoryitem.c'; fi`
+ @am__fastdepCC_TRUE@	mv -f WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebhistoryitem-testwebhistoryitem.Tpo WebKit/gtk/tests/$(DEPDIR)/Programs_unittests_testwebhistoryitem-testwebhistoryitem.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='WebKit/gtk/tests/testwebhistoryitem.c' object='WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(Programs_unittests_testwebhistoryitem_CFLAGS) $(CFLAGS) -c -o WebKit/gtk/tests/Programs_unittests_testwebhistoryitem-testwebhistoryitem.obj `if test -f 'WebKit/gtk/tests/testwebhistoryitem.c'; then $(CYGPATH_W) 'WebKit/gtk/tests/testwebhistoryitem.c'; else $(CYGPATH_W) '$(srcdir)/WebKit/gtk/tests/testwebhistoryitem.c'; fi`
+ 
  .cpp.o:
  @am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@@ -17484,6 -17599,13 +17601,13 @@@ WebCore/bindings/js/libWebCore_la-JSJav
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/bindings/js/libWebCore_la-JSJavaScriptCallFrameCustom.lo `test -f 'WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp
  
+ WebCore/bindings/js/libWebCore_la-JSLazyEventListener.lo: WebCore/bindings/js/JSLazyEventListener.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/bindings/js/libWebCore_la-JSLazyEventListener.lo -MD -MP -MF WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSLazyEventListener.Tpo -c -o WebCore/bindings/js/libWebCore_la-JSLazyEventListener.lo `test -f 'WebCore/bindings/js/JSLazyEventListener.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/JSLazyEventListener.cpp
+ @am__fastdepCXX_TRUE@	mv -f WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSLazyEventListener.Tpo WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSLazyEventListener.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='WebCore/bindings/js/JSLazyEventListener.cpp' object='WebCore/bindings/js/libWebCore_la-JSLazyEventListener.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/bindings/js/libWebCore_la-JSLazyEventListener.lo `test -f 'WebCore/bindings/js/JSLazyEventListener.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/JSLazyEventListener.cpp
+ 
  WebCore/bindings/js/libWebCore_la-JSLocationCustom.lo: WebCore/bindings/js/JSLocationCustom.cpp
  @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/bindings/js/libWebCore_la-JSLocationCustom.lo -MD -MP -MF WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSLocationCustom.Tpo -c -o WebCore/bindings/js/libWebCore_la-JSLocationCustom.lo `test -f 'WebCore/bindings/js/JSLocationCustom.cpp' || echo '$(srcdir)/'`WebCore/bindings/js/JSLocationCustom.cpp
  @am__fastdepCXX_TRUE@	mv -f WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSLocationCustom.Tpo WebCore/bindings/js/$(DEPDIR)/libWebCore_la-JSLocationCustom.Plo
@@@ -18303,6 -18425,13 +18427,13 @@@ WebCore/dom/libWebCore_la-CharacterData
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/dom/libWebCore_la-CharacterData.lo `test -f 'WebCore/dom/CharacterData.cpp' || echo '$(srcdir)/'`WebCore/dom/CharacterData.cpp
  
+ WebCore/dom/libWebCore_la-CheckedRadioButtons.lo: WebCore/dom/CheckedRadioButtons.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/dom/libWebCore_la-CheckedRadioButtons.lo -MD -MP -MF WebCore/dom/$(DEPDIR)/libWebCore_la-CheckedRadioButtons.Tpo -c -o WebCore/dom/libWebCore_la-CheckedRadioButtons.lo `test -f 'WebCore/dom/CheckedRadioButtons.cpp' || echo '$(srcdir)/'`WebCore/dom/CheckedRadioButtons.cpp
+ @am__fastdepCXX_TRUE@	mv -f WebCore/dom/$(DEPDIR)/libWebCore_la-CheckedRadioButtons.Tpo WebCore/dom/$(DEPDIR)/libWebCore_la-CheckedRadioButtons.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='WebCore/dom/CheckedRadioButtons.cpp' object='WebCore/dom/libWebCore_la-CheckedRadioButtons.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/dom/libWebCore_la-CheckedRadioButtons.lo `test -f 'WebCore/dom/CheckedRadioButtons.cpp' || echo '$(srcdir)/'`WebCore/dom/CheckedRadioButtons.cpp
+ 
  WebCore/dom/libWebCore_la-ChildNodeList.lo: WebCore/dom/ChildNodeList.cpp
  @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/dom/libWebCore_la-ChildNodeList.lo -MD -MP -MF WebCore/dom/$(DEPDIR)/libWebCore_la-ChildNodeList.Tpo -c -o WebCore/dom/libWebCore_la-ChildNodeList.lo `test -f 'WebCore/dom/ChildNodeList.cpp' || echo '$(srcdir)/'`WebCore/dom/ChildNodeList.cpp
  @am__fastdepCXX_TRUE@	mv -f WebCore/dom/$(DEPDIR)/libWebCore_la-ChildNodeList.Tpo WebCore/dom/$(DEPDIR)/libWebCore_la-ChildNodeList.Plo
@@@ -21047,6 -21176,13 +21178,13 @@@ WebCore/platform/text/libWebCore_la-Tex
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/platform/text/libWebCore_la-TextEncoding.lo `test -f 'WebCore/platform/text/TextEncoding.cpp' || echo '$(srcdir)/'`WebCore/platform/text/TextEncoding.cpp
  
+ WebCore/platform/text/libWebCore_la-TextEncodingDetectorNone.lo: WebCore/platform/text/TextEncodingDetectorNone.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/platform/text/libWebCore_la-TextEncodingDetectorNone.lo -MD -MP -MF WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextEncodingDetectorNone.Tpo -c -o WebCore/platform/text/libWebCore_la-TextEncodingDetectorNone.lo `test -f 'WebCore/platform/text/TextEncodingDetectorNone.cpp' || echo '$(srcdir)/'`WebCore/platform/text/TextEncodingDetectorNone.cpp
+ @am__fastdepCXX_TRUE@	mv -f WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextEncodingDetectorNone.Tpo WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextEncodingDetectorNone.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='WebCore/platform/text/TextEncodingDetectorNone.cpp' object='WebCore/platform/text/libWebCore_la-TextEncodingDetectorNone.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/platform/text/libWebCore_la-TextEncodingDetectorNone.lo `test -f 'WebCore/platform/text/TextEncodingDetectorNone.cpp' || echo '$(srcdir)/'`WebCore/platform/text/TextEncodingDetectorNone.cpp
+ 
  WebCore/platform/text/libWebCore_la-TextEncodingRegistry.lo: WebCore/platform/text/TextEncodingRegistry.cpp
  @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCore_la_CPPFLAGS) $(CPPFLAGS) $(libWebCore_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/platform/text/libWebCore_la-TextEncodingRegistry.lo -MD -MP -MF WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextEncodingRegistry.Tpo -c -o WebCore/platform/text/libWebCore_la-TextEncodingRegistry.lo `test -f 'WebCore/platform/text/TextEncodingRegistry.cpp' || echo '$(srcdir)/'`WebCore/platform/text/TextEncodingRegistry.cpp
  @am__fastdepCXX_TRUE@	mv -f WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextEncodingRegistry.Tpo WebCore/platform/text/$(DEPDIR)/libWebCore_la-TextEncodingRegistry.Plo
@@@ -25004,6 -25140,7 +25142,7 @@@ clean-libtool
  	-rm -rf JavaScriptCore/wtf/unicode/.libs JavaScriptCore/wtf/unicode/_libs
  	-rm -rf JavaScriptCore/wtf/unicode/icu/.libs JavaScriptCore/wtf/unicode/icu/_libs
  	-rm -rf Programs/.libs Programs/_libs
+ 	-rm -rf Programs/unittests/.libs Programs/unittests/_libs
  	-rm -rf TestNetscapePlugin/.libs TestNetscapePlugin/_libs
  	-rm -rf WebCore/bindings/js/.libs WebCore/bindings/js/_libs
  	-rm -rf WebCore/bridge/.libs WebCore/bridge/_libs
@@@ -25394,6 -25531,7 +25533,7 @@@ distclean-generic
  	-rm -f JavaScriptCore/wtf/unicode/icu/$(DEPDIR)/$(am__dirstamp)
  	-rm -f JavaScriptCore/wtf/unicode/icu/$(am__dirstamp)
  	-rm -f Programs/$(am__dirstamp)
+ 	-rm -f Programs/unittests/$(am__dirstamp)
  	-rm -f TestNetscapePlugin/$(am__dirstamp)
  	-rm -f WebCore/bindings/js/$(DEPDIR)/$(am__dirstamp)
  	-rm -f WebCore/bindings/js/$(am__dirstamp)
diff --combined JavaScriptCore/wtf/Platform.h
index e698942,78db7ee..d540505
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@@ -40,16 -40,12 +40,12 @@@
  /* be used regardless of operating environment */
  #ifdef __APPLE__
  #define WTF_PLATFORM_DARWIN 1
- #import <AvailabilityMacros.h>
+ #include <AvailabilityMacros.h>
  #if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
  #define BUILDING_ON_TIGER 1
- #endif
- #if !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+ #elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
  #define BUILDING_ON_LEOPARD 1
  #endif
- #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
- #error what are we?!
- #endif
  #endif
  
  /* PLATFORM(WIN_OS) */
@@@ -222,13 -218,6 +218,13 @@@
  #define WTF_PLATFORM_X86_64 1
  #endif
  
 +/* PLATFORM(SPARC) */
 +#if   defined(__sparc__) \
 +   || defined(__sparc)
 +#define WTF_PLATFORM_SPARC 1
 +#define WTF_PLATFORM_BIG_ENDIAN 1
 +#endif
 +
  /* PLATFORM(SH4) */
  #if defined(__SH4__)
  #define WTF_PLATFORM_SH4 1
@@@ -254,16 -243,6 +250,16 @@@
  #   endif
  #endif
  
 +/* For undefined platforms */
 +#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
 +#include <sys/param.h>
 +#if __BYTE_ORDER == __BIG_ENDIAN
 +#define WTF_PLATFORM_BIG_ENDIAN 1
 +#elif  __BYTE_ORDER == __PDP_ENDIAN
 +#define WTF_PLATFORM_MIDDLE_ENDIAN 1
 +#endif
 +#endif
 +
  /* Compiler */
  
  /* COMPILER(MSVC) */
@@@ -332,6 -311,7 +328,7 @@@
  #define ENABLE_DASHBOARD_SUPPORT 1
  #endif
  #define HAVE_READLINE 1
+ #define HAVE_RUNLOOP_TIMER 1
  #endif
  
  #if PLATFORM(CHROMIUM) && PLATFORM(DARWIN)
@@@ -367,6 -347,7 +364,7 @@@
  #if PLATFORM(DARWIN)
  
  #define HAVE_ERRNO_H 1
+ #define HAVE_LANGINFO_H 1
  #define HAVE_MMAP 1
  #define HAVE_MERGESORT 1
  #define HAVE_SBRK 1
@@@ -407,6 -388,7 +405,7 @@@
  /* FIXME: is this actually used or do other platforms generate their own config.h? */
  
  #define HAVE_ERRNO_H 1
+ #define HAVE_LANGINFO_H 1
  #define HAVE_MMAP 1
  #define HAVE_SBRK 1
  #define HAVE_STRINGS_H 1
diff --combined configure
index 06a8618,e2b5767..e1f6b22
--- a/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.61 for WebKit 1.1.3.
+ # Generated by GNU Autoconf 2.61 for WebKit 1.1.4.
  #
  # Report bugs to <http://bugs.webkit.org/>.
  #
@@@ -723,8 -723,8 +723,8 @@@ SHELL=${CONFIG_SHELL-/bin/sh
  # Identity of this package.
  PACKAGE_NAME='WebKit'
  PACKAGE_TARNAME='webkit'
- PACKAGE_VERSION='1.1.3'
- PACKAGE_STRING='WebKit 1.1.3'
+ PACKAGE_VERSION='1.1.4'
+ PACKAGE_STRING='WebKit 1.1.4'
  PACKAGE_BUGREPORT='http://bugs.webkit.org/'
  
  ac_unique_file="WebCore/config.h"
@@@ -1555,7 -1555,7 +1555,7 @@@ if test "$ac_init_help" = "long"; the
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
- \`configure' configures WebKit 1.1.3 to adapt to many kinds of systems.
+ \`configure' configures WebKit 1.1.4 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
@@@ -1626,7 -1626,7 +1626,7 @@@ f
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
-      short | recursive ) echo "Configuration of WebKit 1.1.3:";;
+      short | recursive ) echo "Configuration of WebKit 1.1.4:";;
     esac
    cat <<\_ACEOF
  
@@@ -1656,7 -1656,7 +1656,7 @@@ Optional Features
    --enable-database       enable HTML5 client-side database storage support
                            default=yes
    --enable-icon-database  enable icon database default=yes
-   --enable-video          enable HTML5 video support default=no
+   --enable-video          enable HTML5 video support default=yes
    --enable-xpath          enable support for XPath default=yes
    --enable-xslt           enable support for XSLT default=yes
    --enable-geolocation    enable support for geolocation default=no
@@@ -1821,7 -1821,7 +1821,7 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- WebKit configure 1.1.3
+ WebKit configure 1.1.4
  generated by GNU Autoconf 2.61
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@@ -1835,7 -1835,7 +1835,7 @@@ cat >config.log <<_ACEO
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by WebKit $as_me 1.1.3, which was
+ It was created by WebKit $as_me 1.1.4, which was
  generated by GNU Autoconf 2.61.  Invocation command line was
  
    $ $0 $@
@@@ -2355,14 -2355,14 +2355,14 @@@ test -n "$target_alias" &
  
  WEBKIT_MAJOR_VERSION=1
  WEBKIT_MINOR_VERSION=1
- WEBKIT_MICRO_VERSION=3
+ WEBKIT_MICRO_VERSION=4
  
  
  
  
  
  
- LIBWEBKITGTK_VERSION=3:0:1
+ LIBWEBKITGTK_VERSION=4:0:2
  
  
  am__api_version='1.10'
@@@ -2671,7 -2671,7 +2671,7 @@@ f
  
  # Define the identity of the package.
   PACKAGE='webkit'
-  VERSION='1.1.3'
+  VERSION='1.1.4'
  
  
  cat >>confdefs.h <<_ACEOF
@@@ -18939,6 -18939,7 +18939,7 @@@ LIBSOUP_REQUIRED_VERSION=2.25.9
  LIBXSLT_REQUIRED_VERSION=1.1.7
  SQLITE_REQUIRED_VERSION=3.0
  GSTREAMER_REQUIRED_VERSION=0.10
+ GNOME_KEYRING_REQUIRED_VERSION=2.26.0
  
  # Available modules
  #
@@@ -20247,7 -20248,7 +20248,7 @@@ echo $ECHO_N "checking whether to enabl
  if test "${enable_video+set}" = set; then
    enableval=$enable_video;
  else
-   enable_video="no"
+   enable_video="yes"
  fi
  
  { echo "$as_me:$LINENO: result: $enable_video" >&5
@@@ -20484,7 -20485,7 +20485,7 @@@ f
  
  if test "$enable_jit" = "yes"; then
      case "$target_cpu" in
 -        i*86)
 +        i*86|x86_64)
  
  cat >>confdefs.h <<\_ACEOF
  #define ENABLE_JIT 1
@@@ -20510,27 -20511,11 +20511,27 @@@ cat >>confdefs.h <<\_ACEO
  #define ENABLE_JIT_OPTIMIZE_ARITHMETIC 1
  _ACEOF
  
 +            case "$target_cpu" in
 +                i*86)
  
  cat >>confdefs.h <<\_ACEOF
  #define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
  _ACEOF
  
 +                ;;
 +                x86_64)
 +
 +cat >>confdefs.h <<\_ACEOF
 +#define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
 +_ACEOF
 +
 +
 +cat >>confdefs.h <<\_ACEOF
 +#define WTF_USE_ALTERNATE_JSIMMEDIATE 1
 +_ACEOF
 +
 +                ;;
 +            esac
          ;;
          *)
              enable_jit="no (CPU '$target_cpu' not supported)"
@@@ -20707,12 -20692,12 +20708,12 @@@ if test -n "$PKG_CONFIG"; the
          pkg_cv_GNOMEKEYRING_CFLAGS="$GNOMEKEYRING_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-keyring-1") 2>&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED_VERSION\"") >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-   pkg_cv_GNOMEKEYRING_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-1" 2>/dev/null`
+   pkg_cv_GNOMEKEYRING_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION" 2>/dev/null`
  else
    pkg_failed=yes
  fi
@@@ -20725,12 -20710,12 +20726,12 @@@ if test -n "$PKG_CONFIG"; the
          pkg_cv_GNOMEKEYRING_LIBS="$GNOMEKEYRING_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1\"") >&5
-   ($PKG_CONFIG --exists --print-errors "gnome-keyring-1") 2>&5
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED_VERSION\"") >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-   pkg_cv_GNOMEKEYRING_LIBS=`$PKG_CONFIG --libs "gnome-keyring-1" 2>/dev/null`
+   pkg_cv_GNOMEKEYRING_LIBS=`$PKG_CONFIG --libs "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION" 2>/dev/null`
  else
    pkg_failed=yes
  fi
@@@ -20749,14 -20734,14 +20750,14 @@@ els
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
- 	        GNOMEKEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-keyring-1"`
+ 	        GNOMEKEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION"`
          else
- 	        GNOMEKEYRING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-keyring-1"`
+ 	        GNOMEKEYRING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION"`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GNOMEKEYRING_PKG_ERRORS" >&5
  
- 	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-keyring-1) were not met:
+ 	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION) were not met:
  
  $GNOMEKEYRING_PKG_ERRORS
  
@@@ -20767,7 -20752,7 +20768,7 @@@ Alternatively, you may set the environm
  and GNOMEKEYRING_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
- echo "$as_me: error: Package requirements (gnome-keyring-1) were not met:
+ echo "$as_me: error: Package requirements (gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION) were not met:
  
  $GNOMEKEYRING_PKG_ERRORS
  
@@@ -22576,7 -22561,7 +22577,7 @@@ exec 6>&
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
- This file was extended by WebKit $as_me 1.1.3, which was
+ This file was extended by WebKit $as_me 1.1.4, which was
  generated by GNU Autoconf 2.61.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
@@@ -22629,7 -22614,7 +22630,7 @@@ Report bugs to <bug-autoconf at gnu.org>.
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
- WebKit config.status 1.1.3
+ WebKit config.status 1.1.4
  configured by $0, generated by GNU Autoconf 2.61,
    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
diff --combined configure.ac
index 63dc898,7409d26..fb6a6c7
--- a/configure.ac
+++ b/configure.ac
@@@ -2,7 -2,7 +2,7 @@@ AC_PREREQ(2.59
  
  m4_define([webkit_major_version], [1])
  m4_define([webkit_minor_version], [1])
- m4_define([webkit_micro_version], [3])
+ m4_define([webkit_micro_version], [4])
  
  AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
  
@@@ -24,7 -24,7 +24,7 @@@ AC_CONFIG_SRCDIR([WebCore/config.h]
  
  dnl # Libtool library version, not to confuse with API version
  dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
- LIBWEBKITGTK_VERSION=3:0:1
+ LIBWEBKITGTK_VERSION=4:0:2
  AC_SUBST([LIBWEBKITGTK_VERSION])
  
  AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@@ -190,6 -190,7 +190,7 @@@ LIBSOUP_REQUIRED_VERSION=2.25.9
  LIBXSLT_REQUIRED_VERSION=1.1.7
  SQLITE_REQUIRED_VERSION=3.0
  GSTREAMER_REQUIRED_VERSION=0.10
+ GNOME_KEYRING_REQUIRED_VERSION=2.26.0
  
  # Available modules
  #
@@@ -322,8 -323,8 +323,8 @@@ AC_MSG_RESULT([$enable_icon_database]
  AC_MSG_CHECKING([whether to enable HTML5 video support])
  AC_ARG_ENABLE(video,
                AC_HELP_STRING([--enable-video],
-                              [enable HTML5 video support [default=no]]),
-               [],[enable_video="no"])
+                              [enable HTML5 video support [default=yes]]),
+               [],[enable_video="yes"])
  AC_MSG_RESULT([$enable_video])
  
  # check whether to enable XPath support
@@@ -477,21 -478,13 +478,21 @@@ AC_ARG_ENABLE([jit]
                [],[enable_jit="yes"])
  if test "$enable_jit" = "yes"; then
      case "$target_cpu" in
 -        i*86)
 +        i*86|x86_64)
              AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
              AC_DEFINE([ENABLE_WREC], [1], [Define to enable WREC])
              AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls])
              AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access])
              AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic])
 -            AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list])
 +            case "$target_cpu" in
 +                i*86)
 +                    AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list])
 +                ;;
 +                x86_64)
 +                    AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register])
 +                    AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate])
 +                ;;
 +            esac
          ;;
          *)
              enable_jit="no (CPU '$target_cpu' not supported)"
@@@ -537,7 -530,7 +538,7 @@@ AC_SUBST([LIBSOUP_LIBS]
  
  if test "$enable_gnomekeyring" = "yes"; then
     PKG_CHECK_MODULES([GNOMEKEYRING],
-                      [gnome-keyring-1])
+                      [gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED_VERSION])
     AC_SUBST([GNOMEKEYRING_CFLAGS])
     AC_SUBST([GNOMEKEYRING_LIBS])
  fi

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list