Diff
Modified: trunk/Source/WebCore/ChangeLog (143868 => 143869)
--- trunk/Source/WebCore/ChangeLog 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebCore/ChangeLog 2013-02-24 17:42:28 UTC (rev 143869)
@@ -1,3 +1,15 @@
+2013-02-24 Gustavo Noronha Silva <g...@gnome.org>
+
+ [GTK] GTK+ 2 build broken since GTK_API_VERSION_2 moved to autoconfig.h
+ https://bugs.webkit.org/show_bug.cgi?id=110702
+
+ Reviewed by Martin Robinson.
+
+ No tests. Build fix, no behaviour change.
+
+ * platform/gtk/GtkVersioning.h: include the autotoolsconfig.h header,
+ which contains the GTK_API_VERSION_2 define now.
+
2013-02-24 Andreas Kling <akl...@apple.com>
StyledElement: Don't expose a mutable direct interface to the inline style.
Modified: trunk/Source/WebCore/platform/gtk/GtkVersioning.h (143868 => 143869)
--- trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2013-02-24 17:42:28 UTC (rev 143869)
@@ -21,6 +21,7 @@
#ifndef GtkVersioning_h
#define GtkVersioning_h
+#include "autotoolsconfig.h"
#include <gtk/gtk.h>
#ifndef GTK_API_VERSION_2
Modified: trunk/Source/WebKit/gtk/ChangeLog (143868 => 143869)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-02-24 17:42:28 UTC (rev 143869)
@@ -1,3 +1,39 @@
+2013-02-24 Gustavo Noronha Silva <g...@gnome.org>
+
+ [GTK] GTK+ 2 build broken since GTK_API_VERSION_2 moved to autoconfig.h
+ https://bugs.webkit.org/show_bug.cgi?id=110702
+
+ Reviewed by Martin Robinson.
+
+ * tests/testapplicationcache.c: include autotoolsconfig.h.
+ * tests/testatk.c: ditto.
+ * tests/testatkroles.c: ditto.
+ * tests/testcontextmenu.c: ditto.
+ * tests/testcopyandpaste.c: ditto.
+ * tests/testdomdocument.c: ditto.
+ * tests/testdomdomwindow.c: ditto.
+ * tests/testdomnode.c: ditto.
+ * tests/testdownload.c: ditto.
+ * tests/testfavicondatabase.c: ditto.
+ * tests/testglobals.c: ditto.
+ * tests/testhittestresult.c: ditto.
+ * tests/testhttpbackend.c: ditto.
+ * tests/testkeyevents.c: ditto.
+ * tests/testloading.c: ditto.
+ * tests/testmimehandling.c: ditto.
+ * tests/testnetworkrequest.c: ditto.
+ * tests/testnetworkresponse.c: ditto.
+ * tests/testwebbackforwardlist.c: ditto.
+ * tests/testwebdatasource.c: ditto.
+ * tests/testwebframe.c: ditto.
+ * tests/testwebhistoryitem.c: ditto.
+ * tests/testwebinspector.c: ditto.
+ * tests/testwebplugindatabase.c: ditto.
+ * tests/testwebresource.c: ditto.
+ * tests/testwebsettings.c: ditto.
+ * tests/testwebview.c: ditto.
+ * tests/testwindow.c: ditto.
+
2013-02-23 Jason Anderssen <janders...@gmail.com>
Move setAutofilled from TestRunner to WebCore
Modified: trunk/Source/WebKit/gtk/tests/testapplicationcache.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testapplicationcache.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testapplicationcache.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <glib.h>
#include <glib/gprintf.h>
#include <gtk/gtk.h>
Modified: trunk/Source/WebKit/gtk/tests/testatk.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testatk.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testatk.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <errno.h>
#include <glib.h>
#include <glib/gstdio.h>
Modified: trunk/Source/WebKit/gtk/tests/testatkroles.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testatkroles.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testatkroles.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -18,6 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <glib.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
Modified: trunk/Source/WebKit/gtk/tests/testcontextmenu.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testcontextmenu.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testcontextmenu.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <webkit/webkit.h>
#if GTK_CHECK_VERSION(2, 14, 0)
Modified: trunk/Source/WebKit/gtk/tests/testcopyandpaste.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testcopyandpaste.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testcopyandpaste.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <errno.h>
#include <unistd.h>
#include <string.h>
Modified: trunk/Source/WebKit/gtk/tests/testdomdocument.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testdomdocument.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testdomdocument.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include "test_utils.h"
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testdomdomwindow.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testdomdomwindow.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testdomdomwindow.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include "test_utils.h"
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testdomnode.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testdomnode.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testdomnode.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include "test_utils.h"
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testdownload.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testdownload.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testdownload.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <errno.h>
#include <unistd.h>
#include <glib/gstdio.h>
Modified: trunk/Source/WebKit/gtk/tests/testfavicondatabase.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testfavicondatabase.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testfavicondatabase.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include "test_utils.h"
#include <glib/gstdio.h>
#include <gtk/gtk.h>
Modified: trunk/Source/WebKit/gtk/tests/testglobals.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testglobals.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testglobals.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <gtk/gtk.h>
#include <libsoup/soup.h>
#include <webkit/webkit.h>
Modified: trunk/Source/WebKit/gtk/tests/testhittestresult.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testhittestresult.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testhittestresult.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <errno.h>
#include <unistd.h>
#include <glib/gstdio.h>
Modified: trunk/Source/WebKit/gtk/tests/testhttpbackend.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testhttpbackend.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testhttpbackend.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <errno.h>
#include <unistd.h>
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testkeyevents.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testkeyevents.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testkeyevents.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <errno.h>
#include <unistd.h>
#include <string.h>
Modified: trunk/Source/WebKit/gtk/tests/testloading.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testloading.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testloading.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -18,6 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <gtk/gtk.h>
#include <libsoup/soup.h>
#include <string.h>
Modified: trunk/Source/WebKit/gtk/tests/testmimehandling.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testmimehandling.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testmimehandling.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -18,6 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include "test_utils.h"
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testnetworkrequest.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testnetworkrequest.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testnetworkrequest.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <errno.h>
#include <unistd.h>
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testnetworkresponse.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testnetworkresponse.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testnetworkresponse.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -18,6 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <errno.h>
#include <unistd.h>
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebbackforwardlist.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testwebbackforwardlist.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testwebbackforwardlist.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <webkit/webkit.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebdatasource.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testwebdatasource.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testwebdatasource.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <webkit/webkit.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebframe.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testwebframe.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testwebframe.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -18,6 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <errno.h>
#include <unistd.h>
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebhistoryitem.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testwebhistoryitem.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testwebhistoryitem.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <webkit/webkit.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebinspector.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testwebinspector.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testwebinspector.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include "test_utils.h"
#include <string.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebplugindatabase.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testwebplugindatabase.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testwebplugindatabase.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <errno.h>
#include <glib.h>
#include <glib/gstdio.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebresource.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testwebresource.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testwebresource.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <libsoup/soup.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebsettings.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testwebsettings.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testwebsettings.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <webkit/webkit.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebview.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testwebview.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testwebview.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -19,6 +19,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include "test_utils.h"
#include <errno.h>
Modified: trunk/Source/WebKit/gtk/tests/testwindow.c (143868 => 143869)
--- trunk/Source/WebKit/gtk/tests/testwindow.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Source/WebKit/gtk/tests/testwindow.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include "autotoolsconfig.h"
#include <gtk/gtk.h>
#include <webkit/webkit.h>
Modified: trunk/Tools/ChangeLog (143868 => 143869)
--- trunk/Tools/ChangeLog 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Tools/ChangeLog 2013-02-24 17:42:28 UTC (rev 143869)
@@ -1,3 +1,15 @@
+2013-02-24 Gustavo Noronha Silva <g...@gnome.org>
+
+ [GTK] GTK+ 2 build broken since GTK_API_VERSION_2 moved to autoconfig.h
+ https://bugs.webkit.org/show_bug.cgi?id=110702
+
+ Reviewed by Martin Robinson.
+
+ * GtkLauncher/main.c: include autotoolsconfig.h.
+ * Scripts/webkitpy/style/checker.py: make GtkLauncher/main.c exempt of
+ the include ordering check, since it uses autotoolsconfig.h which needs to
+ come first.
+
2013-02-24 Hajime Morrita <morr...@google.com>
[Custom Elements] Implement bare-bone document.register()
Modified: trunk/Tools/GtkLauncher/main.c (143868 => 143869)
--- trunk/Tools/GtkLauncher/main.c 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Tools/GtkLauncher/main.c 2013-02-24 17:42:28 UTC (rev 143869)
@@ -25,6 +25,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "autotoolsconfig.h"
#include "LauncherInspectorWindow.h"
#include <errno.h>
#include <gst/gst.h>
Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (143868 => 143869)
--- trunk/Tools/Scripts/webkitpy/style/checker.py 2013-02-24 16:45:21 UTC (rev 143868)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2013-02-24 17:42:28 UTC (rev 143869)
@@ -165,6 +165,11 @@
"Source/WebKit2/UIProcess/API/qt"],
["-readability/parameter_name"]),
+ ([# The GTK+ port uses the autotoolsconfig.h header in some C sources
+ # to serve the same purpose of config.h.
+ "Tools/GtkLauncher/main.c"],
+ ["-build/include_order"]),
+
([# The GTK+ APIs use GTK+ naming style, which includes
# lower-cased, underscore-separated values, whitespace before
# parens for function calls, and always having variable names.
