Changeset 73906 in webkit


Ignore:
Timestamp:
Dec 13, 2010 5:27:25 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2010-12-13 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Xan Lopez.

[GTK] Do not use GET_PRIVATE macros
​https://bugs.webkit.org/show_bug.cgi?id=50915

GET_PRIVATE macros are slow and should only be used in the object
init() method.

  • WebCoreSupport/ContextMenuClientGtk.cpp: (WebKit::inputMethodsMenuItem):
  • WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::postProgressFinishedNotification): (WebKit::FrameLoaderClient::setTitle): (WebKit::FrameLoaderClient::dispatchCreatePage): (WebKit::postCommitFrameViewSetup):
  • webkit/webkitdownload.cpp: (webkit_download_init):
  • webkit/webkitgeolocationpolicydecision.cpp: (webkit_geolocation_policy_decision_init):
  • webkit/webkithittestresult.cpp: (webkit_hit_test_result_init):
  • webkit/webkitnetworkrequest.cpp: (webkit_network_request_init):
  • webkit/webkitsecurityorigin.cpp: (webkit_security_origin_init):
  • webkit/webkitsecurityoriginprivate.h:
  • webkit/webkitviewportattributes.cpp: (webkit_viewport_attributes_init):
  • webkit/webkitwebbackforwardlist.cpp: (webkit_web_back_forward_list_init):
  • webkit/webkitwebdatabase.cpp: (webkit_web_database_init):
  • webkit/webkitwebdatasource.cpp: (webkit_web_data_source_init):
  • webkit/webkitwebframe.cpp: (webkit_web_frame_init): (webkit_web_frame_new):
  • webkit/webkitwebframeprivate.h:
  • webkit/webkitwebhistoryitem.cpp: (webkit_web_history_item_init):
  • webkit/webkitwebinspector.cpp: (webkit_web_inspector_init):
  • webkit/webkitwebnavigationaction.cpp: (webkit_web_navigation_action_init):
  • webkit/webkitwebplugin.cpp: (webkit_web_plugin_init):
  • webkit/webkitwebplugindatabase.cpp: (webkit_web_plugin_database_init):
  • webkit/webkitwebplugindatabaseprivate.h:
  • webkit/webkitwebpluginprivate.h:
  • webkit/webkitwebpolicydecision.cpp: (webkit_web_policy_decision_init):
  • webkit/webkitwebresource.cpp: (webkit_web_resource_init):
  • webkit/webkitwebresourceprivate.h:
  • webkit/webkitwebsettings.cpp: (webkit_web_settings_init):
  • webkit/webkitwebview.cpp: (PopupMenuPositionFunc): (webkit_web_view_forward_context_menu_event): (webkit_web_view_drag_end): (webkit_web_view_drag_data_get): (webkit_web_view_query_tooltip): (webkit_web_view_init):
  • webkit/webkitwebwindowfeatures.cpp: (webkit_web_window_features_init):
