Changeset 73906 in webkit
- Timestamp:
- Dec 13, 2010 5:27:25 AM (13 years ago)
- Location:
- trunk/WebKit/gtk
- Files:
-
- 28 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/gtk/ChangeLog
r73886 r73906 1 2010-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 1 70 2010-10-28 MORITA Hajime <morrita@google.com> 2 71 -
trunk/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp
r73539 r73906 63 63 _("Input _Methods")); 64 64 65 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);65 WebKitWebViewPrivate* priv = webView->priv; 66 66 GtkWidget* imContextMenu = gtk_menu_new(); 67 67 gtk_im_multicontext_append_menuitems(GTK_IM_MULTICONTEXT(priv->imContext.get()), GTK_MENU_SHELL(imContextMenu)); -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r73855 r73906 379 379 { 380 380 WebKitWebView* webView = getViewFromFrame(m_frame); 381 WebKitWebViewPrivate* privateData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);381 WebKitWebViewPrivate* privateData = webView->priv; 382 382 383 383 // We can get a stopLoad() from dispose when the object is being … … 1052 1052 void FrameLoaderClient::setTitle(const String& title, const KURL& url) 1053 1053 { 1054 WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(m_frame);1054 WebKitWebFramePrivate* frameData = m_frame->priv; 1055 1055 g_free(frameData->title); 1056 1056 frameData->title = g_strdup(title.utf8().data()); … … 1237 1237 return 0; 1238 1238 1239 WebKitWebViewPrivate* privateData = WEBKIT_WEB_VIEW_GET_PRIVATE(newWebView);1239 WebKitWebViewPrivate* privateData = newWebView->priv; 1240 1240 return core(privateData->mainFrame); 1241 1241 } … … 1288 1288 webkit_web_view_clear_resources(containingWindow); 1289 1289 1290 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(containingWindow);1290 WebKitWebViewPrivate* priv = containingWindow->priv; 1291 1291 view->setGtkAdjustments(priv->horizontalAdjustment.get(), priv->verticalAdjustment.get(), resetValues); 1292 1292 -
trunk/WebKit/gtk/webkit/webkitdownload.cpp
r73855 r73906 73 73 }; 74 74 75 #define WEBKIT_DOWNLOAD_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_DOWNLOAD, WebKitDownloadPrivate))76 77 75 struct _WebKitDownloadPrivate { 78 76 gchar* destinationURI; … … 391 389 static void webkit_download_init(WebKitDownload* download) 392 390 { 393 WebKitDownloadPrivate* priv = WEBKIT_DOWNLOAD_GET_PRIVATE(download);391 WebKitDownloadPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(download, WEBKIT_TYPE_DOWNLOAD, WebKitDownloadPrivate); 394 392 download->priv = priv; 395 393 -
trunk/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp
r55444 r73906 44 44 }; 45 45 46 #define WEBKIT_GEOLOCATION_POLICY_DECISION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION, WebKitGeolocationPolicyDecisionPrivate))47 48 46 static void webkit_geolocation_policy_decision_class_init(WebKitGeolocationPolicyDecisionClass* decisionClass) 49 47 { … … 53 51 static void webkit_geolocation_policy_decision_init(WebKitGeolocationPolicyDecision* decision) 54 52 { 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); 56 54 } 57 55 -
trunk/WebKit/gtk/webkit/webkithittestresult.cpp
r73855 r73906 49 49 WebKitDOMNode* innerNode; 50 50 }; 51 52 #define WEBKIT_HIT_TEST_RESULT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_HIT_TEST_RESULT, WebKitHitTestResultPrivate))53 51 54 52 enum { … … 231 229 static void webkit_hit_test_result_init(WebKitHitTestResult* web_hit_test_result) 232 230 { 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); 234 232 } 235 233 -
trunk/WebKit/gtk/webkit/webkitnetworkrequest.cpp
r73701 r73906 48 48 SoupMessage* message; 49 49 }; 50 51 #define WEBKIT_NETWORK_REQUEST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestPrivate))52 50 53 51 enum { … … 158 156 static void webkit_network_request_init(WebKitNetworkRequest* request) 159 157 { 160 WebKitNetworkRequestPrivate* priv = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);158 WebKitNetworkRequestPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(request, WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestPrivate); 161 159 request->priv = priv; 162 160 } -
trunk/WebKit/gtk/webkit/webkitsecurityorigin.cpp
r73855 r73906 213 213 static void webkit_security_origin_init(WebKitSecurityOrigin* securityOrigin) 214 214 { 215 WebKitSecurityOriginPrivate* priv = WEBKIT_SECURITY_ORIGIN_GET_PRIVATE(securityOrigin);215 WebKitSecurityOriginPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(securityOrigin, WEBKIT_TYPE_SECURITY_ORIGIN, WebKitSecurityOriginPrivate); 216 216 priv->webDatabases = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref); 217 217 securityOrigin->priv = priv; -
trunk/WebKit/gtk/webkit/webkitsecurityoriginprivate.h
r73855 r73906 36 36 extern "C" { 37 37 38 #define WEBKIT_SECURITY_ORIGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_SECURITY_ORIGIN, WebKitSecurityOriginPrivate))39 38 struct _WebKitSecurityOriginPrivate { 40 39 RefPtr<WebCore::SecurityOrigin> coreOrigin; -
trunk/WebKit/gtk/webkit/webkitviewportattributes.cpp
r73855 r73906 111 111 G_DEFINE_TYPE(WebKitViewportAttributes, webkit_viewport_attributes, G_TYPE_OBJECT); 112 112 113 #define WEBKIT_VIEWPORT_ATTRIBUTES_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_VIEWPORT_ATTRIBUTES, WebKitViewportAttributesPrivate))114 115 113 static void webkit_viewport_attributes_get_property(GObject* object, guint propertyID, GValue* value, GParamSpec* paramSpec); 116 114 static void webkit_viewport_attributes_set_property(GObject* object, guint propertyID, const GValue* value, GParamSpec* paramSpec); … … 415 413 static void webkit_viewport_attributes_init(WebKitViewportAttributes* viewport) 416 414 { 417 viewport->priv = WEBKIT_VIEWPORT_ATTRIBUTES_GET_PRIVATE(viewport);415 viewport->priv = G_TYPE_INSTANCE_GET_PRIVATE(viewport, WEBKIT_TYPE_VIEWPORT_ATTRIBUTES, WebKitViewportAttributesPrivate); 418 416 419 417 viewport->priv->deviceWidth = 0; -
trunk/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
r73855 r73906 59 59 }; 60 60 61 #define WEBKIT_WEB_BACK_FORWARD_LIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, WebKitWebBackForwardListPrivate))62 63 61 G_DEFINE_TYPE(WebKitWebBackForwardList, webkit_web_back_forward_list, G_TYPE_OBJECT); 64 62 … … 94 92 static void webkit_web_back_forward_list_init(WebKitWebBackForwardList* webBackForwardList) 95 93 { 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); 97 95 } 98 96 -
trunk/WebKit/gtk/webkit/webkitwebdatabase.cpp
r73855 r73906 77 77 static gchar* webkit_database_directory_path = NULL; 78 78 static 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))81 79 82 80 static void webkit_web_database_set_security_origin(WebKitWebDatabase* webDatabase, WebKitSecurityOrigin* security_origin); … … 251 249 static void webkit_web_database_init(WebKitWebDatabase* webDatabase) 252 250 { 253 webDatabase->priv = WEBKIT_WEB_DATABASE_GET_PRIVATE(webDatabase);251 webDatabase->priv = G_TYPE_INSTANCE_GET_PRIVATE(webDatabase, WEBKIT_TYPE_WEB_DATABASE, WebKitWebDatabasePrivate); 254 252 } 255 253 -
trunk/WebKit/gtk/webkit/webkitwebdatasource.cpp
r73701 r73906 75 75 }; 76 76 77 #define WEBKIT_WEB_DATA_SOURCE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_DATA_SOURCE, WebKitWebDataSourcePrivate))78 79 77 G_DEFINE_TYPE(WebKitWebDataSource, webkit_web_data_source, G_TYPE_OBJECT); 80 78 … … 136 134 static void webkit_web_data_source_init(WebKitWebDataSource* webDataSource) 137 135 { 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); 139 137 } 140 138 -
trunk/WebKit/gtk/webkit/webkitwebframe.cpp
r73855 r73906 382 382 static void webkit_web_frame_init(WebKitWebFrame* frame) 383 383 { 384 WebKitWebFramePrivate* priv = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);384 WebKitWebFramePrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(frame, WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate); 385 385 386 386 // TODO: Move constructor code here. … … 405 405 WebKitWebFrame* frame = WEBKIT_WEB_FRAME(g_object_new(WEBKIT_TYPE_WEB_FRAME, NULL)); 406 406 WebKitWebFramePrivate* priv = frame->priv; 407 WebKitWebViewPrivate* viewPriv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);407 WebKitWebViewPrivate* viewPriv = webView->priv; 408 408 409 409 priv->webView = webView; -
trunk/WebKit/gtk/webkit/webkitwebframeprivate.h
r73696 r73906 35 35 extern "C" { 36 36 37 #define WEBKIT_WEB_FRAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate))38 37 typedef struct _WebKitWebFramePrivate WebKitWebFramePrivate; 39 38 struct _WebKitWebFramePrivate { -
trunk/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
r73855 r73906 62 62 gboolean disposed; 63 63 }; 64 65 #define WEBKIT_WEB_HISTORY_ITEM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_HISTORY_ITEM, WebKitWebHistoryItemPrivate))66 64 67 65 enum { … … 218 216 static void webkit_web_history_item_init(WebKitWebHistoryItem* webHistoryItem) 219 217 { 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); 221 219 } 222 220 -
trunk/WebKit/gtk/webkit/webkitwebinspector.cpp
r73702 r73906 98 98 gchar* inspected_uri; 99 99 }; 100 101 #define WEBKIT_WEB_INSPECTOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_INSPECTOR, WebKitWebInspectorPrivate))102 100 103 101 static void webkit_web_inspector_finalize(GObject* object); … … 327 325 static void webkit_web_inspector_init(WebKitWebInspector* web_inspector) 328 326 { 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); 330 328 } 331 329 -
trunk/WebKit/gtk/webkit/webkitwebnavigationaction.cpp
r73855 r73906 49 49 }; 50 50 51 #define WEBKIT_WEB_NAVIGATION_ACTION_GET_PRIVATE(obj)(G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_NAVIGATION_ACTION, WebKitWebNavigationActionPrivate))52 53 51 enum { 54 52 PROP_0, … … 119 117 static void webkit_web_navigation_action_init(WebKitWebNavigationAction* navigationAction) 120 118 { 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); 122 120 } 123 121 -
trunk/WebKit/gtk/webkit/webkitwebplugin.cpp
r73858 r73906 71 71 static void webkit_web_plugin_init(WebKitWebPlugin *plugin) 72 72 { 73 WebKitWebPluginPrivate* priv = WEBKIT_WEB_PLUGIN_GET_PRIVATE(plugin);73 WebKitWebPluginPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(plugin, WEBKIT_TYPE_WEB_PLUGIN, WebKitWebPluginPrivate); 74 74 plugin->priv = priv = new WebKitWebPluginPrivate(); 75 75 } -
trunk/WebKit/gtk/webkit/webkitwebplugindatabase.cpp
r73858 r73906 48 48 static void webkit_web_plugin_database_init(WebKitWebPluginDatabase* database) 49 49 { 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); 51 51 database->priv = priv; 52 52 -
trunk/WebKit/gtk/webkit/webkitwebplugindatabaseprivate.h
r73858 r73906 29 29 extern "C" { 30 30 31 #define WEBKIT_WEB_PLUGIN_DATABASE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_PLUGIN_DATABASE, WebKitWebPluginDatabasePrivate))32 31 typedef struct _WebKitWebPluginDatabasePrivate WebKitWebPluginDatabasePrivate; 33 32 struct _WebKitWebPluginDatabasePrivate { -
trunk/WebKit/gtk/webkit/webkitwebpluginprivate.h
r73858 r73906 33 33 extern "C" { 34 34 35 #define WEBKIT_WEB_PLUGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_PLUGIN, WebKitWebPluginPrivate))36 35 typedef struct _WebKitWebPluginPrivate WebKitWebPluginPrivate; 37 36 struct _WebKitWebPluginPrivate { -
trunk/WebKit/gtk/webkit/webkitwebpolicydecision.cpp
r73855 r73906 47 47 }; 48 48 49 #define WEBKIT_WEB_POLICY_DECISION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_POLICY_DECISION, WebKitWebPolicyDecisionPrivate))50 51 49 static void webkit_web_policy_decision_class_init(WebKitWebPolicyDecisionClass* decisionClass) 52 50 { … … 56 54 static void webkit_web_policy_decision_init(WebKitWebPolicyDecision* decision) 57 55 { 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); 59 57 } 60 58 -
trunk/WebKit/gtk/webkit/webkitwebresource.cpp
r73855 r73906 218 218 static void webkit_web_resource_init(WebKitWebResource* webResource) 219 219 { 220 webResource->priv = WEBKIT_WEB_RESOURCE_GET_PRIVATE(webResource);220 webResource->priv = G_TYPE_INSTANCE_GET_PRIVATE(webResource, WEBKIT_TYPE_WEB_RESOURCE, WebKitWebResourcePrivate); 221 221 } 222 222 -
trunk/WebKit/gtk/webkit/webkitwebresourceprivate.h
r73855 r73906 29 29 extern "C" { 30 30 31 #define WEBKIT_WEB_RESOURCE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_RESOURCE, WebKitWebResourcePrivate))32 31 struct _WebKitWebResourcePrivate { 33 32 WebCore::ArchiveResource* resource; -
trunk/WebKit/gtk/webkit/webkitwebsettings.cpp
r73855 r73906 918 918 static void webkit_web_settings_init(WebKitWebSettings* web_settings) 919 919 { 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); 921 921 } 922 922 -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r73858 r73906 252 252 { 253 253 WebKitWebView* view = WEBKIT_WEB_VIEW(userData); 254 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(view);254 WebKitWebViewPrivate* priv = view->priv; 255 255 GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(view)); 256 256 GtkRequisition menuSize; … … 364 364 return FALSE; 365 365 366 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);366 WebKitWebViewPrivate* priv = webView->priv; 367 367 priv->currentMenu = menu; 368 368 priv->lastPopupXPosition = event.globalX(); … … 1512 1512 { 1513 1513 WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); 1514 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);1514 WebKitWebViewPrivate* priv = webView->priv; 1515 1515 1516 1516 // This might happen if a drag is still in progress after a WebKitWebView … … 1550 1550 static void webkit_web_view_drag_data_get(GtkWidget* widget, GdkDragContext* context, GtkSelectionData* selectionData, guint info, guint) 1551 1551 { 1552 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW _GET_PRIVATE(WEBKIT_WEB_VIEW(widget));1552 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW(widget)->priv; 1553 1553 1554 1554 // This might happen if a drag is still in progress after a WebKitWebView … … 1687 1687 static gboolean webkit_web_view_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip) 1688 1688 { 1689 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW _GET_PRIVATE(widget);1689 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW(widget)->priv; 1690 1690 1691 1691 if (keyboard_mode) { … … 3458 3458 static void webkit_web_view_init(WebKitWebView* webView) 3459 3459 { 3460 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);3460 WebKitWebViewPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(webView, WEBKIT_TYPE_WEB_VIEW, WebKitWebViewPrivate); 3461 3461 webView->priv = priv; 3462 3462 // 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 277 277 static void webkit_web_window_features_init(WebKitWebWindowFeatures* web_window_features) 278 278 { 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); 280 280 } 281 281
Note: See TracChangeset
for help on using the changeset viewer.