Changeset 28273 in webkit
- Timestamp:
- Nov 30, 2007 8:24:09 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 16 added
- 1 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r28107 r28273 1 2007-11-30 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam Roben. 4 5 http://bugs.webkit.org/show_bug.cgi?id=15691 6 [GTK] Public API does not follow GTK+ conventions 7 8 Refactor the WebKit/GTK+ public API. Changes: 9 WebKitPage -> WebKitWebView 10 WebKitFrame -> WebKitWebFrame 11 12 Public API source and header names have been updated to mirror the API 13 changes. 14 15 The API is now kept in WebKit/gtk/WebView to match other ports in the 16 same class such as Mac and Win. 17 18 * WebKit.pri: 19 1 20 2007-11-26 Rodney Dawes <dobey@wayofthemonkey.com> 2 21 -
trunk/WebCore/ChangeLog
r28264 r28273 1 2007-11-30 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam Roben. 4 5 http://bugs.webkit.org/show_bug.cgi?id=15691 6 [GTK] Public API does not follow GTK+ conventions 7 8 Refactor the WebKit/GTK+ public API. Changes: 9 WebKitPage -> WebKitWebView 10 WebKitFrame -> WebKitWebFrame 11 12 Public API source and header names have been updated to mirror the API 13 changes. 14 15 The API is now kept in WebKit/gtk/WebView to match other ports in the 16 same class such as Mac and Win. 17 18 * WebCore.pro: 19 1 20 2007-11-30 Anders Carlsson <andersca@apple.com> 2 21 -
trunk/WebCore/WebCore.pro
r28259 r28273 147 147 $$PWD/page/gtk \ 148 148 $$PWD/../WebKit/gtk/WebCoreSupport \ 149 $$PWD/../WebKit/gtk/ Api149 $$PWD/../WebKit/gtk/WebView 150 150 151 151 DEPENDPATH += \ … … 165 165 page/gtk \ 166 166 ../WebKit/gtk/WebCoreSupport \ 167 ../WebKit/gtk/ Api167 ../WebKit/gtk/WebView 168 168 } 169 169 … … 940 940 HEADERS += \ 941 941 ../WebCore/platform/gtk/ClipboardGtk.h \ 942 ../WebKit/gtk/ Api/webkitgtkdefines.h \943 ../WebKit/gtk/ Api/webkitgtkframe.h \944 ../WebKit/gtk/ Api/webkitgtkglobal.h \945 ../WebKit/gtk/ Api/webkitgtknetworkrequest.h \946 ../WebKit/gtk/ Api/webkitgtkpage.h \947 ../WebKit/gtk/ Api/webkitgtkprivate.h \948 ../WebKit/gtk/ Api/webkitgtksettings.h \942 ../WebKit/gtk/WebView/webkitdefines.h \ 943 ../WebKit/gtk/WebView/webkitglobal.h \ 944 ../WebKit/gtk/WebView/webkitnetworkrequest.h \ 945 ../WebKit/gtk/WebView/webkitprivate.h \ 946 ../WebKit/gtk/WebView/webkitsettings.h \ 947 ../WebKit/gtk/WebView/webkitwebframe.h \ 948 ../WebKit/gtk/WebView/webkitwebview.h \ 949 949 ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ 950 950 ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ … … 1017 1017 platform/image-decoders/ico/ICOImageDecoder.cpp \ 1018 1018 platform/image-decoders/xbm/XBMImageDecoder.cpp \ 1019 ../WebKit/gtk/ Api/webkitgtkframe.cpp \1020 ../WebKit/gtk/ Api/webkitgtkglobal.cpp \1021 ../WebKit/gtk/ Api/webkitgtknetworkrequest.cpp \1022 ../WebKit/gtk/ Api/webkitgtkpage.cpp \1023 ../WebKit/gtk/ Api/webkitgtkprivate.cpp \1024 ../WebKit/gtk/ Api/webkitgtksettings.cpp \1019 ../WebKit/gtk/WebView/webkitglobal.cpp \ 1020 ../WebKit/gtk/WebView/webkitnetworkrequest.cpp \ 1021 ../WebKit/gtk/WebView/webkitprivate.cpp \ 1022 ../WebKit/gtk/WebView/webkitsettings.cpp \ 1023 ../WebKit/gtk/WebView/webkitwebframe.cpp \ 1024 ../WebKit/gtk/WebView/webkitwebview.cpp \ 1025 1025 ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ 1026 1026 ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ … … 1682 1682 INSTALLS += target 1683 1683 1684 include($$PWD/../WebKit/gtk/ Api/headers.pri)1684 include($$PWD/../WebKit/gtk/WebView/headers.pri) 1685 1685 headers.files = $$WEBKIT_API_HEADERS 1686 1686 headers.path = $$WEBKIT_INC_DIR … … 1702 1702 } 1703 1703 1704 GENMARSHALS = ../WebKit/gtk/ Api/webkitgtk-marshal.list1704 GENMARSHALS = ../WebKit/gtk/WebView/webkit-marshal.list 1705 1705 GENMARSHALS_PREFIX = webkit_marshal 1706 1706 -
trunk/WebKit.pri
r28107 r28273 18 18 QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR 19 19 LIBS += -lWebKitGtk 20 DEPENDPATH += $$PWD/WebKit/gtk/ Api$$PWD/WebKit/gtk/WebCoreSupport20 DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport 21 21 } 22 22 … … 45 45 # This set of warnings is borrowed from the Mac build 46 46 QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef 47 48 DEPENDPATH += $$PWD/JavaScriptCore/API 49 INCLUDEPATH += $$PWD 47 50 } 48 51 … … 61 64 $$BASE_DIR/WebCore/loader/gtk \ 62 65 $$BASE_DIR/WebCore/page/gtk \ 63 $$BASE_DIR/WebKit/gtk/ Api\66 $$BASE_DIR/WebKit/gtk/WebView \ 64 67 $$BASE_DIR/WebKit/gtk/WebCoreSupport 65 68 INCLUDEPATH += \ -
trunk/WebKit/gtk/ChangeLog
r28231 r28273 1 2007-11-30 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam Roben. 4 5 http://bugs.webkit.org/show_bug.cgi?id=15691 6 [GTK] Public API does not follow GTK+ conventions 7 8 Refactor the WebKit/GTK+ public API. Changes: 9 WebKitPage -> WebKitWebView 10 WebKitFrame -> WebKitWebFrame 11 12 Public API source and header names have been updated to mirror the API 13 changes. 14 15 The API is now kept in WebKit/gtk/WebView to match other ports in the 16 same class such as Mac and Win. 17 18 API/ABI-breaking change. 19 20 * Api: Removed. 21 * Api/headers.pri: Removed. 22 * Api/webkitgtk-marshal.list: Removed. 23 * Api/webkitgtkdefines.h: Removed. 24 * Api/webkitgtkframe.cpp: Removed. 25 * Api/webkitgtkframe.h: Removed. 26 * Api/webkitgtkglobal.cpp: Removed. 27 * Api/webkitgtkglobal.h: Removed. 28 * Api/webkitgtknetworkrequest.cpp: Removed. 29 * Api/webkitgtknetworkrequest.h: Removed. 30 * Api/webkitgtkpage.cpp: Removed. 31 * Api/webkitgtkpage.h: Removed. 32 * Api/webkitgtkprivate.cpp: Removed. 33 * Api/webkitgtkprivate.h: Removed. 34 * Api/webkitgtksettings.cpp: Removed. 35 * Api/webkitgtksettings.h: Removed. 36 * WebCoreSupport/ChromeClientGtk.cpp: 37 (WebKit::ChromeClient::ChromeClient): 38 (WebKit::ChromeClient::createWindow): 39 * WebCoreSupport/ChromeClientGtk.h: 40 (WebKit::ChromeClient::webPage): 41 * WebCoreSupport/EditorClientGtk.cpp: 42 (WebKit::EditorClient::isEditable): 43 (WebKit::EditorClient::EditorClient): 44 * WebCoreSupport/EditorClientGtk.h: 45 * WebCoreSupport/FrameLoaderClientGtk.cpp: 46 (WebKit::FrameLoaderClient::FrameLoaderClient): 47 (WebKit::FrameLoaderClient::postProgressStartedNotification): 48 (WebKit::FrameLoaderClient::postProgressEstimateChangedNotification): 49 (WebKit::FrameLoaderClient::postProgressFinishedNotification): 50 (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction): 51 (WebKit::FrameLoaderClient::createFrame): 52 (WebKit::FrameLoaderClient::windowObjectCleared): 53 (WebKit::FrameLoaderClient::dispatchDidReceiveIcon): 54 (WebKit::FrameLoaderClient::setTitle): 55 * WebCoreSupport/FrameLoaderClientGtk.h: 56 (WebKit::FrameLoaderClient::webFrame): 57 * WebView: Added. 58 * WebView/headers.pri: Added. 59 * WebView/webkit-marshal.list: Added. 60 * WebView/webkitdefines.h: Added. 61 * WebView/webkitglobal.cpp: Added. 62 * WebView/webkitglobal.h: Added. 63 * WebView/webkitnetworkrequest.cpp: Added. 64 * WebView/webkitnetworkrequest.h: Added. 65 * WebView/webkitprivate.cpp: Added. 66 (WebKit::apply): 67 (WebKit::create): 68 (WebKit::getFrameFromView): 69 (WebKit::getViewFromFrame): 70 (WebKit::core): 71 (WebKit::kit): 72 * WebView/webkitprivate.h: Added. 73 * WebView/webkitsettings.cpp: Added. 74 * WebView/webkitsettings.h: Added. 75 * WebView/webkitwebframe.cpp: Added. 76 * WebView/webkitwebframe.h: Added. 77 * WebView/webkitwebview.cpp: Added. 78 * WebView/webkitwebview.h: Added. 79 1 80 2007-11-28 Alp Toker <alp@atoker.com> 2 81 -
trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
r28192 r28273 36 36 #include "HitTestResult.h" 37 37 #include "KURL.h" 38 #include "webkit gtkpage.h"39 #include "webkit gtkprivate.h"38 #include "webkitwebview.h" 39 #include "webkitprivate.h" 40 40 #include "NotImplemented.h" 41 41 #include "WindowFeatures.h" … … 44 44 45 45 namespace WebKit { 46 ChromeClient::ChromeClient(WebKit Page* page)46 ChromeClient::ChromeClient(WebKitWebView* page) 47 47 : m_webPage(page) 48 48 { … … 94 94 } else { 95 95 /* TODO: FrameLoadRequest is not used */ 96 WebKit Page* page = WEBKIT_PAGE_GET_CLASS(m_webPage)->create_page(m_webPage);96 WebKitWebView* page = WEBKIT_WEB_VIEW_GET_CLASS(m_webPage)->create_web_view(m_webPage); 97 97 if (!page) 98 98 return 0; 99 99 100 WebKit PagePrivate *privateData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(page));101 return privateData-> page;100 WebKitWebViewPrivate *privateData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(page)); 101 return privateData->corePage; 102 102 } 103 103 } -
trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
r28196 r28273 33 33 #include "KURL.h" 34 34 35 typedef struct _WebKit Page WebKitPage;35 typedef struct _WebKitWebView WebKitWebView; 36 36 37 37 namespace WebKit { … … 39 39 class ChromeClient : public WebCore::ChromeClient { 40 40 public: 41 ChromeClient(WebKit Page*);42 WebKit Page* webPage() const { return m_webPage; }41 ChromeClient(WebKitWebView*); 42 WebKitWebView* webPage() const { return m_webPage; } 43 43 44 44 virtual void chromeDestroyed(); … … 107 107 108 108 private: 109 WebKit Page* m_webPage;109 WebKitWebView* m_webPage; 110 110 WebCore::KURL m_hoveredLinkURL; 111 111 }; -
trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
r28013 r28273 41 41 #include "Page.h" 42 42 #include "PlatformKeyboardEvent.h" 43 #include "webkit gtkprivate.h"43 #include "webkitprivate.h" 44 44 45 45 #include <stdio.h> … … 147 147 bool EditorClient::isEditable() 148 148 { 149 return webkit_ page_get_editable(m_page);149 return webkit_web_view_get_editable(m_page); 150 150 } 151 151 … … 361 361 } 362 362 363 EditorClient::EditorClient(WebKit Page* page)363 EditorClient::EditorClient(WebKitWebView* page) 364 364 : m_page(page) 365 365 { -
trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
r27977 r28273 35 35 #include <wtf/Forward.h> 36 36 37 typedef struct _WebKit Page WebKitPage;37 typedef struct _WebKitWebView WebKitWebView; 38 38 39 39 namespace WebCore { … … 45 45 class EditorClient : public WebCore::EditorClient { 46 46 public: 47 EditorClient(WebKit Page*);47 EditorClient(WebKitWebView*); 48 48 49 49 // from EditorClient … … 110 110 111 111 private: 112 WebKit Page* m_page;112 WebKitWebView* m_page; 113 113 }; 114 114 } -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r28065 r28273 52 52 #include "kjs_proxy.h" 53 53 #include "kjs_window.h" 54 #include "webkit gtkpage.h"55 #include "webkit gtkframe.h"56 #include "webkit gtkprivate.h"54 #include "webkitwebview.h" 55 #include "webkitwebframe.h" 56 #include "webkitprivate.h" 57 57 58 58 #include <JavaScriptCore/APICast.h> … … 66 66 namespace WebKit { 67 67 68 FrameLoaderClient::FrameLoaderClient(WebKit Frame* frame)68 FrameLoaderClient::FrameLoaderClient(WebKitWebFrame* frame) 69 69 : m_frame(frame) 70 70 , m_userAgent("") … … 200 200 void FrameLoaderClient::postProgressStartedNotification() 201 201 { 202 WebKit Page* page = getPageFromFrame(m_frame);202 WebKitWebView* page = getViewFromFrame(m_frame); 203 203 g_signal_emit_by_name(page, "load_started", m_frame); 204 204 } … … 206 206 void FrameLoaderClient::postProgressEstimateChangedNotification() 207 207 { 208 WebKit Page* kitPage = getPageFromFrame(m_frame);208 WebKitWebView* kitPage = getViewFromFrame(m_frame); 209 209 Page* corePage = core(kitPage); 210 210 … … 214 214 void FrameLoaderClient::postProgressFinishedNotification() 215 215 { 216 WebKit Page* page = getPageFromFrame(m_frame);216 WebKitWebView* page = getViewFromFrame(m_frame); 217 217 218 218 g_signal_emit_by_name(page, "load_finished", m_frame); … … 255 255 return; 256 256 257 WebKit Page* page = getPageFromFrame(m_frame);257 WebKitWebView* page = getViewFromFrame(m_frame); 258 258 WebKitNetworkRequest* request = webkit_network_request_new(resourceRequest.url().url().utf8().data()); 259 259 WebKitNavigationResponse response; … … 282 282 Frame* coreFrame = core(webFrame()); 283 283 284 ASSERT(core(get PageFromFrame(webFrame())) == coreFrame->page());285 WebKit Frame* gtkFrame = WEBKIT_FRAME(webkit_frame_init_with_page(getPageFromFrame(webFrame()), ownerElement));284 ASSERT(core(getViewFromFrame(webFrame())) == coreFrame->page()); 285 WebKitWebFrame* gtkFrame = WEBKIT_WEB_FRAME(webkit_web_frame_init_with_web_view(getViewFromFrame(webFrame()), ownerElement)); 286 286 RefPtr<Frame> childFrame(adoptRef(core(gtkFrame))); 287 287 … … 367 367 ASSERT(windowObject); 368 368 369 WebKit Page* page = getPageFromFrame(m_frame);369 WebKitWebView* page = getViewFromFrame(m_frame); 370 370 g_signal_emit_by_name(page, "window_object_cleared", m_frame, context, windowObject); 371 371 … … 448 448 void FrameLoaderClient::dispatchDidReceiveIcon() 449 449 { 450 WebKit Page* page = getPageFromFrame(m_frame);450 WebKitWebView* page = getViewFromFrame(m_frame); 451 451 452 452 g_signal_emit_by_name(page, "icon_loaded", m_frame); … … 508 508 void FrameLoaderClient::setTitle(const String& title, const KURL& url) 509 509 { 510 WebKit Page* page = getPageFromFrame(m_frame);510 WebKitWebView* page = getViewFromFrame(m_frame); 511 511 512 512 CString titleString = title.utf8(); … … 514 514 g_signal_emit_by_name(m_frame, "title_changed", titleString.data(), urlString.data()); 515 515 516 if (m_frame == webkit_ page_get_main_frame(page))516 if (m_frame == webkit_web_view_get_main_frame(page)) 517 517 g_signal_emit_by_name(page, "title_changed", titleString.data(), urlString.data()); 518 518 } -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
r27977 r28273 33 33 #include "ResourceResponse.h" 34 34 35 typedef struct _WebKit Frame WebKitFrame;35 typedef struct _WebKitWebFrame WebKitWebFrame; 36 36 37 37 namespace WebKit { … … 39 39 class FrameLoaderClient : public WebCore::FrameLoaderClient { 40 40 public: 41 FrameLoaderClient(WebKit Frame*);41 FrameLoaderClient(WebKitWebFrame*); 42 42 virtual ~FrameLoaderClient() { } 43 43 virtual void frameLoaderDestroyed(); 44 44 45 WebKit Frame* webFrame() const { return m_frame; }45 WebKitWebFrame* webFrame() const { return m_frame; } 46 46 47 47 virtual bool hasWebView() const; … … 179 179 virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&); 180 180 private: 181 WebKit Frame* m_frame;181 WebKitWebFrame* m_frame; 182 182 WebCore::ResourceResponse m_response; 183 183 WebCore::String m_userAgent; -
trunk/WebKitTools/ChangeLog
r28254 r28273 1 2007-11-30 Alp Toker <alp@atoker.com> 2 3 Reviewed by Adam Roben. 4 5 http://bugs.webkit.org/show_bug.cgi?id=15691 6 [GTK] Public API does not follow GTK+ conventions 7 8 Refactor the WebKit/GTK+ public API. Changes: 9 WebKitPage -> WebKitWebView 10 WebKitFrame -> WebKitWebFrame 11 12 Public API source and header names have been updated to mirror the API 13 changes. 14 15 The API is now kept in WebKit/gtk/WebView to match other ports in the 16 same class such as Mac and Win. 17 18 * GtkLauncher/main.c: 19 (activate_uri_entry_cb): 20 (link_hover_cb): 21 (title_change_cb): 22 (progress_change_cb): 23 (go_back_cb): 24 (go_forward_cb): 25 (create_browser): 26 (main): 27 1 28 2007-11-30 Adam Roben <aroben@apple.com> 2 29 -
trunk/WebKitTools/GtkLauncher/main.c
r28231 r28273 25 25 */ 26 26 27 #include "webkit gtkpage.h"28 #include "webkitg tkglobal.h"27 #include "webkitwebview.h" 28 #include "webkitglobal.h" 29 29 #include <gtk/gtk.h> 30 30 … … 32 32 static GtkWidget* uri_entry; 33 33 static GtkStatusbar* main_statusbar; 34 static WebKit Page* web_page;34 static WebKitWebView* web_view; 35 35 static gchar* main_title; 36 36 static gint load_progress; … … 42 42 const gchar* uri = gtk_entry_get_text (GTK_ENTRY (entry)); 43 43 g_assert (uri); 44 webkit_ page_open (web_page, uri);44 webkit_web_view_open (web_view, uri); 45 45 } 46 46 … … 58 58 59 59 static void 60 link_hover_cb (WebKit Page* page, const gchar* title, const gchar* link, gpointer data)60 link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpointer data) 61 61 { 62 62 /* underflow is allowed */ … … 67 67 68 68 static void 69 title_change_cb (WebKit Page* page, const gchar* title, const gchar* uri, gpointer data)69 title_change_cb (WebKitWebView* page, const gchar* title, const gchar* uri, gpointer data) 70 70 { 71 71 gtk_entry_set_text (GTK_ENTRY (uri_entry), uri); … … 78 78 79 79 static void 80 progress_change_cb (WebKit Page* page, gint progress, gpointer data)80 progress_change_cb (WebKitWebView* page, gint progress, gpointer data) 81 81 { 82 82 load_progress = progress; … … 93 93 go_back_cb (GtkWidget* widget, gpointer data) 94 94 { 95 webkit_ page_go_backward (web_page);95 webkit_web_view_go_backward (web_view); 96 96 } 97 97 … … 99 99 go_forward_cb (GtkWidget* widget, gpointer data) 100 100 { 101 webkit_ page_go_forward (web_page);101 webkit_web_view_go_forward (web_view); 102 102 } 103 103 … … 108 108 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 109 109 110 web_ page = WEBKIT_PAGE (webkit_page_new ());111 gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (web_ page));110 web_view = WEBKIT_WEB_VIEW (webkit_web_view_new ()); 111 gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (web_view)); 112 112 113 g_signal_connect (G_OBJECT (web_ page), "title-changed", G_CALLBACK (title_change_cb), web_page);114 g_signal_connect (G_OBJECT (web_ page), "load-progress-changed", G_CALLBACK (progress_change_cb), web_page);115 g_signal_connect (G_OBJECT (web_ page), "hovering-over-link", G_CALLBACK (link_hover_cb), web_page);113 g_signal_connect (G_OBJECT (web_view), "title-changed", G_CALLBACK (title_change_cb), web_view); 114 g_signal_connect (G_OBJECT (web_view), "load-progress-changed", G_CALLBACK (progress_change_cb), web_view); 115 g_signal_connect (G_OBJECT (web_view), "hovering-over-link", G_CALLBACK (link_hover_cb), web_view); 116 116 117 117 return scrolled_window; … … 189 189 190 190 gchar* uri = (gchar*) (argc > 1 ? argv[1] : "http://www.google.com/"); 191 webkit_ page_open (web_page, uri);191 webkit_web_view_open (web_view, uri); 192 192 193 gtk_widget_grab_focus (GTK_WIDGET (web_ page));193 gtk_widget_grab_focus (GTK_WIDGET (web_view)); 194 194 gtk_widget_show_all (main_window); 195 195 gtk_main ();
Note: See TracChangeset
for help on using the changeset viewer.