git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1179a74)
2011-06-03 Martin Robinson <mrobinson@igalia.com>
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Jun 2011 21:39:13 +0000 (21:39 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Jun 2011 21:39:13 +0000 (21:39 +0000)
        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  Martin Robinson  <mrobinson@igalia.com>

        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  Martin Robinson  <mrobinson@igalia.com>

        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  Martin Robinson  <mrobinson@igalia.com>

        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.

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

ChangeLog patch | blob | history
LayoutTests/ChangeLog patch | blob | history
LayoutTests/platform/gtk/Skipped patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/GNUmakefile.am patch | blob | history
Source/autotools/symbols.filter patch | blob | history
Tools/ChangeLog patch | blob | history
Tools/DumpRenderTree/gtk/DumpRenderTree.cpp patch | blob | history
Tools/GNUmakefile.am patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 8ef49ff..1c0685c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-06-03  Martin Robinson  <mrobinson@igalia.com>
+
+        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  <alexis.menard@openbossa.org>
 
         Reviewed by Benjamin Poulain.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 695081c..387fb7a 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-06-03  Martin Robinson  <mrobinson@igalia.com>
+
+        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  <laszlo.1.gombos@nokia.com>
 
         Reviewed by Antonio Gomes.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 6ab7811..423a9c1 100644 (file)
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -1529,6 +1529,3 @@ http/tests/eventsource/workers/eventsource-simple.html
 
 # 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
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4d8fe7e..90f8e6b 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-06-03  Martin Robinson  <mrobinson@igalia.com>
+
+        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  <leviw@chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
index 2816a4b..3ccb0a9 100644 (file)
--- a/Source/WebCore/GNUmakefile.am
+++ b/Source/WebCore/GNUmakefile.am
@@ -76,6 +76,8 @@ webcore_cppflags += \
        -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 @@ IDL_PATH := \
     $(WebCore)/plugins \
     $(WebCore)/storage \
     $(WebCore)/svg \
+    $(WebCore)/testing \
     $(WebCore)/webaudio \
     $(WebCore)/websockets \
     $(WebCore)/workers \
@@ -780,6 +783,7 @@ EXTRA_DIST += \
        $(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) \
diff --git a/Source/autotools/symbols.filter b/Source/autotools/symbols.filter
index 7e4781b..733a69f 100644 (file)
--- a/Source/autotools/symbols.filter
+++ b/Source/autotools/symbols.filter
@@ -26,6 +26,9 @@ _ZN3WTF7CStringC2EPKcm;
 _ZN3WTF7CStringD1Ev;
 _ZN3WTF7CStringaSERKS0_;
 _ZN24DumpRenderTreeSupportGtk*;
+_ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE;
+_ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE;
+_ZN7WebCore12JSDOMWrapper34virtualFunctionToPreventWeakVtableEv;
 local:
 _Z*;
 cti*;
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b90ea91..99673b1 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2011-06-03  Martin Robinson  <mrobinson@igalia.com>
+
+        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  <dpranke@chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
index a671e1f..0cde3c9 100644 (file)
--- a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -42,6 +42,7 @@
 #include "PlainTextController.h"
 #include "TextInputController.h"
 #include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
+#include "WebCoreTestSupport.h"
 #include "WorkQueue.h"
 #include "WorkQueueItem.h"
 #include <JavaScriptCore/JavaScript.h>
@@ -840,6 +841,7 @@ static void webViewWindowObjectCleared(WebKitWebView* view, WebKitWebFrame* fram
     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)
diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am
index 5f71d63..3ea6bd0 100644 (file)
--- a/Tools/GNUmakefile.am
+++ b/Tools/GNUmakefile.am
@@ -34,20 +34,51 @@ Programs_GtkLauncher_LDFLAGS = \
        -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) \
+       $(javascriptcore_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$(top_builddir)/Source/WebKit/gtk \
+       -I$(srcdir)/Source/WebCore/testing/js \
        -I$(top_builddir)/DerivedSources \
-       $(global_cppflags) \
+       -I$(top_builddir)/Source/WebKit/gtk \
        $(javascriptcore_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_SOURCES = \
 
 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_CFLAGS = \
 Programs_DumpRenderTree_LDADD = \
        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
        libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+       libWebCoreInternals.la \
        $(GLOBALDEPS_LIBS) \
        $(CAIRO_LIBS) \
        $(GTK_LIBS) \
@@ -159,10 +189,6 @@ if TARGET_X11
 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 \
Mirror of the WebKit open source project from svn.webkit.org.