Diff
Modified: trunk/ChangeLog (88061 => 88062)
--- trunk/ChangeLog 2011-06-03 21:37:20 UTC (rev 88061)
+++ trunk/ChangeLog 2011-06-03 21:39:13 UTC (rev 88062)
@@ -1,3 +1,13 @@
+2011-06-03 Martin Robinson <[email protected]>
+
+ Reviewed by Dimitri Glazkov.
+
+ Teach Gtk build about window.internals
+ https://bugs.webkit.org/show_bug.cgi?id=61071
+
+ * Source/autotools/symbols.filter: Added some symbols necessary for
+ window.internals to function to the global symbol list.
+
2011-06-03 Alexis Menard <[email protected]>
Reviewed by Benjamin Poulain.
Modified: trunk/LayoutTests/ChangeLog (88061 => 88062)
--- trunk/LayoutTests/ChangeLog 2011-06-03 21:37:20 UTC (rev 88061)
+++ trunk/LayoutTests/ChangeLog 2011-06-03 21:39:13 UTC (rev 88062)
@@ -1,3 +1,12 @@
+2011-06-03 Martin Robinson <[email protected]>
+
+ Reviewed by Dimitri Glazkov.
+
+ Teach Gtk build about window.internals
+ https://bugs.webkit.org/show_bug.cgi?id=61071
+
+ * platform/gtk/Skipped: Unskip the one new window.internals test.
+
2011-06-03 Laszlo Gombos <[email protected]>
Reviewed by Antonio Gomes.
Modified: trunk/LayoutTests/platform/gtk/Skipped (88061 => 88062)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-06-03 21:37:20 UTC (rev 88061)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-06-03 21:39:13 UTC (rev 88062)
@@ -1529,6 +1529,3 @@
# failing dropzone test(http://bugs.webkit.org/show_bug.cgi?id=61630)
fast/events/dropzone-002.html
-
-# https://bugs.webkit.org/show_bug.cgi?id=61071
-fast/harness/internals-object.html
Modified: trunk/Source/WebCore/ChangeLog (88061 => 88062)
--- trunk/Source/WebCore/ChangeLog 2011-06-03 21:37:20 UTC (rev 88061)
+++ trunk/Source/WebCore/ChangeLog 2011-06-03 21:39:13 UTC (rev 88062)
@@ -1,3 +1,13 @@
+2011-06-03 Martin Robinson <[email protected]>
+
+ Reviewed by Dimitri Glazkov.
+
+ Teach Gtk build about window.internals
+ https://bugs.webkit.org/show_bug.cgi?id=61071
+
+ * GNUmakefile.am: Add new internals directories to the VPATH
+ (for idl processing) and the include list.
+
2011-06-03 Levi Weintraub <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebCore/GNUmakefile.am (88061 => 88062)
--- trunk/Source/WebCore/GNUmakefile.am 2011-06-03 21:37:20 UTC (rev 88061)
+++ trunk/Source/WebCore/GNUmakefile.am 2011-06-03 21:39:13 UTC (rev 88062)
@@ -76,6 +76,8 @@
-I$(srcdir)/Source/WebCore/svg/graphics \
-I$(srcdir)/Source/WebCore/svg/graphics/filters \
-I$(srcdir)/Source/WebCore/svg/properties \
+ -I$(srcdir)/Source/WebCore/testing \
+ -I$(srcdir)/Source/WebCore/testing/js \
-I$(srcdir)/Source/WebCore/webaudio \
-I$(srcdir)/Source/WebCore/websockets \
-I$(srcdir)/Source/WebCore/workers \
@@ -707,6 +709,7 @@
$(WebCore)/plugins \
$(WebCore)/storage \
$(WebCore)/svg \
+ $(WebCore)/testing \
$(WebCore)/webaudio \
$(WebCore)/websockets \
$(WebCore)/workers \
@@ -780,6 +783,7 @@
$(shell ls $(srcdir)/Source/WebCore/plugins/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/storage/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/svg/*.idl) \
+ $(shell ls $(srcdir)/Source/WebCore/testing/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/webaudio/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/websockets/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/workers/*.idl) \
Modified: trunk/Source/autotools/symbols.filter (88061 => 88062)
--- trunk/Source/autotools/symbols.filter 2011-06-03 21:37:20 UTC (rev 88061)
+++ trunk/Source/autotools/symbols.filter 2011-06-03 21:39:13 UTC (rev 88062)
@@ -26,6 +26,9 @@
_ZN3WTF7CStringD1Ev;
_ZN3WTF7CStringaSERKS0_;
_ZN24DumpRenderTreeSupportGtk*;
+_ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE;
+_ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE;
+_ZN7WebCore12JSDOMWrapper34virtualFunctionToPreventWeakVtableEv;
local:
_Z*;
cti*;
Modified: trunk/Tools/ChangeLog (88061 => 88062)
--- trunk/Tools/ChangeLog 2011-06-03 21:37:20 UTC (rev 88061)
+++ trunk/Tools/ChangeLog 2011-06-03 21:39:13 UTC (rev 88062)
@@ -1,3 +1,16 @@
+2011-06-03 Martin Robinson <[email protected]>
+
+ Reviewed by Dimitri Glazkov.
+
+ Teach Gtk build about window.internals
+ https://bugs.webkit.org/show_bug.cgi?id=61071
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (webViewWindowObjectCleared): Inject the new internals object when the
+ window object clears.
+ * GNUmakefile.am: Add new source files and includes necessary for window.internals.
+ Also do a little bit of cleanup.
+
2011-06-03 Dirk Pranke <[email protected]>
Reviewed by Tony Chang.
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (88061 => 88062)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2011-06-03 21:37:20 UTC (rev 88061)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2011-06-03 21:39:13 UTC (rev 88062)
@@ -42,6 +42,7 @@
#include "PlainTextController.h"
#include "TextInputController.h"
#include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
+#include "WebCoreTestSupport.h"
#include "WorkQueue.h"
#include "WorkQueueItem.h"
#include <_javascript_Core/_javascript_.h>
@@ -840,6 +841,7 @@
addControllerToWindow(context, windowObject, "eventSender", makeEventSender(context, !webkit_web_frame_get_parent(frame)));
addControllerToWindow(context, windowObject, "plainText", makePlainTextController(context));
addControllerToWindow(context, windowObject, "textInputController", makeTextInputController(context));
+ WebCoreTestSupport::injectInternalsObject(context);
}
static gboolean webViewConsoleMessage(WebKitWebView* view, const gchar* message, unsigned int line, const gchar* sourceId, gpointer data)
Modified: trunk/Tools/GNUmakefile.am (88061 => 88062)
--- trunk/Tools/GNUmakefile.am 2011-06-03 21:37:20 UTC (rev 88061)
+++ trunk/Tools/GNUmakefile.am 2011-06-03 21:39:13 UTC (rev 88062)
@@ -34,20 +34,51 @@
-no-fast-install \
-no-install
+# libWebCoreInternals
+# We must split off the window.internals implementation into a separate
+# convenience library because it requires a different include path order
+# to prefer the WebCore config.h over the DumpRenderTree config.h
+noinst_LTLIBRARIES += libWebCoreInternals.la
+libWebCoreInternals_la_SOURCES = \
+ Source/WebCore/testing/Internals.cpp \
+ Source/WebCore/testing/Internals.h \
+ Source/WebCore/testing/js/WebCoreTestSupport.cpp \
+ Source/WebCore/testing/js/WebCoreTestSupport.h
+
+nodist_libWebCoreInternals_la_SOURCES = \
+ DerivedSources/WebCore/JSInternals.cpp \
+ DerivedSources/WebCore/JSInternals.h
+
+libWebCoreInternals_la_CPPFLAGS = \
+ $(global_cppflags) \
+ $(webcore_cppflags) \
+ $(webcoregtk_cppflags) \
+ $(_javascript_core_cppflags)
+ -I$(top_builddir)/DerivedSources \
+ -I$(top_builddir)/DerivedSources/WebCore
+
+libWebCoreInternals_la_CXXFLAGS = \
+ -fno-strict-aliasing \
+ $(global_cxxflags)
+
# DumpRenderTree
-dumprendertree_cppflags := \
+Programs_DumpRenderTree_CPPFLAGS = \
+ $(global_cppflags) \
-I$(srcdir)/Tools/DumpRenderTree \
-I$(srcdir)/Tools/DumpRenderTree/cairo \
-I$(srcdir)/Tools/DumpRenderTree/gtk \
-I$(srcdir)/Source/WebKit/gtk \
-I$(srcdir)/Source/WebCore/platform/gtk \
- -I$(srcdir)/Source/WebCore/platform/network/soup/cache/ \
+ -I$(srcdir)/Source/WebCore/testing/js \
+ -I$(top_builddir)/DerivedSources \
-I$(top_builddir)/Source/WebKit/gtk \
- -I$(top_builddir)/DerivedSources \
- $(global_cppflags) \
$(_javascript_core_cppflags)
-Programs_DumpRenderTree_CPPFLAGS = $(dumprendertree_cppflags)
+if TARGET_X11
+Programs_DumpRenderTree_CPPFLAGS += \
+ -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
+ -DFONTS_CONF_DIR=\"${shell pwd}/${srcdir}/Tools/DumpRenderTree/gtk/fonts\"
+endif
Programs_DumpRenderTree_SOURCES = \
Tools/DumpRenderTree/DumpRenderTree.h \
@@ -95,12 +126,10 @@
Programs_DumpRenderTree_CXXFLAGS = \
$(global_cxxflags) \
- $(dumprendertree_cppflags) \
$(Programs_DumpRenderTree_CFLAGS)
Programs_DumpRenderTree_CFLAGS = \
-fno-strict-aliasing \
- $(dumprendertree_cppflags) \
$(global_cflags) \
$(GLOBALDEPS_CFLAGS) \
$(CAIRO_CFLAGS) \
@@ -110,6 +139,7 @@
Programs_DumpRenderTree_LDADD = \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
+ libWebCoreInternals.la \
$(GLOBALDEPS_LIBS) \
$(CAIRO_LIBS) \
$(GTK_LIBS) \
@@ -159,10 +189,6 @@
noinst_LTLIBRARIES += \
TestNetscapePlugin/libtestnetscapeplugin.la
-dumprendertree_cppflags += \
- -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
- -DFONTS_CONF_DIR=\"${shell pwd}/${srcdir}/Tools/DumpRenderTree/gtk/fonts\"
-
TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \
-I$(srcdir)/Tools/DumpRenderTree \
-I$(srcdir)/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders \
