Changeset 85192 in webkit


Ignore:
Timestamp:
Apr 28, 2011 9:28:49 AM (13 years ago)
Author:
Carlos Garcia Campos
Message:

2011-04-28 Carlos Garcia Campos <cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] WKView should be a GtkWidget
https://bugs.webkit.org/show_bug.cgi?id=59603

  • UIProcess/API/C/gtk/WKAPICastGtk.h: Map WKViewRef to WebKitWebViewBase instead of WebView.
  • UIProcess/API/C/gtk/WKView.h: Remove WKViewGetWindow().
  • UIProcess/API/C/gtk/WKView.cpp: (WKViewCreate): Return the view instead of the page client. (WKViewGetPage): Use WebKitWebViewBase API to get the page client containing the page.

2011-04-28 Carlos Garcia Campos <cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] WKView should be a GtkWidget
https://bugs.webkit.org/show_bug.cgi?id=59603

Don't use WKViewGetWindow(), use WKView as a GtkWidget instead.

  • MiniBrowser/gtk/main.c: (createWindow): (main):
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r85120 r85192  
     12011-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
    1162011-04-27  Sam Weinig  <sam@webkit.org>
    217
  • trunk/Source/WebKit2/UIProcess/API/C/gtk/WKAPICastGtk.h

    r78072 r85192  
    3232#endif
    3333
     34typedef struct _WebKitWebViewBase WebKitWebViewBase;
     35
    3436namespace WebKit {
    3537
    36 class WebView;
    37 
    38 WK_ADD_API_MAPPING(WKViewRef, WebView)
     38WK_ADD_API_MAPPING(WKViewRef, WebKitWebViewBase)
    3939
    4040}
  • trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.cpp

    r79671 r85192  
    3030
    3131#include "WKAPICast.h"
     32#include "WebKitWebViewBase.h"
    3233#include "WebView.h"
    3334#include <wtf/PassRefPtr.h>
     
    4142{
    4243    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()));
    4945}
    5046
    5147WKPageRef WKViewGetPage(WKViewRef viewRef)
    5248{
    53     return toAPI(toImpl(viewRef)->page());
     49    return toAPI(webkitWebViewBaseGetWebViewInstance(toImpl(viewRef))->page());
    5450}
    5551
  • trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.h

    r79671 r85192  
    3030
    3131#include <WebKit2/WKBase.h>
    32 #include <gtk/gtk.h>
    3332
    3433#ifdef __cplusplus
     
    3736
    3837WK_EXPORT WKViewRef WKViewCreate(WKContextRef context, WKPageGroupRef pageGroup);
    39 
    40 WK_EXPORT GtkWidget* WKViewGetWindow(WKViewRef view);
    4138
    4239WK_EXPORT WKPageRef WKViewGetPage(WKViewRef view);
  • trunk/Tools/ChangeLog

    r85177 r85192  
     12011-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
    1142011-04-28  Gabor Rapcsanyi  <rgabor@webkit.org>
    215
  • trunk/Tools/MiniBrowser/gtk/main.c

    r82570 r85192  
    9999    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
    100100    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);
    102102
    103103    gtk_container_add(GTK_CONTAINER(window), vbox);
     
    131131    g_free(url);
    132132
    133     gtk_widget_grab_focus(WKViewGetWindow(webView));
     133    gtk_widget_grab_focus(GTK_WIDGET(webView));
    134134    gtk_widget_show_all(mainWindow);
    135135    gtk_main();
Note: See TracChangeset for help on using the changeset viewer.