Location:
trunk/WebKit/gtk
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/gtk/ChangeLog

    r73886 r73906  
     12010-12-13  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [GTK] Do not use GET_PRIVATE macros
     6        https://bugs.webkit.org/show_bug.cgi?id=50915
     7
     8        GET_PRIVATE macros are slow and should only be used in the object
     9        init() method.
     10
     11        * WebCoreSupport/ContextMenuClientGtk.cpp:
     12        (WebKit::inputMethodsMenuItem):
     13        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     14        (WebKit::FrameLoaderClient::postProgressFinishedNotification):
     15        (WebKit::FrameLoaderClient::setTitle):
     16        (WebKit::FrameLoaderClient::dispatchCreatePage):
     17        (WebKit::postCommitFrameViewSetup):
     18        * webkit/webkitdownload.cpp:
     19        (webkit_download_init):
     20        * webkit/webkitgeolocationpolicydecision.cpp:
     21        (webkit_geolocation_policy_decision_init):
     22        * webkit/webkithittestresult.cpp:
     23        (webkit_hit_test_result_init):
     24        * webkit/webkitnetworkrequest.cpp:
     25        (webkit_network_request_init):
     26        * webkit/webkitsecurityorigin.cpp:
     27        (webkit_security_origin_init):
     28        * webkit/webkitsecurityoriginprivate.h:
     29        * webkit/webkitviewportattributes.cpp:
     30        (webkit_viewport_attributes_init):
     31        * webkit/webkitwebbackforwardlist.cpp:
     32        (webkit_web_back_forward_list_init):
     33        * webkit/webkitwebdatabase.cpp:
     34        (webkit_web_database_init):
     35        * webkit/webkitwebdatasource.cpp:
     36        (webkit_web_data_source_init):
     37        * webkit/webkitwebframe.cpp:
     38        (webkit_web_frame_init):
     39        (webkit_web_frame_new):
     40        * webkit/webkitwebframeprivate.h:
     41        * webkit/webkitwebhistoryitem.cpp:
     42        (webkit_web_history_item_init):
     43        * webkit/webkitwebinspector.cpp:
     44        (webkit_web_inspector_init):
     45        * webkit/webkitwebnavigationaction.cpp:
     46        (webkit_web_navigation_action_init):
     47        * webkit/webkitwebplugin.cpp:
     48        (webkit_web_plugin_init):
     49        * webkit/webkitwebplugindatabase.cpp:
     50        (webkit_web_plugin_database_init):
     51        * webkit/webkitwebplugindatabaseprivate.h:
     52        * webkit/webkitwebpluginprivate.h:
     53        * webkit/webkitwebpolicydecision.cpp:
     54        (webkit_web_policy_decision_init):
     55        * webkit/webkitwebresource.cpp:
     56        (webkit_web_resource_init):
     57        * webkit/webkitwebresourceprivate.h:
     58        * webkit/webkitwebsettings.cpp:
     59        (webkit_web_settings_init):
     60        * webkit/webkitwebview.cpp:
     61        (PopupMenuPositionFunc):
     62        (webkit_web_view_forward_context_menu_event):
     63        (webkit_web_view_drag_end):
     64        (webkit_web_view_drag_data_get):
     65        (webkit_web_view_query_tooltip):
     66        (webkit_web_view_init):
     67        * webkit/webkitwebwindowfeatures.cpp:
     68        (webkit_web_window_features_init):
     69
    1702010-10-28  MORITA Hajime  <morrita@google.com>
    271

  • trunk/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp

    r73539 r73906  
    6363        _("Input _Methods"));
    6464
    65     WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
     65    WebKitWebViewPrivate* priv = webView->priv;
    6666    GtkWidget* imContextMenu = gtk_menu_new();
    6767    gtk_im_multicontext_append_menuitems(GTK_IM_MULTICONTEXT(priv->imContext.get()), GTK_MENU_SHELL(imContextMenu));

  • trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r73855 r73906  
    379379{
    380380    WebKitWebView* webView = getViewFromFrame(m_frame);
    381     WebKitWebViewPrivate* privateData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
     381    WebKitWebViewPrivate* privateData = webView->priv;
    382382
    383383    // We can get a stopLoad() from dispose when the object is being
    … …  
    10521052void FrameLoaderClient::setTitle(const String& title, const KURL& url)
    10531053{
    1054     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(m_frame);
     1054    WebKitWebFramePrivate* frameData = m_frame->priv;
    10551055    g_free(frameData->title);
    10561056    frameData->title = g_strdup(title.utf8().data());
    … …  
    12371237        return 0;
    12381238
    1239     WebKitWebViewPrivate* privateData = WEBKIT_WEB_VIEW_GET_PRIVATE(newWebView);
     1239    WebKitWebViewPrivate* privateData = newWebView->priv;
    12401240    return core(privateData->mainFrame);
    12411241}
    … …  
    12881288    webkit_web_view_clear_resources(containingWindow);
    12891289
    1290     WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(containingWindow);
     1290    WebKitWebViewPrivate* priv = containingWindow->priv;
    12911291    view->setGtkAdjustments(priv->horizontalAdjustment.get(), priv->verticalAdjustment.get(), resetValues);
    12921292

  • trunk/WebKit/gtk/webkit/webkitdownload.cpp

    r73855 r73906  
    7373};
    7474
    75 #define WEBKIT_DOWNLOAD_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_DOWNLOAD, WebKitDownloadPrivate))
    76 
    7775struct _WebKitDownloadPrivate {
    7876    gchar* destinationURI;
    … …  
    391389static void webkit_download_init(WebKitDownload* download)
    392390{
    393     WebKitDownloadPrivate* priv = WEBKIT_DOWNLOAD_GET_PRIVATE(download);
     391    WebKitDownloadPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(download, WEBKIT_TYPE_DOWNLOAD, WebKitDownloadPrivate);
    394392    download->priv = priv;
    395393

  • trunk/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp

    r55444 r73906  
    4444};
    4545
    46 #define WEBKIT_GEOLOCATION_POLICY_DECISION_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION, WebKitGeolocationPolicyDecisionPrivate))
    47 
    4846static void webkit_geolocation_policy_decision_class_init(WebKitGeolocationPolicyDecisionClass* decisionClass)
    4947{
    … …  
    5351static void webkit_geolocation_policy_decision_init(WebKitGeolocationPolicyDecision* decision)
    5452{
    55     decision->priv = WEBKIT_GEOLOCATION_POLICY_DECISION_GET_PRIVATE(decision);
     53    decision->priv = G_TYPE_INSTANCE_GET_PRIVATE(decision, WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION, WebKitGeolocationPolicyDecisionPrivate);
    5654}
    5755

  • trunk/WebKit/gtk/webkit/webkithittestresult.cpp

    r73855 r73906  
    4949    WebKitDOMNode* innerNode;
    5050};
    51 
    52 #define WEBKIT_HIT_TEST_RESULT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_HIT_TEST_RESULT, WebKitHitTestResultPrivate))
    5351
    5452enum {
    … …  
    231229static void webkit_hit_test_result_init(WebKitHitTestResult* web_hit_test_result)
    232230{
    233     web_hit_test_result->priv = WEBKIT_HIT_TEST_RESULT_GET_PRIVATE(web_hit_test_result);
     231    web_hit_test_result->priv = G_TYPE_INSTANCE_GET_PRIVATE(web_hit_test_result, WEBKIT_TYPE_HIT_TEST_RESULT, WebKitHitTestResultPrivate);
    234232}
    235233

  • trunk/WebKit/gtk/webkit/webkitnetworkrequest.cpp

    r73701 r73906  
    4848    SoupMessage* message;
    4949};
    50 
    51 #define WEBKIT_NETWORK_REQUEST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestPrivate))
    5250
    5351enum {
    … …  
    158156static void webkit_network_request_init(WebKitNetworkRequest* request)
    159157{
    160     WebKitNetworkRequestPrivate* priv = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
     158    WebKitNetworkRequestPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(request, WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestPrivate);
    161159    request->priv = priv;
    162160}

  • trunk/WebKit/gtk/webkit/webkitsecurityorigin.cpp

    r73855 r73906  
    213213static void webkit_security_origin_init(WebKitSecurityOrigin* securityOrigin)
    214214{
    215     WebKitSecurityOriginPrivate* priv = WEBKIT_SECURITY_ORIGIN_GET_PRIVATE(securityOrigin);
     215    WebKitSecurityOriginPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(securityOrigin, WEBKIT_TYPE_SECURITY_ORIGIN, WebKitSecurityOriginPrivate);
    216216    priv->webDatabases = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref);
    217217    securityOrigin->priv = priv;

  • trunk/WebKit/gtk/webkit/webkitsecurityoriginprivate.h

    r73855 r73906  
    3636extern "C" {
    3737
    38 #define WEBKIT_SECURITY_ORIGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_SECURITY_ORIGIN, WebKitSecurityOriginPrivate))
    3938struct _WebKitSecurityOriginPrivate {
    4039    RefPtr<WebCore::SecurityOrigin> coreOrigin;

  • trunk/WebKit/gtk/webkit/webkitviewportattributes.cpp

    r73855 r73906  
    111111G_DEFINE_TYPE(WebKitViewportAttributes, webkit_viewport_attributes, G_TYPE_OBJECT);
    112112
    113 #define WEBKIT_VIEWPORT_ATTRIBUTES_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_VIEWPORT_ATTRIBUTES, WebKitViewportAttributesPrivate))
    114 
    115113static void webkit_viewport_attributes_get_property(GObject* object, guint propertyID, GValue* value, GParamSpec* paramSpec);
    116114static void webkit_viewport_attributes_set_property(GObject* object, guint propertyID, const GValue* value, GParamSpec* paramSpec);
    … …  
    415413static void webkit_viewport_attributes_init(WebKitViewportAttributes* viewport)
    416414{
    417     viewport->priv = WEBKIT_VIEWPORT_ATTRIBUTES_GET_PRIVATE(viewport);
     415    viewport->priv = G_TYPE_INSTANCE_GET_PRIVATE(viewport, WEBKIT_TYPE_VIEWPORT_ATTRIBUTES, WebKitViewportAttributesPrivate);
    418416
    419417    viewport->priv->deviceWidth = 0;

  • trunk/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp

    r73855 r73906  
    5959};
    6060
    61 #define WEBKIT_WEB_BACK_FORWARD_LIST_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, WebKitWebBackForwardListPrivate))
    62 
    6361G_DEFINE_TYPE(WebKitWebBackForwardList, webkit_web_back_forward_list, G_TYPE_OBJECT);
    6462
    … …  
    9492static void webkit_web_back_forward_list_init(WebKitWebBackForwardList* webBackForwardList)
    9593{
    96     webBackForwardList->priv = WEBKIT_WEB_BACK_FORWARD_LIST_GET_PRIVATE(webBackForwardList);
     94    webBackForwardList->priv = G_TYPE_INSTANCE_GET_PRIVATE(webBackForwardList, WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, WebKitWebBackForwardListPrivate);
    9795}
    9896

  • trunk/WebKit/gtk/webkit/webkitwebdatabase.cpp

    r73855 r73906  
    7777static gchar* webkit_database_directory_path = NULL;
    7878static guint64 webkit_default_database_quota = 5 * 1024 * 1024;
    79 
    80 #define WEBKIT_WEB_DATABASE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_DATABASE, WebKitWebDatabasePrivate))
    8179
    8280static void webkit_web_database_set_security_origin(WebKitWebDatabase* webDatabase, WebKitSecurityOrigin* security_origin);
    … …  
    251249static void webkit_web_database_init(WebKitWebDatabase* webDatabase)
    252250{
    253     webDatabase->priv = WEBKIT_WEB_DATABASE_GET_PRIVATE(webDatabase);
     251    webDatabase->priv = G_TYPE_INSTANCE_GET_PRIVATE(webDatabase, WEBKIT_TYPE_WEB_DATABASE, WebKitWebDatabasePrivate);
    254252}
    255253

  • trunk/WebKit/gtk/webkit/webkitwebdatasource.cpp

    r73701 r73906  
    7575};
    7676
    77 #define WEBKIT_WEB_DATA_SOURCE_GET_PRIVATE(obj)        (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_DATA_SOURCE, WebKitWebDataSourcePrivate))
    78 
    7977G_DEFINE_TYPE(WebKitWebDataSource, webkit_web_data_source, G_TYPE_OBJECT);
    8078
    … …  
    136134static void webkit_web_data_source_init(WebKitWebDataSource* webDataSource)
    137135{
    138     webDataSource->priv = WEBKIT_WEB_DATA_SOURCE_GET_PRIVATE(webDataSource);
     136    webDataSource->priv = G_TYPE_INSTANCE_GET_PRIVATE(webDataSource, WEBKIT_TYPE_WEB_DATA_SOURCE, WebKitWebDataSourcePrivate);
    139137}
    140138

  • trunk/WebKit/gtk/webkit/webkitwebframe.cpp

    r73855 r73906  
    382382static void webkit_web_frame_init(WebKitWebFrame* frame)
    383383{
    384     WebKitWebFramePrivate* priv = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
     384    WebKitWebFramePrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(frame, WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate);
    385385
    386386    // TODO: Move constructor code here.
    … …  
    405405    WebKitWebFrame* frame = WEBKIT_WEB_FRAME(g_object_new(WEBKIT_TYPE_WEB_FRAME, NULL));
    406406    WebKitWebFramePrivate* priv = frame->priv;
    407     WebKitWebViewPrivate* viewPriv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
     407    WebKitWebViewPrivate* viewPriv = webView->priv;
    408408
    409409    priv->webView = webView;

  • trunk/WebKit/gtk/webkit/webkitwebframeprivate.h

    r73696 r73906  
    3535extern "C" {
    3636
    37 #define WEBKIT_WEB_FRAME_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate))
    3837typedef struct _WebKitWebFramePrivate WebKitWebFramePrivate;
    3938struct _WebKitWebFramePrivate {

  • trunk/WebKit/gtk/webkit/webkitwebhistoryitem.cpp

    r73855 r73906  
    6262    gboolean disposed;
    6363};
    64 
    65 #define WEBKIT_WEB_HISTORY_ITEM_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_HISTORY_ITEM, WebKitWebHistoryItemPrivate))
    6664
    6765enum {
    … …  
    218216static void webkit_web_history_item_init(WebKitWebHistoryItem* webHistoryItem)
    219217{
    220     webHistoryItem->priv = WEBKIT_WEB_HISTORY_ITEM_GET_PRIVATE(webHistoryItem);
     218    webHistoryItem->priv = G_TYPE_INSTANCE_GET_PRIVATE(webHistoryItem, WEBKIT_TYPE_WEB_HISTORY_ITEM, WebKitWebHistoryItemPrivate);
    221219}
    222220

  • trunk/WebKit/gtk/webkit/webkitwebinspector.cpp

    r73702 r73906  
    9898    gchar* inspected_uri;
    9999};
    100 
    101 #define WEBKIT_WEB_INSPECTOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_INSPECTOR, WebKitWebInspectorPrivate))
    102100
    103101static void webkit_web_inspector_finalize(GObject* object);
    … …  
    327325static void webkit_web_inspector_init(WebKitWebInspector* web_inspector)
    328326{
    329     web_inspector->priv = WEBKIT_WEB_INSPECTOR_GET_PRIVATE(web_inspector);
     327    web_inspector->priv = G_TYPE_INSTANCE_GET_PRIVATE(web_inspector, WEBKIT_TYPE_WEB_INSPECTOR, WebKitWebInspectorPrivate);
    330328}
    331329

  • trunk/WebKit/gtk/webkit/webkitwebnavigationaction.cpp

    r73855 r73906  
    4949};
    5050
    51 #define WEBKIT_WEB_NAVIGATION_ACTION_GET_PRIVATE(obj)(G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_NAVIGATION_ACTION, WebKitWebNavigationActionPrivate))
    52 
    5351enum  {
    5452    PROP_0,
    … …  
    119117static void webkit_web_navigation_action_init(WebKitWebNavigationAction* navigationAction)
    120118{
    121     navigationAction->priv = WEBKIT_WEB_NAVIGATION_ACTION_GET_PRIVATE(navigationAction);
     119    navigationAction->priv = G_TYPE_INSTANCE_GET_PRIVATE(navigationAction, WEBKIT_TYPE_WEB_NAVIGATION_ACTION, WebKitWebNavigationActionPrivate);
    122120}
    123121

  • trunk/WebKit/gtk/webkit/webkitwebplugin.cpp

    r73858 r73906  
    7171static void webkit_web_plugin_init(WebKitWebPlugin *plugin)
    7272{
    73     WebKitWebPluginPrivate* priv = WEBKIT_WEB_PLUGIN_GET_PRIVATE(plugin);
     73    WebKitWebPluginPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(plugin, WEBKIT_TYPE_WEB_PLUGIN, WebKitWebPluginPrivate);
    7474    plugin->priv = priv = new WebKitWebPluginPrivate();
    7575}

  • trunk/WebKit/gtk/webkit/webkitwebplugindatabase.cpp

    r73858 r73906  
    4848static void webkit_web_plugin_database_init(WebKitWebPluginDatabase* database)
    4949{
    50     WebKitWebPluginDatabasePrivate* priv = WEBKIT_WEB_PLUGIN_DATABASE_GET_PRIVATE(database);
     50    WebKitWebPluginDatabasePrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(database, WEBKIT_TYPE_WEB_PLUGIN_DATABASE, WebKitWebPluginDatabasePrivate);
    5151    database->priv = priv;
    5252

  • trunk/WebKit/gtk/webkit/webkitwebplugindatabaseprivate.h

    r73858 r73906  
    2929extern "C" {
    3030
    31 #define WEBKIT_WEB_PLUGIN_DATABASE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_PLUGIN_DATABASE, WebKitWebPluginDatabasePrivate))
    3231typedef struct _WebKitWebPluginDatabasePrivate WebKitWebPluginDatabasePrivate;
    3332struct _WebKitWebPluginDatabasePrivate {

  • trunk/WebKit/gtk/webkit/webkitwebpluginprivate.h

    r73858 r73906  
    3333extern "C" {
    3434
    35 #define WEBKIT_WEB_PLUGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_PLUGIN, WebKitWebPluginPrivate))
    3635typedef struct _WebKitWebPluginPrivate WebKitWebPluginPrivate;
    3736struct _WebKitWebPluginPrivate {

  • trunk/WebKit/gtk/webkit/webkitwebpolicydecision.cpp

    r73855 r73906  
    4747};
    4848
    49 #define WEBKIT_WEB_POLICY_DECISION_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_POLICY_DECISION, WebKitWebPolicyDecisionPrivate))
    50 
    5149static void webkit_web_policy_decision_class_init(WebKitWebPolicyDecisionClass* decisionClass)
    5250{
    … …  
    5654static void webkit_web_policy_decision_init(WebKitWebPolicyDecision* decision)
    5755{
    58     decision->priv = WEBKIT_WEB_POLICY_DECISION_GET_PRIVATE(decision);
     56    decision->priv = G_TYPE_INSTANCE_GET_PRIVATE(decision, WEBKIT_TYPE_WEB_POLICY_DECISION, WebKitWebPolicyDecisionPrivate);
    5957}
    6058

  • trunk/WebKit/gtk/webkit/webkitwebresource.cpp

    r73855 r73906  
    218218static void webkit_web_resource_init(WebKitWebResource* webResource)
    219219{
    220     webResource->priv = WEBKIT_WEB_RESOURCE_GET_PRIVATE(webResource);
     220    webResource->priv = G_TYPE_INSTANCE_GET_PRIVATE(webResource, WEBKIT_TYPE_WEB_RESOURCE, WebKitWebResourcePrivate);
    221221}
    222222

  • trunk/WebKit/gtk/webkit/webkitwebresourceprivate.h

    r73855 r73906  
    2929extern "C" {
    3030
    31 #define WEBKIT_WEB_RESOURCE_GET_PRIVATE(obj)        (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_RESOURCE, WebKitWebResourcePrivate))
    3231struct _WebKitWebResourcePrivate {
    3332    WebCore::ArchiveResource* resource;

  • trunk/WebKit/gtk/webkit/webkitwebsettings.cpp

    r73855 r73906  
    918918static void webkit_web_settings_init(WebKitWebSettings* web_settings)
    919919{
    920     web_settings->priv = WEBKIT_WEB_SETTINGS_GET_PRIVATE(web_settings);
     920    web_settings->priv = G_TYPE_INSTANCE_GET_PRIVATE(web_settings, WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsPrivate);
    921921}
    922922

  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r73858 r73906  
    252252{
    253253    WebKitWebView* view = WEBKIT_WEB_VIEW(userData);
    254     WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(view);
     254    WebKitWebViewPrivate* priv = view->priv;
    255255    GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(view));
    256256    GtkRequisition menuSize;
    … …  
    364364        return FALSE;
    365365
    366     WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
     366    WebKitWebViewPrivate* priv = webView->priv;
    367367    priv->currentMenu = menu;
    368368    priv->lastPopupXPosition = event.globalX();
    … …  
    15121512{
    15131513    WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
    1514     WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
     1514    WebKitWebViewPrivate* priv = webView->priv;
    15151515
    15161516    // This might happen if a drag is still in progress after a WebKitWebView
    … …  
    15501550static void webkit_web_view_drag_data_get(GtkWidget* widget, GdkDragContext* context, GtkSelectionData* selectionData, guint info, guint)
    15511551{
    1552     WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(widget));
     1552    WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW(widget)->priv;
    15531553
    15541554    // This might happen if a drag is still in progress after a WebKitWebView
    … …  
    16871687static gboolean webkit_web_view_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip)
    16881688{
    1689     WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(widget);
     1689    WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW(widget)->priv;
    16901690
    16911691    if (keyboard_mode) {
    … …  
    34583458static void webkit_web_view_init(WebKitWebView* webView)
    34593459{
    3460     WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
     3460    WebKitWebViewPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(webView, WEBKIT_TYPE_WEB_VIEW, WebKitWebViewPrivate);
    34613461    webView->priv = priv;
    34623462    // This is the placement new syntax: http://www.parashift.com/c++-faq-lite/dtors.html#faq-11.10

  • trunk/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp

    r70036 r73906  
    277277static void webkit_web_window_features_init(WebKitWebWindowFeatures* web_window_features)
    278278{
    279     web_window_features->priv = WEBKIT_WEB_WINDOW_FEATURES_GET_PRIVATE(web_window_features);
     279    web_window_features->priv = G_TYPE_INSTANCE_GET_PRIVATE(web_window_features, WEBKIT_TYPE_WEB_WINDOW_FEATURES, WebKitWebWindowFeaturesPrivate);
    280280}
    281281
Note: See TracChangeset for help on using the changeset viewer.