2008-01-31 Alp Toker <alp@atoker.com>

        Reviewed by Adam Roben.

        http://bugs.webkit.org/show_bug.cgi?id=17006
        [GTK] Header path should be webkit/webkit.h

        Move the GTK+ API sources as needed and update the build systems.

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

diff --git a/ChangeLog b/ChangeLog
index 779b9200b7576e53c480822843941a1b96941738..345ae171db886f145ef6c57c1d83d4c50a5f7cd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-31  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Adam Roben.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17006
+        [GTK] Header path should be webkit/webkit.h
+
+        Move the GTK+ API sources as needed and update the build systems.
+
+        * GNUmakefile.am:
+        * WebKit.pri:
+
 2008-01-27  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
 
         Reviewed by Alp Toker.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index c2a4d3a9de86db775ff53d6397971b309f752d63..71cc5e89f3c1a4453668ff3d5a2ea52ee75f889a 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -125,7 +125,7 @@ webkitgtk_cleanfiles :=
 
 # No need to touch the following variables unless you have to. If you need to change the values
 # for the following variables, use the "webkitgtk_" variables above
-libWebKitGtk_ladir := $(prefix)/include/WebKit
+libWebKitGtk_ladir := $(prefix)/include/WebKit/webkit
 
 libWebKitGtk_la_HEADERS = $(webkitgtk_h_api)
 
@@ -229,26 +229,26 @@ endif
 #
 # WEBKIT GTK+
 webkitgtk_cppflags += \
--I$(top_builddir)/WebKit/gtk/WebView \
+-I$(top_builddir)/WebKit/gtk/webkit \
 -DBUILDING_CAIRO__=1 \
 -DBUILD_WEBKIT
 
 webkitgtk_h_api += \
-       WebKit/gtk/WebView/webkit.h \
-       WebKit/gtk/WebView/webkitdefines.h \
-       WebKit/gtk/WebView/webkitnetworkrequest.h \
-       WebKit/gtk/WebView/webkitwebbackforwardlist.h \
-       WebKit/gtk/WebView/webkitwebframe.h \
-       WebKit/gtk/WebView/webkitwebhistoryitem.h \
-       WebKit/gtk/WebView/webkitwebsettings.h \
-       WebKit/gtk/WebView/webkitwebview.h 
+       WebKit/gtk/webkit/webkit.h \
+       WebKit/gtk/webkit/webkitdefines.h \
+       WebKit/gtk/webkit/webkitnetworkrequest.h \
+       WebKit/gtk/webkit/webkitwebbackforwardlist.h \
+       WebKit/gtk/webkit/webkitwebframe.h \
+       WebKit/gtk/webkit/webkitwebhistoryitem.h \
+       WebKit/gtk/webkit/webkitwebsettings.h \
+       WebKit/gtk/webkit/webkitwebview.h 
 
 webkitgtk_built_sources += \
-       WebKit/gtk/WebView/webkit-marshal.h \
-       WebKit/gtk/WebView/webkit-marshal.cpp
+       WebKit/gtk/webkit/webkit-marshal.h \
+       WebKit/gtk/webkit/webkit-marshal.cpp
 
 webkitgtk_headers += \
-       WebKit/gtk/WebView/webkitprivate.h \
+       WebKit/gtk/webkit/webkitprivate.h \
        WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
        WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
        WebKit/gtk/WebCoreSupport/DragClientGtk.h \
@@ -258,13 +258,13 @@ webkitgtk_headers += \
        WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
 
 webkitgtk_sources += \
-       WebKit/gtk/WebView/webkitnetworkrequest.cpp \
-       WebKit/gtk/WebView/webkitprivate.cpp \
-       WebKit/gtk/WebView/webkitwebbackforwardlist.cpp \
-       WebKit/gtk/WebView/webkitwebframe.cpp \
-       WebKit/gtk/WebView/webkitwebhistoryitem.cpp \
-       WebKit/gtk/WebView/webkitwebsettings.cpp \
-       WebKit/gtk/WebView/webkitwebview.cpp \
+       WebKit/gtk/webkit/webkitnetworkrequest.cpp \
+       WebKit/gtk/webkit/webkitprivate.cpp \
+       WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
+       WebKit/gtk/webkit/webkitwebframe.cpp \
+       WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
+       WebKit/gtk/webkit/webkitwebsettings.cpp \
+       WebKit/gtk/webkit/webkitwebview.cpp \
        WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
        WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
        WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
