Changeset 29898 in webkit
- Timestamp:
- Jan 31, 2008 3:51:53 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
- 18 copied
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r29821 r29898 1 2008-01-31 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam Roben. 4 5 http://bugs.webkit.org/show_bug.cgi?id=17006 6 [GTK] Header path should be webkit/webkit.h 7 8 Move the GTK+ API sources as needed and update the build systems. 9 10 * GNUmakefile.am: 11 * WebKit.pri: 12 1 13 2008-01-27 Jan Michael Alonzo <jmalonzo@unpluggable.com> 2 14 -
trunk/GNUmakefile.am
r29821 r29898 126 126 # No need to touch the following variables unless you have to. If you need to change the values 127 127 # for the following variables, use the "webkitgtk_" variables above 128 libWebKitGtk_ladir := $(prefix)/include/WebKit 128 libWebKitGtk_ladir := $(prefix)/include/WebKit/webkit 129 129 130 130 libWebKitGtk_la_HEADERS = $(webkitgtk_h_api) … … 230 230 # WEBKIT GTK+ 231 231 webkitgtk_cppflags += \ 232 -I$(top_builddir)/WebKit/gtk/ WebView\232 -I$(top_builddir)/WebKit/gtk/webkit \ 233 233 -DBUILDING_CAIRO__=1 \ 234 234 -DBUILD_WEBKIT 235 235 236 236 webkitgtk_h_api += \ 237 WebKit/gtk/ WebView/webkit.h \238 WebKit/gtk/ WebView/webkitdefines.h \239 WebKit/gtk/ WebView/webkitnetworkrequest.h \240 WebKit/gtk/ WebView/webkitwebbackforwardlist.h \241 WebKit/gtk/ WebView/webkitwebframe.h \242 WebKit/gtk/ WebView/webkitwebhistoryitem.h \243 WebKit/gtk/ WebView/webkitwebsettings.h \244 WebKit/gtk/ WebView/webkitwebview.h237 WebKit/gtk/webkit/webkit.h \ 238 WebKit/gtk/webkit/webkitdefines.h \ 239 WebKit/gtk/webkit/webkitnetworkrequest.h \ 240 WebKit/gtk/webkit/webkitwebbackforwardlist.h \ 241 WebKit/gtk/webkit/webkitwebframe.h \ 242 WebKit/gtk/webkit/webkitwebhistoryitem.h \ 243 WebKit/gtk/webkit/webkitwebsettings.h \ 244 WebKit/gtk/webkit/webkitwebview.h 245 245 246 246 webkitgtk_built_sources += \ 247 WebKit/gtk/ WebView/webkit-marshal.h \248 WebKit/gtk/ WebView/webkit-marshal.cpp247 WebKit/gtk/webkit/webkit-marshal.h \ 248 WebKit/gtk/webkit/webkit-marshal.cpp 249 249 250 250 webkitgtk_headers += \ 251 WebKit/gtk/ WebView/webkitprivate.h \251 WebKit/gtk/webkit/webkitprivate.h \ 252 252 WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ 253 253 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ … … 259 259 260 260 webkitgtk_sources += \ 261 WebKit/gtk/ WebView/webkitnetworkrequest.cpp \262 WebKit/gtk/ WebView/webkitprivate.cpp \263 WebKit/gtk/ WebView/webkitwebbackforwardlist.cpp \264 WebKit/gtk/ WebView/webkitwebframe.cpp \265 WebKit/gtk/ WebView/webkitwebhistoryitem.cpp \266 WebKit/gtk/ WebView/webkitwebsettings.cpp \267 WebKit/gtk/ WebView/webkitwebview.cpp \261 WebKit/gtk/webkit/webkitnetworkrequest.cpp \ 262 WebKit/gtk/webkit/webkitprivate.cpp \ 263 WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ 264 WebKit/gtk/webkit/webkitwebframe.cpp \ 265 WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ 266 WebKit/gtk/webkit/webkitwebsettings.cpp \ 267 WebKit/gtk/webkit/webkitwebview.cpp \ 268 268 WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ 269 269 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ … … 281 281 pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc 282 282 283 WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/ WebView/webkit-marshal284 WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/ WebView/webkit-marshal.list283 WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal 284 WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list 285 285 286 286 stamp_files := \ … … 288 288 stamp-webkit-marshal.h 289 289 290 WebKit/gtk/ WebView/webkit-marshal.cpp: stamp-webkit-marshal.cpp290 WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp 291 291 @true 292 292 293 WebKit/gtk/ WebView/webkit-marshal.h: stamp-webkit-marshal.h293 WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h 294 294 @true 295 295 -
trunk/WebCore/ChangeLog
r29897 r29898 1 2008-01-31 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam Roben. 4 5 http://bugs.webkit.org/show_bug.cgi?id=17006 6 [GTK] Header path should be webkit/webkit.h 7 8 Move the GTK+ API sources as needed and update the build systems. 9 10 * GNUmakefile.am: 11 * WebCore.pro: 12 1 13 2008-01-31 Sam Weinig <sam@webkit.org> 2 14 -
trunk/WebCore/GNUmakefile.am
r29896 r29898 41 41 -I$(srcdir)/WebCore/loader/gtk \ 42 42 -I$(srcdir)/WebCore/page/gtk \ 43 -I$(srcdir)/WebKit/gtk \ 43 44 -I$(srcdir)/WebKit/gtk/WebCoreSupport \ 44 -I$(srcdir)/WebKit/gtk/ WebView45 -I$(srcdir)/WebKit/gtk/webkit 45 46 46 47 webcore_built_nosources += \ -
trunk/WebCore/WebCore.pro
r29896 r29898 155 155 $$PWD/loader/gtk \ 156 156 $$PWD/page/gtk \ 157 $$PWD/../WebKit/gtk \ 157 158 $$PWD/../WebKit/gtk/WebCoreSupport \ 158 $$PWD/../WebKit/gtk/ WebView159 $$PWD/../WebKit/gtk/webkit 159 160 160 161 DEPENDPATH += \ … … 173 174 loader/gtk \ 174 175 page/gtk \ 176 ../WebKit/gtk \ 175 177 ../WebKit/gtk/WebCoreSupport \ 176 ../WebKit/gtk/ WebView178 ../WebKit/gtk/webkit 177 179 } 178 180 … … 987 989 ../WebCore/platform/gtk/ClipboardGtk.h \ 988 990 ../WebCore/platform/gtk/PasteboardHelper.h \ 989 ../WebKit/gtk/ WebView/webkit.h \990 ../WebKit/gtk/ WebView/webkitdefines.h \991 ../WebKit/gtk/ WebView/webkitnetworkrequest.h \992 ../WebKit/gtk/ WebView/webkitprivate.h \993 ../WebKit/gtk/ WebView/webkitwebbackforwardlist.h \994 ../WebKit/gtk/ WebView/webkitwebframe.h \995 ../WebKit/gtk/ WebView/webkitwebhistoryitem.h \996 ../WebKit/gtk/ WebView/webkitwebsettings.h \997 ../WebKit/gtk/ WebView/webkitwebview.h \991 ../WebKit/gtk/webkit/webkit.h \ 992 ../WebKit/gtk/webkit/webkitdefines.h \ 993 ../WebKit/gtk/webkit/webkitnetworkrequest.h \ 994 ../WebKit/gtk/webkit/webkitprivate.h \ 995 ../WebKit/gtk/webkit/webkitwebbackforwardlist.h \ 996 ../WebKit/gtk/webkit/webkitwebframe.h \ 997 ../WebKit/gtk/webkit/webkitwebhistoryitem.h \ 998 ../WebKit/gtk/webkit/webkitwebsettings.h \ 999 ../WebKit/gtk/webkit/webkitwebview.h \ 998 1000 ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ 999 1001 ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ … … 1068 1070 platform/image-decoders/ico/ICOImageDecoder.cpp \ 1069 1071 platform/image-decoders/xbm/XBMImageDecoder.cpp \ 1070 ../WebKit/gtk/ WebView/webkitnetworkrequest.cpp \1071 ../WebKit/gtk/ WebView/webkitprivate.cpp \1072 ../WebKit/gtk/ WebView/webkitwebbackforwardlist.cpp \1073 ../WebKit/gtk/ WebView/webkitwebframe.cpp \1074 ../WebKit/gtk/ WebView/webkitwebhistoryitem.cpp \1075 ../WebKit/gtk/ WebView/webkitwebsettings.cpp \1076 ../WebKit/gtk/ WebView/webkitwebview.cpp \1072 ../WebKit/gtk/webkit/webkitnetworkrequest.cpp \ 1073 ../WebKit/gtk/webkit/webkitprivate.cpp \ 1074 ../WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ 1075 ../WebKit/gtk/webkit/webkitwebframe.cpp \ 1076 ../WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ 1077 ../WebKit/gtk/webkit/webkitwebsettings.cpp \ 1078 ../WebKit/gtk/webkit/webkitwebview.cpp \ 1077 1079 ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ 1078 1080 ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ … … 1795 1797 INSTALLS += target 1796 1798 1797 include($$PWD/../WebKit/gtk/ WebView/headers.pri)1799 include($$PWD/../WebKit/gtk/webkit/headers.pri) 1798 1800 headers.files = $$WEBKIT_API_HEADERS 1799 1801 headers.path = $$WEBKIT_INC_DIR … … 1815 1817 } 1816 1818 1817 GENMARSHALS = ../WebKit/gtk/ WebView/webkit-marshal.list1819 GENMARSHALS = ../WebKit/gtk/webkit/webkit-marshal.list 1818 1820 GENMARSHALS_PREFIX = webkit_marshal 1819 1821 -
trunk/WebKit.pri
r29505 r29898 18 18 QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR 19 19 LIBS += -lWebKitGtk 20 DEPENDPATH += $$PWD/WebKit/gtk /WebView $$PWD/WebKit/gtk/WebCoreSupport20 DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit 21 21 } 22 22 … … 74 74 $$BASE_DIR/WebCore/loader/gtk \ 75 75 $$BASE_DIR/WebCore/page/gtk \ 76 $$BASE_DIR/WebKit/gtk/WebView \ 77 $$BASE_DIR/WebKit/gtk/WebCoreSupport 76 $$BASE_DIR/WebKit/gtk \ 77 $$BASE_DIR/WebKit/gtk/WebCoreSupport \ 78 $$BASE_DIR/WebKit/gtk/webkit 78 79 INCLUDEPATH += \ 79 80 $$BASE_DIR/JavaScriptCore/ \ -
trunk/WebKit/gtk/ChangeLog
r29821 r29898 1 2008-01-31 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam Roben. 4 5 http://bugs.webkit.org/show_bug.cgi?id=17006 6 [GTK] Header path should be webkit/webkit.h 7 8 Move the GTK+ API sources as needed and update the build systems. 9 10 * WebView: Removed. 11 * WebView/headers.pri: Removed. 12 * WebView/webkit-marshal.list: Removed. 13 * WebView/webkit.h: Removed. 14 * WebView/webkitdefines.h: Removed. 15 * WebView/webkitnetworkrequest.cpp: Removed. 16 * WebView/webkitnetworkrequest.h: Removed. 17 * WebView/webkitprivate.cpp: Removed. 18 * WebView/webkitprivate.h: Removed. 19 * WebView/webkitwebbackforwardlist.cpp: Removed. 20 * WebView/webkitwebbackforwardlist.h: Removed. 21 * WebView/webkitwebframe.cpp: Removed. 22 * WebView/webkitwebframe.h: Removed. 23 * WebView/webkitwebhistoryitem.cpp: Removed. 24 * WebView/webkitwebhistoryitem.h: Removed. 25 * WebView/webkitwebsettings.cpp: Removed. 26 * WebView/webkitwebsettings.h: Removed. 27 * WebView/webkitwebview.cpp: Removed. 28 * WebView/webkitwebview.h: Removed. 29 * webkit: Copied from WebKit/gtk/WebView. 30 * webkit/webkit.h: 31 * webkit/webkitnetworkrequest.h: 32 * webkit/webkitprivate.h: 33 * webkit/webkitwebbackforwardlist.h: 34 * webkit/webkitwebframe.h: 35 * webkit/webkitwebhistoryitem.h: 36 * webkit/webkitwebsettings.h: 37 * webkit/webkitwebview.h: 38 1 39 2008-01-27 Jan Michael Alonzo <jmalonzo@unpluggable.com> 2 40 -
trunk/WebKit/gtk/webkit/webkit.h
r29897 r29898 21 21 #define __WEBKIT_H__ 22 22 23 #include <webkit defines.h>24 #include <webkit networkrequest.h>25 #include <webkit webframe.h>26 #include <webkit websettings.h>27 #include <webkit webview.h>28 #include <webkit webbackforwardlist.h>29 #include <webkit webhistoryitem.h>23 #include <webkit/webkitdefines.h> 24 #include <webkit/webkitnetworkrequest.h> 25 #include <webkit/webkitwebframe.h> 26 #include <webkit/webkitwebsettings.h> 27 #include <webkit/webkitwebview.h> 28 #include <webkit/webkitwebbackforwardlist.h> 29 #include <webkit/webkitwebhistoryitem.h> 30 30 31 31 #endif /* __WEBKIT_H__ */ -
trunk/WebKit/gtk/webkit/webkitnetworkrequest.h
r29897 r29898 23 23 #include <glib-object.h> 24 24 25 #include "webkitdefines.h"25 #include <webkit/webkitdefines.h> 26 26 27 27 G_BEGIN_DECLS -
trunk/WebKit/gtk/webkit/webkitprivate.h
r29897 r29898 28 28 */ 29 29 30 #include "webkitdefines.h"31 #include "webkitwebview.h"32 #include "webkitwebframe.h"33 #include "webkitwebsettings.h"34 #include "webkitnetworkrequest.h"35 #include "webkitwebbackforwardlist.h"30 #include <webkit/webkitdefines.h> 31 #include <webkit/webkitwebview.h> 32 #include <webkit/webkitwebframe.h> 33 #include <webkit/webkitwebsettings.h> 34 #include <webkit/webkitnetworkrequest.h> 35 #include <webkit/webkitwebbackforwardlist.h> 36 36 37 37 #include "BackForwardList.h" -
trunk/WebKit/gtk/webkit/webkitwebbackforwardlist.h
r29897 r29898 24 24 #include <glib-object.h> 25 25 26 #include "webkitdefines.h"27 #include "webkitwebhistoryitem.h"26 #include <webkit/webkitdefines.h> 27 #include <webkit/webkitwebhistoryitem.h> 28 28 29 29 G_BEGIN_DECLS -
trunk/WebKit/gtk/webkit/webkitwebframe.h
r29897 r29898 25 25 #include <JavaScriptCore/JSBase.h> 26 26 27 #include "webkitdefines.h"27 #include <webkit/webkitdefines.h> 28 28 29 29 G_BEGIN_DECLS -
trunk/WebKit/gtk/webkit/webkitwebhistoryitem.h
r29897 r29898 25 25 #include <gdk/gdk.h> 26 26 27 #include "webkitdefines.h"27 #include <webkit/webkitdefines.h> 28 28 29 29 G_BEGIN_DECLS -
trunk/WebKit/gtk/webkit/webkitwebsettings.h
r29897 r29898 23 23 #include <glib-object.h> 24 24 25 #include "webkitdefines.h"25 #include <webkit/webkitdefines.h> 26 26 27 27 G_BEGIN_DECLS -
trunk/WebKit/gtk/webkit/webkitwebview.h
r29897 r29898 24 24 #include <JavaScriptCore/JSBase.h> 25 25 26 #include "webkitdefines.h"27 #include "webkitwebbackforwardlist.h"28 #include "webkitwebhistoryitem.h"29 #include "webkitwebsettings.h"26 #include <webkit/webkitdefines.h> 27 #include <webkit/webkitwebbackforwardlist.h> 28 #include <webkit/webkitwebhistoryitem.h> 29 #include <webkit/webkitwebsettings.h> 30 30 31 31 G_BEGIN_DECLS -
trunk/WebKitTools/ChangeLog
r29880 r29898 1 2008-01-31 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam Roben. 4 5 http://bugs.webkit.org/show_bug.cgi?id=17006 6 [GTK] Header path should be webkit/webkit.h 7 8 Move the GTK+ API sources as needed and update the build systems. 9 10 * DumpRenderTree/gtk/DumpRenderTree.cpp: 11 * DumpRenderTree/gtk/DumpRenderTreeGtk.h: 12 * DumpRenderTree/gtk/WorkQueueItemGtk.cpp: 13 * GNUmakefile.am: 14 * GtkLauncher/main.c: 15 1 16 2008-01-30 Stephanie <slewis@apple.com> 2 17 -
trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
r29663 r29898 32 32 33 33 #include <gtk/gtk.h> 34 #include <webkit .h>34 #include <webkit/webkit.h> 35 35 36 36 #include <JavaScriptCore/JSBase.h> -
trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTreeGtk.h
r29663 r29898 30 30 #define DumpRenderTreeGtk_h 31 31 32 #include "webkitdefines.h"32 #include <webkit/webkitdefines.h> 33 33 34 34 extern WebKitWebFrame* mainFrame; -
trunk/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
r29663 r29898 19 19 20 20 #include "WorkQueueItem.h" 21 #include "DumpRenderTree.h" 21 22 22 #include "webkitnetworkrequest.h"23 #include "webkitwebframe.h"24 #include "webkitwebview.h"25 26 #include "DumpRenderTree.h"27 23 #include <JavaScriptCore/JSStringRef.h> 24 #include <webkit/webkit.h> 28 25 29 26 // Returns a newly allocated UTF-8 character buffer which must be freed with g_free() -
trunk/WebKitTools/GNUmakefile.am
r29741 r29898 5 5 # GtkLauncher 6 6 Programs_GtkLauncher_CPPFLAGS = \ 7 -I$(srcdir)/WebKit/gtk /WebView\7 -I$(srcdir)/WebKit/gtk \ 8 8 $(global_cppflags) 9 9 … … 26 26 -I$(srcdir)/WebKitTools/DumpRenderTree \ 27 27 -I$(srcdir)/WebKitTools/DumpRenderTree/gtk \ 28 -I$(srcdir)/WebKit/gtk /WebView\28 -I$(srcdir)/WebKit/gtk \ 29 29 $(global_cppflags) 30 30 -
trunk/WebKitTools/GtkLauncher/main.c
r29672 r29898 26 26 27 27 #include <gtk/gtk.h> 28 #include <webkit .h>28 #include <webkit/webkit.h> 29 29 30 30 static GtkWidget* main_window;
Note: See TracChangeset
for help on using the changeset viewer.