From fde397491fb21b8489f186e1a59c21d7777a4157 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Tue, 21 Feb 2012 02:16:13 +0000 Subject: [PATCH] [GTK] [Qt] Move the unix forwarding headers for TestNetscapePlugin to the TestNetscapePlugin directory https://bugs.webkit.org/show_bug.cgi?id=78935 Patch by Martin Robinson on 2012-02-20 Reviewed by Gustavo Noronha Silva. Move the TestNetscapePlugin headers to a more appropriate directory and update the build files to match. * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h. * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h. * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h. * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro: Update build. * GNUmakefile.am: Ditto. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108280 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 16 ++++++++++++++++ .../unix}/ForwardingHeaders/WebKit/npapi.h | 0 .../unix}/ForwardingHeaders/WebKit/npfunctions.h | 0 .../unix}/ForwardingHeaders/WebKit/npruntime.h | 0 .../qt/TestNetscapePlugin/TestNetscapePlugin.pro | 4 ++-- Tools/GNUmakefile.am | 10 +++++----- 6 files changed, 23 insertions(+), 7 deletions(-) rename Tools/DumpRenderTree/{unix/TestNetscapePlugin => TestNetscapePlugIn/unix}/ForwardingHeaders/WebKit/npapi.h (100%) rename Tools/DumpRenderTree/{unix/TestNetscapePlugin => TestNetscapePlugIn/unix}/ForwardingHeaders/WebKit/npfunctions.h (100%) rename Tools/DumpRenderTree/{unix/TestNetscapePlugin => TestNetscapePlugIn/unix}/ForwardingHeaders/WebKit/npruntime.h (100%) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 8329f03..f703ba6 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,19 @@ +2012-02-20 Martin Robinson + + [GTK] [Qt] Move the unix forwarding headers for TestNetscapePlugin to the TestNetscapePlugin directory + https://bugs.webkit.org/show_bug.cgi?id=78935 + + Reviewed by Gustavo Noronha Silva. + + Move the TestNetscapePlugin headers to a more appropriate directory and update + the build files to match. + + * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h. + * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h. + * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h: Renamed from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h. + * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro: Update build. + * GNUmakefile.am: Ditto. + 2012-02-20 Kihong Kwon Add a new API for the Vibration API(W3C). diff --git a/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h b/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h similarity index 100% rename from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h rename to Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h diff --git a/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h b/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h similarity index 100% rename from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h rename to Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h diff --git a/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h b/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h similarity index 100% rename from Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h rename to Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h diff --git a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro index cbcd921..efe946d 100644 --- a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro +++ b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro @@ -36,8 +36,8 @@ VPATH = ../../unix/TestNetscapePlugin ../../TestNetscapePlugIn INCLUDEPATH += \ - ../../unix/TestNetscapePlugin/ForwardingHeaders \ - ../../unix/TestNetscapePlugin/ForwardingHeaders/WebKit \ + ../../TestNetscapePlugIn/unix/ForwardingHeaders \ + ../../TestNetscapePlugIn/unix/ForwardingHeaders/WebKit \ ../../TestNetscapePlugIn DESTDIR = $${ROOT_BUILD_DIR}/lib/plugins diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am index fc8ed6b..981f6081 100644 --- a/Tools/GNUmakefile.am +++ b/Tools/GNUmakefile.am @@ -188,11 +188,11 @@ noinst_LTLIBRARIES += \ TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \ -I$(srcdir)/Tools/DumpRenderTree \ - -I$(srcdir)/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders \ -I$(srcdir)/Source/WebCore \ -I$(srcdir)/Source/WebCore/bridge \ -I$(srcdir)/Source/WebCore/plugins \ -I$(srcdir)/Tools/DumpRenderTree/TestNetscapePlugIn \ + -I$(srcdir)/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders \ $(global_cppflags) \ $(javascriptcore_cppflags) @@ -202,9 +202,6 @@ TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS += -DXP_UNIX endif TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES = \ - Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h \ - Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h \ - Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h \ Tools/DumpRenderTree/TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp \ Tools/DumpRenderTree/TestNetscapePlugIn/Tests/EvaluateJSAfterRemovingPluginElement.cpp \ Tools/DumpRenderTree/TestNetscapePlugIn/Tests/FormValue.cpp \ @@ -227,7 +224,10 @@ TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES = \ Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h \ Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp \ Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.h \ - Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp + Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp \ + Tools/DumpRenderTree/TestNetscapePlugin/unix/ForwardingHeaders/WebKit/npapi.h \ + Tools/DumpRenderTree/TestNetscapePlugin/unix/ForwardingHeaders/WebKit/npfunctions.h \ + Tools/DumpRenderTree/TestNetscapePlugin/unix/ForwardingHeaders/WebKit/npruntime.h TestNetscapePlugin_libtestnetscapeplugin_la_LDFLAGS = \ -rpath ${shell pwd}/$(top_builddir)/../unix/TestNetscapePlugin/.libs \ -- 2.7.4