@@ -280,17 +280,17 @@ webkitgtk_cleanfiles += \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc
 
-WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/WebView/webkit-marshal
-WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/WebView/webkit-marshal.list
+WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal
+WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list
 
 stamp_files := \
        stamp-webkit-marshal.cpp \
        stamp-webkit-marshal.h
 
-WebKit/gtk/WebView/webkit-marshal.cpp: stamp-webkit-marshal.cpp
+WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp
        @true
 
-WebKit/gtk/WebView/webkit-marshal.h: stamp-webkit-marshal.h
+WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h
        @true
 
 stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 77f61c5b19a4faa07aca62fdc0486230f9d46169..a470f68bee4a93470bfc5c0de623eea7dbaca1c0 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-31  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Adam Roben.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17006
+        [GTK] Header path should be webkit/webkit.h
+
+        Move the GTK+ API sources as needed and update the build systems.
+
+        * GNUmakefile.am:
+        * WebCore.pro:
+
 2008-01-31  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Geoff Garen.

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 74cf5208e362847245e73963f333d468297e39a4..e6fcaa6859a53619cfe0f316e986c4a99063bebb 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -40,8 +40,9 @@ webkitgtk_cppflags += \
        -I$(srcdir)/WebCore/platform/graphics/cairo \
        -I$(srcdir)/WebCore/loader/gtk \
        -I$(srcdir)/WebCore/page/gtk \
+       -I$(srcdir)/WebKit/gtk \
        -I$(srcdir)/WebKit/gtk/WebCoreSupport \
