Changeset 85192 in webkit
- Timestamp:
- Apr 28, 2011 9:28:49 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r85120 r85192 1 2011-04-28 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] WKView should be a GtkWidget 6 https://bugs.webkit.org/show_bug.cgi?id=59603 7 8 * UIProcess/API/C/gtk/WKAPICastGtk.h: Map WKViewRef to 9 WebKitWebViewBase instead of WebView. 10 * UIProcess/API/C/gtk/WKView.h: Remove WKViewGetWindow(). 11 * UIProcess/API/C/gtk/WKView.cpp: 12 (WKViewCreate): Return the view instead of the page client. 13 (WKViewGetPage): Use WebKitWebViewBase API to get the page client 14 containing the page. 15 1 16 2011-04-27 Sam Weinig <sam@webkit.org> 2 17 -
trunk/Source/WebKit2/UIProcess/API/C/gtk/WKAPICastGtk.h
r78072 r85192 32 32 #endif 33 33 34 typedef struct _WebKitWebViewBase WebKitWebViewBase; 35 34 36 namespace WebKit { 35 37 36 class WebView; 37 38 WK_ADD_API_MAPPING(WKViewRef, WebView) 38 WK_ADD_API_MAPPING(WKViewRef, WebKitWebViewBase) 39 39 40 40 } -
trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.cpp
r79671 r85192 30 30 31 31 #include "WKAPICast.h" 32 #include "WebKitWebViewBase.h" 32 33 #include "WebView.h" 33 34 #include <wtf/PassRefPtr.h> … … 41 42 { 42 43 RefPtr<WebView> view = WebView::create(toImpl(contextRef), toImpl(pageGroupRef)); 43 return toAPI(view.release().leakRef()); 44 } 45 46 GtkWidget* WKViewGetWindow(WKViewRef viewRef) 47 { 48 return toImpl(viewRef)->window(); 44 return toAPI(WEBKIT_WEB_VIEW_BASE(view.release().leakRef()->window())); 49 45 } 50 46 51 47 WKPageRef WKViewGetPage(WKViewRef viewRef) 52 48 { 53 return toAPI( toImpl(viewRef)->page());49 return toAPI(webkitWebViewBaseGetWebViewInstance(toImpl(viewRef))->page()); 54 50 } 55 51 -
trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.h
r79671 r85192 30 30 31 31 #include <WebKit2/WKBase.h> 32 #include <gtk/gtk.h>33 32 34 33 #ifdef __cplusplus … … 37 36 38 37 WK_EXPORT WKViewRef WKViewCreate(WKContextRef context, WKPageGroupRef pageGroup); 39 40 WK_EXPORT GtkWidget* WKViewGetWindow(WKViewRef view);41 38 42 39 WK_EXPORT WKPageRef WKViewGetPage(WKViewRef view); -
trunk/Tools/ChangeLog
r85177 r85192 1 2011-04-28 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] WKView should be a GtkWidget 6 https://bugs.webkit.org/show_bug.cgi?id=59603 7 8 Don't use WKViewGetWindow(), use WKView as a GtkWidget instead. 9 10 * MiniBrowser/gtk/main.c: 11 (createWindow): 12 (main): 13 1 14 2011-04-28 Gabor Rapcsanyi <rgabor@webkit.org> 2 15 -
trunk/Tools/MiniBrowser/gtk/main.c
r82570 r85192 99 99 GtkWidget *vbox = gtk_vbox_new(FALSE, 0); 100 100 gtk_box_pack_start(GTK_BOX(vbox), createToolbar(uriEntry, webView), FALSE, FALSE, 0); 101 gtk_box_pack_start(GTK_BOX(vbox), WKViewGetWindow(webView), TRUE, TRUE, 0);101 gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(webView), TRUE, TRUE, 0); 102 102 103 103 gtk_container_add(GTK_CONTAINER(window), vbox); … … 131 131 g_free(url); 132 132 133 gtk_widget_grab_focus( WKViewGetWindow(webView));133 gtk_widget_grab_focus(GTK_WIDGET(webView)); 134 134 gtk_widget_show_all(mainWindow); 135 135 gtk_main();
Note: See TracChangeset
for help on using the changeset viewer.