-       -I$(srcdir)/WebKit/gtk/WebView
+       -I$(srcdir)/WebKit/gtk/webkit
 
 webcore_built_nosources += \
        DerivedSources/DocTypeStrings.cpp \

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 3cac2fd8968fb0dfe3f0bb5b76b734ecc3a1a0ac..711fee8e354b4622621ae51cf5c39635f03114b5 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -154,8 +154,9 @@ gtk-port {
     $$PWD/platform/image-decoders/xbm \
     $$PWD/loader/gtk \
     $$PWD/page/gtk \
+    $$PWD/../WebKit/gtk \
     $$PWD/../WebKit/gtk/WebCoreSupport \
-    $$PWD/../WebKit/gtk/WebView
+    $$PWD/../WebKit/gtk/webkit
 
     DEPENDPATH += \
     platform/gtk \
@@ -172,8 +173,9 @@ gtk-port {
     platform/image-decoders/xbm \
     loader/gtk \
     page/gtk \
+    ../WebKit/gtk \
     ../WebKit/gtk/WebCoreSupport \
-    ../WebKit/gtk/WebView
+    ../WebKit/gtk/webkit
 }
 
 INCLUDEPATH +=  $$PWD \
@@ -986,15 +988,15 @@ gtk-port {
     HEADERS += \
         ../WebCore/platform/gtk/ClipboardGtk.h \
         ../WebCore/platform/gtk/PasteboardHelper.h \
-        ../WebKit/gtk/WebView/webkit.h \
-        ../WebKit/gtk/WebView/webkitdefines.h \
-        ../WebKit/gtk/WebView/webkitnetworkrequest.h \
-        ../WebKit/gtk/WebView/webkitprivate.h \
-        ../WebKit/gtk/WebView/webkitwebbackforwardlist.h \
-        ../WebKit/gtk/WebView/webkitwebframe.h \
-        ../WebKit/gtk/WebView/webkitwebhistoryitem.h \
-        ../WebKit/gtk/WebView/webkitwebsettings.h \
-        ../WebKit/gtk/WebView/webkitwebview.h \
+        ../WebKit/gtk/webkit/webkit.h \
+        ../WebKit/gtk/webkit/webkitdefines.h \
+        ../WebKit/gtk/webkit/webkitnetworkrequest.h \
+        ../WebKit/gtk/webkit/webkitprivate.h \
+        ../WebKit/gtk/webkit/webkitwebbackforwardlist.h \
+        ../WebKit/gtk/webkit/webkitwebframe.h \
+        ../WebKit/gtk/webkit/webkitwebhistoryitem.h \
+        ../WebKit/gtk/webkit/webkitwebsettings.h \
+        ../WebKit/gtk/webkit/webkitwebview.h \
         ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
         ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
         ../WebKit/gtk/WebCoreSupport/DragClientGtk.h \
@@ -1067,13 +1069,13 @@ gtk-port {
         platform/image-decoders/bmp/BMPImageDecoder.cpp \
         platform/image-decoders/ico/ICOImageDecoder.cpp \
         platform/image-decoders/xbm/XBMImageDecoder.cpp \
-        ../WebKit/gtk/WebView/webkitnetworkrequest.cpp \
-        ../WebKit/gtk/WebView/webkitprivate.cpp \
-        ../WebKit/gtk/WebView/webkitwebbackforwardlist.cpp \
-        ../WebKit/gtk/WebView/webkitwebframe.cpp \
-        ../WebKit/gtk/WebView/webkitwebhistoryitem.cpp \
-        ../WebKit/gtk/WebView/webkitwebsettings.cpp \
-        ../WebKit/gtk/WebView/webkitwebview.cpp \
+        ../WebKit/gtk/webkit/webkitnetworkrequest.cpp \
+        ../WebKit/gtk/webkit/webkitprivate.cpp \
+        ../WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
+        ../WebKit/gtk/webkit/webkitwebframe.cpp \
+        ../WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
+        ../WebKit/gtk/webkit/webkitwebsettings.cpp \
+        ../WebKit/gtk/webkit/webkitwebview.cpp \
         ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
         ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
         ../WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
@@ -1794,7 +1796,7 @@ gtk-port {
     target.path = $$WEBKIT_LIB_DIR
     INSTALLS += target
 
-    include($$PWD/../WebKit/gtk/WebView/headers.pri)
+    include($$PWD/../WebKit/gtk/webkit/headers.pri)
     headers.files = $$WEBKIT_API_HEADERS
     headers.path = $$WEBKIT_INC_DIR
     INSTALLS += headers
@@ -1814,7 +1816,7 @@ gtk-port {
         QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
     }
 
-    GENMARSHALS = ../WebKit/gtk/WebView/webkit-marshal.list
+    GENMARSHALS = ../WebKit/gtk/webkit/webkit-marshal.list
     GENMARSHALS_PREFIX = webkit_marshal
 
     #

diff --git a/WebKit.pri b/WebKit.pri
index d8fc9fd3101cb853f24811039948b9424588e830..55de9b370e7564e48dbfbf37bed6e39f43290579 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -17,7 +17,7 @@ qt-port:!building-libs {
 gtk-port:!building-libs {
     QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
     LIBS += -lWebKitGtk
-    DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport
+    DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit
 }
 
 gtk-port {
@@ -73,8 +73,9 @@ gtk-port:INCLUDEPATH += \
     $$BASE_DIR/WebCore/platform/graphics/cairo \
     $$BASE_DIR/WebCore/loader/gtk \
     $$BASE_DIR/WebCore/page/gtk \
-    $$BASE_DIR/WebKit/gtk/WebView \
-    $$BASE_DIR/WebKit/gtk/WebCoreSupport
+    $$BASE_DIR/WebKit/gtk \
+    $$BASE_DIR/WebKit/gtk/WebCoreSupport \
+    $$BASE_DIR/WebKit/gtk/webkit
 INCLUDEPATH += \
     $$BASE_DIR/JavaScriptCore/ \
     $$BASE_DIR/JavaScriptCore/kjs \

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index d5aba3a758f78861c8485d16ce8153cc5b610526..0acbac73655bf83e5a46b644e262a4f1c60fd08b 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,41 @@
+2008-01-31  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Adam Roben.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17006
+        [GTK] Header path should be webkit/webkit.h
+
+        Move the GTK+ API sources as needed and update the build systems.
+
+        * WebView: Removed.
+        * WebView/headers.pri: Removed.
+        * WebView/webkit-marshal.list: Removed.
+        * WebView/webkit.h: Removed.
+        * WebView/webkitdefines.h: Removed.
+        * WebView/webkitnetworkrequest.cpp: Removed.
+        * WebView/webkitnetworkrequest.h: Removed.
+        * WebView/webkitprivate.cpp: Removed.
+        * WebView/webkitprivate.h: Removed.
+        * WebView/webkitwebbackforwardlist.cpp: Removed.
+        * WebView/webkitwebbackforwardlist.h: Removed.
+        * WebView/webkitwebframe.cpp: Removed.
+        * WebView/webkitwebframe.h: Removed.
+        * WebView/webkitwebhistoryitem.cpp: Removed.
+        * WebView/webkitwebhistoryitem.h: Removed.
+        * WebView/webkitwebsettings.cpp: Removed.
+        * WebView/webkitwebsettings.h: Removed.
+        * WebView/webkitwebview.cpp: Removed.
+        * WebView/webkitwebview.h: Removed.
+        * webkit: Copied from WebKit/gtk/WebView.
+        * webkit/webkit.h:
+        * webkit/webkitnetworkrequest.h:
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebbackforwardlist.h:
+        * webkit/webkitwebframe.h:
+        * webkit/webkitwebhistoryitem.h:
+        * webkit/webkitwebsettings.h:
+        * webkit/webkitwebview.h:
+
 2008-01-27  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
 
         Reviewed by Alp Toker.

diff --git a/WebKit/gtk/WebView/headers.pri b/WebKit/gtk/webkit/headers.pri
similarity index 100%
rename from WebKit/gtk/WebView/headers.pri
rename to WebKit/gtk/webkit/headers.pri

diff --git a/WebKit/gtk/WebView/webkit-marshal.list b/WebKit/gtk/webkit/webkit-marshal.list
similarity index 100%
rename from WebKit/gtk/WebView/webkit-marshal.list
rename to WebKit/gtk/webkit/webkit-marshal.list

diff --git a/WebKit/gtk/WebView/webkit.h b/WebKit/gtk/webkit/webkit.h
similarity index 77%
rename from WebKit/gtk/WebView/webkit.h
rename to WebKit/gtk/webkit/webkit.h
index 4412cf6117657c899871a08fe0e11cb38e649eb1..babd50a50c05e38ff3887915be3ebbc22309b491 100644 (file)
--- a/WebKit/gtk/WebView/webkit.h
+++ b/WebKit/gtk/webkit/webkit.h
@@ -20,12 +20,12 @@
 #ifndef __WEBKIT_H__
 #define __WEBKIT_H__
 
-#include <webkitdefines.h>
-#include <webkitnetworkrequest.h>
-#include <webkitwebframe.h>
-#include <webkitwebsettings.h>
-#include <webkitwebview.h>
-#include <webkitwebbackforwardlist.h>
-#include <webkitwebhistoryitem.h>
+#include <webkit/webkitdefines.h>
+#include <webkit/webkitnetworkrequest.h>
+#include <webkit/webkitwebframe.h>
+#include <webkit/webkitwebsettings.h>
+#include <webkit/webkitwebview.h>
+#include <webkit/webkitwebbackforwardlist.h>
+#include <webkit/webkitwebhistoryitem.h>
 
 #endif /* __WEBKIT_H__ */

diff --git a/WebKit/gtk/WebView/webkitdefines.h b/WebKit/gtk/webkit/webkitdefines.h
similarity index 100%
rename from WebKit/gtk/WebView/webkitdefines.h
rename to WebKit/gtk/webkit/webkitdefines.h

diff --git a/WebKit/gtk/WebView/webkitnetworkrequest.cpp b/WebKit/gtk/webkit/webkitnetworkrequest.cpp
similarity index 100%
rename from WebKit/gtk/WebView/webkitnetworkrequest.cpp
rename to WebKit/gtk/webkit/webkitnetworkrequest.cpp

diff --git a/WebKit/gtk/WebView/webkitnetworkrequest.h b/WebKit/gtk/webkit/webkitnetworkrequest.h
similarity index 98%
rename from WebKit/gtk/WebView/webkitnetworkrequest.h
rename to WebKit/gtk/webkit/webkitnetworkrequest.h
index 46d5cc68f94f0a5b8bafa09c7b833daf303649fb..91c061ae64b23f6adb1bdd88795b8a02f5654358 100644 (file)
--- a/WebKit/gtk/WebView/webkitnetworkrequest.h
+++ b/WebKit/gtk/webkit/webkitnetworkrequest.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "webkitdefines.h"
+#include <webkit/webkitdefines.h>
 
 G_BEGIN_DECLS
 

diff --git a/WebKit/gtk/WebView/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp
similarity index 100%
rename from WebKit/gtk/WebView/webkitprivate.cpp
rename to WebKit/gtk/webkit/webkitprivate.cpp

diff --git a/WebKit/gtk/WebView/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
similarity index 94%
rename from WebKit/gtk/WebView/webkitprivate.h
rename to WebKit/gtk/webkit/webkitprivate.h
index 3443cd43493474f27267e22f747182df1541c3f3..3e407f7c90982f68f0d8169d74576fa4060759f8 100644 (file)
--- a/WebKit/gtk/WebView/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -27,12 +27,12 @@
  * They are using WebCore which musn't be exposed to the outer world.
  */
 
-#include "webkitdefines.h"
-#include "webkitwebview.h"
-#include "webkitwebframe.h"
-#include "webkitwebsettings.h"
-#include "webkitnetworkrequest.h"
-#include "webkitwebbackforwardlist.h"
+#include <webkit/webkitdefines.h>
+#include <webkit/webkitwebview.h>
+#include <webkit/webkitwebframe.h>
+#include <webkit/webkitwebsettings.h>
+#include <webkit/webkitnetworkrequest.h>
+#include <webkit/webkitwebbackforwardlist.h>
 
 #include "BackForwardList.h"
 #include "HistoryItem.h"

diff --git a/WebKit/gtk/WebView/webkitwebbackforwardlist.cpp b/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
similarity index 100%
rename from WebKit/gtk/WebView/webkitwebbackforwardlist.cpp
rename to WebKit/gtk/webkit/webkitwebbackforwardlist.cpp

diff --git a/WebKit/gtk/WebView/webkitwebbackforwardlist.h b/WebKit/gtk/webkit/webkitwebbackforwardlist.h
similarity index 98%
rename from WebKit/gtk/WebView/webkitwebbackforwardlist.h
rename to WebKit/gtk/webkit/webkitwebbackforwardlist.h
index 61fe9cf6b80358d75ea4a5ea311bdf1abf69c1bf..58e76671e20998f28b9a93505f073909fb03de93 100644 (file)
--- a/WebKit/gtk/WebView/webkitwebbackforwardlist.h
+++ b/WebKit/gtk/webkit/webkitwebbackforwardlist.h
@@ -23,8 +23,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "webkitdefines.h"
-#include "webkitwebhistoryitem.h"
+#include <webkit/webkitdefines.h>
+#include <webkit/webkitwebhistoryitem.h>
 
 G_BEGIN_DECLS
 

diff --git a/WebKit/gtk/WebView/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
similarity index 100%
rename from WebKit/gtk/WebView/webkitwebframe.cpp
rename to WebKit/gtk/webkit/webkitwebframe.cpp

diff --git a/WebKit/gtk/WebView/webkitwebframe.h b/WebKit/gtk/webkit/webkitwebframe.h
similarity index 98%
rename from WebKit/gtk/WebView/webkitwebframe.h
rename to WebKit/gtk/webkit/webkitwebframe.h
index af9093862539359e692f0d64f3f39f3a39bfde2a..be2d276f8ba55c5a76bc345af151463707bd167b 100644 (file)
--- a/WebKit/gtk/WebView/webkitwebframe.h
+++ b/WebKit/gtk/webkit/webkitwebframe.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <JavaScriptCore/JSBase.h>
 
-#include "webkitdefines.h"
+#include <webkit/webkitdefines.h>
 
 G_BEGIN_DECLS
 

diff --git a/WebKit/gtk/WebView/webkitwebhistoryitem.cpp b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
similarity index 100%
rename from WebKit/gtk/WebView/webkitwebhistoryitem.cpp
rename to WebKit/gtk/webkit/webkitwebhistoryitem.cpp

diff --git a/WebKit/gtk/WebView/webkitwebhistoryitem.h b/WebKit/gtk/webkit/webkitwebhistoryitem.h
similarity index 98%
rename from WebKit/gtk/WebView/webkitwebhistoryitem.h
rename to WebKit/gtk/webkit/webkitwebhistoryitem.h
index 26a024ec9856dac3deb03bd8ae9d347e70c2cd3e..fb6002fc78a3eb95ad37e242090fdac2581bd1c9 100644 (file)
--- a/WebKit/gtk/WebView/webkitwebhistoryitem.h
+++ b/WebKit/gtk/webkit/webkitwebhistoryitem.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <gdk/gdk.h>
 
-#include "webkitdefines.h"
+#include <webkit/webkitdefines.h>
 
 G_BEGIN_DECLS
 

diff --git a/WebKit/gtk/WebView/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
similarity index 100%
rename from WebKit/gtk/WebView/webkitwebsettings.cpp
rename to WebKit/gtk/webkit/webkitwebsettings.cpp

diff --git a/WebKit/gtk/WebView/webkitwebsettings.h b/WebKit/gtk/webkit/webkitwebsettings.h
similarity index 98%
rename from WebKit/gtk/WebView/webkitwebsettings.h
rename to WebKit/gtk/webkit/webkitwebsettings.h
index b5db9203658de9ee64a16c3aaae5ec67a2ea4f6f..762c36a23ad112c7093025f363602773a302683b 100644 (file)
--- a/WebKit/gtk/WebView/webkitwebsettings.h
+++ b/WebKit/gtk/webkit/webkitwebsettings.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "webkitdefines.h"
+#include <webkit/webkitdefines.h>
 
 G_BEGIN_DECLS
 

diff --git a/WebKit/gtk/WebView/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
similarity index 100%
rename from WebKit/gtk/WebView/webkitwebview.cpp
rename to WebKit/gtk/webkit/webkitwebview.cpp

diff --git a/WebKit/gtk/WebView/webkitwebview.h b/WebKit/gtk/webkit/webkitwebview.h
similarity index 97%
rename from WebKit/gtk/WebView/webkitwebview.h
rename to WebKit/gtk/webkit/webkitwebview.h
index 4a6dea0e6c908d7d1598ebec9ee71ffff6f4d685..5dc4b37d63024757033fc34ed229c5a275235f50 100644 (file)
--- a/WebKit/gtk/WebView/webkitwebview.h
+++ b/WebKit/gtk/webkit/webkitwebview.h
@@ -23,10 +23,10 @@
 #include <gtk/gtk.h>
 #include <JavaScriptCore/JSBase.h>
 
-#include "webkitdefines.h"
-#include "webkitwebbackforwardlist.h"
-#include "webkitwebhistoryitem.h"
-#include "webkitwebsettings.h"
+#include <webkit/webkitdefines.h>
+#include <webkit/webkitwebbackforwardlist.h>
+#include <webkit/webkitwebhistoryitem.h>
+#include <webkit/webkitwebsettings.h>
 
 G_BEGIN_DECLS
 

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a3e0f32adcda2c013d99ba0cd316d8fe177fbb62..2cbbe7d31afd3443578bfd9451cd2411a165f7fa 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2008-01-31  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Adam Roben.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17006
+        [GTK] Header path should be webkit/webkit.h
+
+        Move the GTK+ API sources as needed and update the build systems.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        * DumpRenderTree/gtk/DumpRenderTreeGtk.h:
+        * DumpRenderTree/gtk/WorkQueueItemGtk.cpp:
+        * GNUmakefile.am:
+        * GtkLauncher/main.c:
+
 2008-01-30  Stephanie  <slewis@apple.com>
 
         Reviewed by Geoff.

diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 73a25f78970d8f75343d61ae8548561c42769d5a..271da15e94c4124b5f7a33b3992b334fec26e4b5 100644 (file)
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -31,7 +31,7 @@
 #include "WorkQueueItem.h"
 
 #include <gtk/gtk.h>
-#include <webkit.h>
+#include <webkit/webkit.h>
 
 #include <JavaScriptCore/JSBase.h>
 #include <JavaScriptCore/JSContextRef.h>

diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTreeGtk.h b/WebKitTools/DumpRenderTree/gtk/DumpRenderTreeGtk.h
index bf291427ea1562d750f019b0d69d0fccf97713df..f847e9c87dbc8f729a0b8ed7808d9c52304a2681 100644 (file)
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTreeGtk.h
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTreeGtk.h
@@ -29,7 +29,7 @@
 #ifndef DumpRenderTreeGtk_h
 #define DumpRenderTreeGtk_h
 
-#include "webkitdefines.h"
+#include <webkit/webkitdefines.h>
 
 extern WebKitWebFrame* mainFrame;
 extern WebKitWebFrame* topLoadingFrame;

diff --git a/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp b/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
index 724bcda63bf273175fd931bc300c6fffe2607766..ee776836f3636eeb6f458e2f511118c6e8990707 100644 (file)
--- a/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
@@ -18,13 +18,10 @@
  */
 
 #include "WorkQueueItem.h"
-
-#include "webkitnetworkrequest.h"
-#include "webkitwebframe.h"
-#include "webkitwebview.h"
-
 #include "DumpRenderTree.h"
+
 #include <JavaScriptCore/JSStringRef.h>
+#include <webkit/webkit.h>
 
 // Returns a newly allocated UTF-8 character buffer which must be freed with g_free()
 static gchar* JSStringCopyUTF8CString(JSStringRef jsString)

diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am
index 94bed8c9cc2734f10753edd20977d92b88edf271..728476f57c93e2f58b676208edb448eceb5050cb 100644 (file)
--- a/WebKitTools/GNUmakefile.am
+++ b/WebKitTools/GNUmakefile.am
@@ -4,7 +4,7 @@ noinst_PROGRAMS += \
 
 # GtkLauncher
 Programs_GtkLauncher_CPPFLAGS = \
-       -I$(srcdir)/WebKit/gtk/WebView \
+       -I$(srcdir)/WebKit/gtk \
        $(global_cppflags)
 
 Programs_GtkLauncher_SOURCES = \
@@ -25,7 +25,7 @@ Programs_GtkLauncher_LDFLAGS = -ljpeg -rpath $(CURDIR)/.libs
 Programs_DumpRenderTree_CPPFLAGS = \
        -I$(srcdir)/WebKitTools/DumpRenderTree \
        -I$(srcdir)/WebKitTools/DumpRenderTree/gtk \
-       -I$(srcdir)/WebKit/gtk/WebView \
+       -I$(srcdir)/WebKit/gtk \
        $(global_cppflags)
 
 Programs_DumpRenderTree_SOURCES = \

diff --git a/WebKitTools/GtkLauncher/main.c b/WebKitTools/GtkLauncher/main.c
index 61bdbc8107b51c6f84a7a500a5677248671da45a..8ed269056215be3084988ec6c019d0858f1cba6a 100644 (file)
--- a/WebKitTools/GtkLauncher/main.c
+++ b/WebKitTools/GtkLauncher/main.c
@@ -25,7 +25,7 @@
  */
 
 #include <gtk/gtk.h>
-#include <webkit.h>
+#include <webkit/webkit.h>
 
 static GtkWidget* main_window;
 static GtkWidget* uri_entry;