Changeset 89282 in webkit


Ignore:
Timestamp:
Jun 20, 2011 1:12:49 PM (13 years ago)
Author:
Martin Robinson
Message:

2011-06-20 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Eric Seidel.

[GTK] Clean up unecessary boilerplate from WebKitWebSettings and make private members meet WebKit style guidelines
​https://bugs.webkit.org/show_bug.cgi?id=61972

Rename all private members of WebKitWebSettings to meet WebKit style guidelines and
put the private struct definition in webkitwebsettingsprivate.h so it can be
accessed from webkitwebview.cpp. This cuts down on the boilerplate immensely.

  • webkit/webkitwebsettings.cpp: Rename private members to meet WebKit style guidelines and allocate the private section with new/delete. This allows for using CString and removes the need for manual string memory management.
  • webkit/webkitwebsettingsprivate.h: Move the private struct definition here.
  • webkit/webkitwebview.cpp: Update to reflect new struct names. Remove boilerplate and other very small code cleanups.
Location:
trunk/Source/WebKit/gtk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/gtk/ChangeLog

    r89251 r89282  
     12011-06-20  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [GTK] Clean up unecessary boilerplate from WebKitWebSettings and make private members meet WebKit style guidelines
     6        https://bugs.webkit.org/show_bug.cgi?id=61972
     7
     8        Rename all private members of WebKitWebSettings to meet WebKit style guidelines and
     9        put the private struct definition in webkitwebsettingsprivate.h so it can be
     10        accessed from webkitwebview.cpp. This cuts down on the boilerplate immensely.
     11
     12        * webkit/webkitwebsettings.cpp: Rename private members to meet WebKit style guidelines
     13        and allocate the private section with new/delete. This allows for using CString and removes
     14        the need for manual string memory management.
     15        * webkit/webkitwebsettingsprivate.h: Move the private struct definition here.
     16        * webkit/webkitwebview.cpp: Update to reflect new struct names. Remove boilerplate
     17        and other very small code cleanups.
     18
    1192011-06-20  Carlos Garcia Campos  <cgarcia@igalia.com>
    220

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

    r88872 r89282  
    2929#include "EditingBehavior.h"
    3030#include "FileSystem.h"
     31#include "GOwnPtr.h"
    3132#include "PluginDatabase.h"
    3233#include "webkitenumtypes.h"
    … …  
    6566
    6667G_DEFINE_TYPE(WebKitWebSettings, webkit_web_settings, G_TYPE_OBJECT)
    67 
    68 struct _WebKitWebSettingsPrivate {
    69     gchar* default_encoding;
    70     gchar* cursive_font_family;
    71     gchar* default_font_family;
    72     gchar* fantasy_font_family;
    73     gchar* monospace_font_family;
    74     gchar* sans_serif_font_family;
    75     gchar* serif_font_family;
    76     guint default_font_size;
    77     guint default_monospace_font_size;
    78     guint minimum_font_size;
    79     guint minimum_logical_font_size;
    80     gboolean enforce_96_dpi;
    81     gboolean auto_load_images;
    82     gboolean auto_shrink_images;
    83     gboolean print_backgrounds;
    84     gboolean enable_scripts;
    85     gboolean enable_plugins;
    86     gboolean resizable_text_areas;
    87     gchar* user_stylesheet_uri;
    88     gfloat zoom_step;
    89     gboolean enable_developer_extras;
    90     gboolean enable_private_browsing;
    91     gboolean enable_spell_checking;
    92     gchar* spell_checking_languages;
    93     gboolean enable_caret_browsing;
    94     gboolean enable_html5_database;
    95     gboolean enable_html5_local_storage;
    96     gboolean enable_xss_auditor;
    97     gboolean enable_spatial_navigation;
    98     gboolean enable_frame_flattening;
    99     gchar* user_agent;
    100     gboolean javascript_can_open_windows_automatically;
    101     gboolean javascript_can_access_clipboard;
    102     gboolean enable_offline_web_application_cache;
    103     WebKitEditingBehavior editing_behavior;
    104     gboolean enable_universal_access_from_file_uris;
    105     gboolean enable_file_access_from_file_uris;
    106     gboolean enable_dom_paste;
    107     gboolean tab_key_cycles_through_elements;
    108     gboolean enable_default_context_menu;
    109     gboolean enable_site_specific_quirks;
    110     gboolean enable_page_cache;
    111     gboolean auto_resize_window;
    112     gboolean enable_java_applet;
    113     gboolean enable_hyperlink_auditing;
    114     gboolean enable_fullscreen;
    115     gboolean enable_dns_prefetching;
    116     gboolean enable_webgl;
    117 };
    118 
    119 #define WEBKIT_WEB_SETTINGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsPrivate))
    12068
    12169enum {
    … …  
    947895                                                         TRUE,
    948896                                                         flags));
    949 
    950     g_type_class_add_private(klass, sizeof(WebKitWebSettingsPrivate));
    951897}
    952898
    953899static void webkit_web_settings_init(WebKitWebSettings* web_settings)
    954900{
    955     web_settings->priv = G_TYPE_INSTANCE_GET_PRIVATE(web_settings, WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsPrivate);
     901    web_settings->priv = new WebKitWebSettingsPrivate;
    956902}
    957903
    958904static void webkit_web_settings_finalize(GObject* object)
    959905{
    960     WebKitWebSettings* web_settings = WEBKIT_WEB_SETTINGS(object);
    961     WebKitWebSettingsPrivate* priv = web_settings->priv;
    962 
    963     g_free(priv->default_encoding);
    964     g_free(priv->cursive_font_family);
    965     g_free(priv->default_font_family);
    966     g_free(priv->fantasy_font_family);
    967     g_free(priv->monospace_font_family);
    968     g_free(priv->sans_serif_font_family);
    969     g_free(priv->serif_font_family);
    970     g_free(priv->user_stylesheet_uri);
    971     g_free(priv->spell_checking_languages);
    972 
    973     g_free(priv->user_agent);
    974 
     906    delete WEBKIT_WEB_SETTINGS(object)->priv;
    975907    G_OBJECT_CLASS(webkit_web_settings_parent_class)->finalize(object);
    976908}
    … …  
    983915    switch(prop_id) {
    984916    case PROP_DEFAULT_ENCODING:
    985         g_free(priv->default_encoding);
    986         priv->default_encoding = g_strdup(g_value_get_string(value));
     917        priv->defaultEncoding = g_value_get_string(value);
    987918        break;
    988919    case PROP_CURSIVE_FONT_FAMILY:
    989         g_free(priv->cursive_font_family);
    990         priv->cursive_font_family = g_strdup(g_value_get_string(value));
     920        priv->cursiveFontFamily = g_value_get_string(value);
    991921        break;
    992922    case PROP_DEFAULT_FONT_FAMILY:
    993         g_free(priv->default_font_family);
    994         priv->default_font_family = g_strdup(g_value_get_string(value));
     923        priv->defaultFontFamily = g_value_get_string(value);
    995924        break;
    996925    case PROP_FANTASY_FONT_FAMILY:
    997         g_free(priv->fantasy_font_family);
    998         priv->fantasy_font_family = g_strdup(g_value_get_string(value));
     926        priv->fantasyFontFamily = g_value_get_string(value);
    999927        break;
    1000928    case PROP_MONOSPACE_FONT_FAMILY:
    1001         g_free(priv->monospace_font_family);
    1002         priv->monospace_font_family = g_strdup(g_value_get_string(value));
     929        priv->monospaceFontFamily = g_value_get_string(value);
    1003930        break;
    1004931    case PROP_SANS_SERIF_FONT_FAMILY:
    1005         g_free(priv->sans_serif_font_family);
    1006         priv->sans_serif_font_family = g_strdup(g_value_get_string(value));
     932        priv->sansSerifFontFamily = g_value_get_string(value);
    1007933        break;
    1008934    case PROP_SERIF_FONT_FAMILY:
    1009         g_free(priv->serif_font_family);
    1010         priv->serif_font_family = g_strdup(g_value_get_string(value));
     935        priv->serifFontFamily = g_value_get_string(value);
    1011936        break;
    1012937    case PROP_DEFAULT_FONT_SIZE:
    1013         priv->default_font_size = g_value_get_int(value);
     938        priv->defaultFontSize = g_value_get_int(value);
    1014939        break;
    1015940    case PROP_DEFAULT_MONOSPACE_FONT_SIZE:
    1016         priv->default_monospace_font_size = g_value_get_int(value);
     941        priv->defaultMonospaceFontSize = g_value_get_int(value);
    1017942        break;
    1018943    case PROP_MINIMUM_FONT_SIZE:
    1019         priv->minimum_font_size = g_value_get_int(value);
     944        priv->minimumFontSize = g_value_get_int(value);
    1020945        break;
    1021946    case PROP_MINIMUM_LOGICAL_FONT_SIZE:
    1022         priv->minimum_logical_font_size = g_value_get_int(value);
     947        priv->minimumLogicalFontSize = g_value_get_int(value);
    1023948        break;
    1024949    case PROP_ENFORCE_96_DPI:
    1025         priv->enforce_96_dpi = g_value_get_boolean(value);
     950        priv->enforce96DPI = g_value_get_boolean(value);
    1026951        break;
    1027952    case PROP_AUTO_LOAD_IMAGES:
    1028         priv->auto_load_images = g_value_get_boolean(value);
     953        priv->autoLoadImages = g_value_get_boolean(value);
    1029954        break;
    1030955    case PROP_AUTO_SHRINK_IMAGES:
    1031         priv->auto_shrink_images = g_value_get_boolean(value);
     956        priv->autoShrinkImages = g_value_get_boolean(value);
    1032957        break;
    1033958    case PROP_PRINT_BACKGROUNDS:
    1034         priv->print_backgrounds = g_value_get_boolean(value);
     959        priv->printBackgrounds = g_value_get_boolean(value);
    1035960        break;
    1036961    case PROP_ENABLE_SCRIPTS:
    1037         priv->enable_scripts = g_value_get_boolean(value);
     962        priv->enableScripts = g_value_get_boolean(value);
    1038963        break;
    1039964    case PROP_ENABLE_PLUGINS:
    1040         priv->enable_plugins = g_value_get_boolean(value);
     965        priv->enablePlugins = g_value_get_boolean(value);
    1041966        break;
    1042967    case PROP_RESIZABLE_TEXT_AREAS:
    1043         priv->resizable_text_areas = g_value_get_boolean(value);
     968        priv->resizableTextAreas = g_value_get_boolean(value);
    1044969        break;
    1045970    case PROP_USER_STYLESHEET_URI:
    1046         g_free(priv->user_stylesheet_uri);
    1047         priv->user_stylesheet_uri = g_strdup(g_value_get_string(value));
     971        priv->userStylesheetURI = g_value_get_string(value);
    1048972        break;
    1049973    case PROP_ZOOM_STEP:
    1050         priv->zoom_step = g_value_get_float(value);
     974        priv->zoomStep = g_value_get_float(value);
    1051975        break;
    1052976    case PROP_ENABLE_DEVELOPER_EXTRAS:
    1053         priv->enable_developer_extras = g_value_get_boolean(value);
     977        priv->enableDeveloperExtras = g_value_get_boolean(value);
    1054978        break;
    1055979    case PROP_ENABLE_PRIVATE_BROWSING:
    1056         priv->enable_private_browsing = g_value_get_boolean(value);
     980        priv->enablePrivateBrowsing = g_value_get_boolean(value);
    1057981        break;
    1058982    case PROP_ENABLE_CARET_BROWSING:
    1059         priv->enable_caret_browsing = g_value_get_boolean(value);
     983        priv->enableCaretBrowsing = g_value_get_boolean(value);
    1060984        break;
    1061985    case PROP_ENABLE_HTML5_DATABASE:
    1062         priv->enable_html5_database = g_value_get_boolean(value);
     986        priv->enableHTML5Database = g_value_get_boolean(value);
    1063987        break;
    1064988    case PROP_ENABLE_HTML5_LOCAL_STORAGE:
    1065         priv->enable_html5_local_storage = g_value_get_boolean(value);
     989        priv->enableHTML5LocalStorage = g_value_get_boolean(value);
    1066990        break;
    1067991    case PROP_ENABLE_SPELL_CHECKING:
    1068         priv->enable_spell_checking = g_value_get_boolean(value);
     992        priv->enableSpellChecking = g_value_get_boolean(value);
    1069993        break;
    1070994    case PROP_SPELL_CHECKING_LANGUAGES:
    1071         g_free(priv->spell_checking_languages);
    1072         priv->spell_checking_languages = g_strdup(g_value_get_string(value));
     995        priv->spellCheckingLanguages = g_value_get_string(value);
    1073996        break;
    1074997    case PROP_ENABLE_XSS_AUDITOR:
    1075         priv->enable_xss_auditor = g_value_get_boolean(value);
     998        priv->enableXSSAuditor = g_value_get_boolean(value);
    1076999        break;
    10771000    case PROP_ENABLE_SPATIAL_NAVIGATION:
    1078         priv->enable_spatial_navigation = g_value_get_boolean(value);
     1001        priv->enableSpatialNavigation = g_value_get_boolean(value);
    10791002        break;
    10801003    case PROP_ENABLE_FRAME_FLATTENING:
    1081         priv->enable_frame_flattening = g_value_get_boolean(value);
     1004        priv->enableFrameFlattening = g_value_get_boolean(value);
    10821005        break;
    10831006    case PROP_USER_AGENT:
    1084         g_free(priv->user_agent);
    10851007        if (!g_value_get_string(value) || !strlen(g_value_get_string(value)))
    1086             priv->user_agent = g_strdup(webkitUserAgent().utf8().data());
     1008            priv->userAgent = webkitUserAgent().utf8();
    10871009        else
    1088             priv->user_agent = g_strdup(g_value_get_string(value));
     1010            priv->userAgent = g_value_get_string(value);
    10891011        break;
    10901012    case PROP_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY:
    1091         priv->javascript_can_open_windows_automatically = g_value_get_boolean(value);
     1013        priv->javascriptCanOpenWindowsAutomatically = g_value_get_boolean(value);
    10921014        break;
    10931015    case PROP_JAVASCRIPT_CAN_ACCESS_CLIPBOARD:
    1094         priv->javascript_can_access_clipboard = g_value_get_boolean(value);
     1016        priv->javascriptCanAccessClipboard = g_value_get_boolean(value);
    10951017        break;
    10961018    case PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE:
    1097         priv->enable_offline_web_application_cache = g_value_get_boolean(value);
     1019        priv->enableOfflineWebApplicationCache = g_value_get_boolean(value);
    10981020        break;
    10991021    case PROP_EDITING_BEHAVIOR:
    1100         priv->editing_behavior = static_cast<WebKitEditingBehavior>(g_value_get_enum(value));
     1022        priv->editingBehavior = static_cast<WebKitEditingBehavior>(g_value_get_enum(value));
    11011023        break;
    11021024    case PROP_ENABLE_UNIVERSAL_ACCESS_FROM_FILE_URIS:
    1103         priv->enable_universal_access_from_file_uris = g_value_get_boolean(value);
     1025        priv->enableUniversalAccessFromFileURIs = g_value_get_boolean(value);
    11041026        break;
    11051027    case PROP_ENABLE_FILE_ACCESS_FROM_FILE_URIS:
    1106         priv->enable_file_access_from_file_uris = g_value_get_boolean(value);
     1028        priv->enableFileAccessFromFileURIs = g_value_get_boolean(value);
    11071029        break;
    11081030    case PROP_ENABLE_DOM_PASTE:
    1109         priv->enable_dom_paste = g_value_get_boolean(value);
     1031        priv->enableDOMPaste = g_value_get_boolean(value);
    11101032        break;
    11111033    case PROP_TAB_KEY_CYCLES_THROUGH_ELEMENTS:
    1112         priv->tab_key_cycles_through_elements = g_value_get_boolean(value);
     1034        priv->tabKeyCyclesThroughElements = g_value_get_boolean(value);
    11131035        break;
    11141036    case PROP_ENABLE_DEFAULT_CONTEXT_MENU:
    1115         priv->enable_default_context_menu = g_value_get_boolean(value);
     1037        priv->enableDefaultContextMenu = g_value_get_boolean(value);
    11161038        break;
    11171039    case PROP_ENABLE_SITE_SPECIFIC_QUIRKS:
    1118         priv->enable_site_specific_quirks = g_value_get_boolean(value);
     1040        priv->enableSiteSpecificQuirks = g_value_get_boolean(value);
    11191041        break;
    11201042    case PROP_ENABLE_PAGE_CACHE:
    1121         priv->enable_page_cache = g_value_get_boolean(value);
     1043        priv->enablePageCache = g_value_get_boolean(value);
    11221044        break;
    11231045    case PROP_AUTO_RESIZE_WINDOW:
    1124         priv->auto_resize_window = g_value_get_boolean(value);
     1046        priv->autoResizeWindow = g_value_get_boolean(value);
    11251047        break;
    11261048    case PROP_ENABLE_JAVA_APPLET:
    1127         priv->enable_java_applet = g_value_get_boolean(value);
     1049        priv->enableJavaApplet = g_value_get_boolean(value);
    11281050        break;
    11291051    case PROP_ENABLE_HYPERLINK_AUDITING:
    1130         priv->enable_hyperlink_auditing = g_value_get_boolean(value);
     1052        priv->enableHyperlinkAuditing = g_value_get_boolean(value);
    11311053        break;
    11321054    case PROP_ENABLE_FULLSCREEN:
    1133         priv->enable_fullscreen = g_value_get_boolean(value);
     1055        priv->enableFullscreen = g_value_get_boolean(value);
    11341056        break;
    11351057    case PROP_ENABLE_DNS_PREFETCHING:
    1136         priv->enable_dns_prefetching = g_value_get_boolean(value);
     1058        priv->enableDNSPrefetching = g_value_get_boolean(value);
    11371059        break;
    11381060    case PROP_ENABLE_WEBGL:
    1139         priv->enable_webgl = g_value_get_boolean(value);
     1061        priv->enableWebgl = g_value_get_boolean(value);
    11401062        break;
    11411063    default:
    … …  
    11521074    switch (prop_id) {
    11531075    case PROP_DEFAULT_ENCODING:
    1154         g_value_set_string(value, priv->default_encoding);
     1076        g_value_set_string(value, priv->defaultEncoding.data());
    11551077        break;
    11561078    case PROP_CURSIVE_FONT_FAMILY:
    1157         g_value_set_string(value, priv->cursive_font_family);
     1079        g_value_set_string(value, priv->cursiveFontFamily.data());
    11581080        break;
    11591081    case PROP_DEFAULT_FONT_FAMILY:
    1160         g_value_set_string(value, priv->default_font_family);
     1082        g_value_set_string(value, priv->defaultFontFamily.data());
    11611083        break;
    11621084    case PROP_FANTASY_FONT_FAMILY:
    1163         g_value_set_string(value, priv->fantasy_font_family);
     1085        g_value_set_string(value, priv->fantasyFontFamily.data());
    11641086        break;
    11651087    case PROP_MONOSPACE_FONT_FAMILY:
    1166         g_value_set_string(value, priv->monospace_font_family);
     1088        g_value_set_string(value, priv->monospaceFontFamily.data());
    11671089        break;
    11681090    case PROP_SANS_SERIF_FONT_FAMILY:
    1169         g_value_set_string(value, priv->sans_serif_font_family);
     1091        g_value_set_string(value, priv->sansSerifFontFamily.data());
    11701092        break;
    11711093    case PROP_SERIF_FONT_FAMILY:
    1172         g_value_set_string(value, priv->serif_font_family);
     1094        g_value_set_string(value, priv->serifFontFamily.data());
    11731095        break;
    11741096    case PROP_DEFAULT_FONT_SIZE:
    1175         g_value_set_int(value, priv->default_font_size);
     1097        g_value_set_int(value, priv->defaultFontSize);
    11761098        break;
    11771099    case PROP_DEFAULT_MONOSPACE_FONT_SIZE:
    1178         g_value_set_int(value, priv->default_monospace_font_size);
     1100        g_value_set_int(value, priv->defaultMonospaceFontSize);
    11791101        break;
    11801102    case PROP_MINIMUM_FONT_SIZE:
    1181         g_value_set_int(value, priv->minimum_font_size);
     1103        g_value_set_int(value, priv->minimumFontSize);
    11821104        break;
    11831105    case PROP_MINIMUM_LOGICAL_FONT_SIZE:
    1184         g_value_set_int(value, priv->minimum_logical_font_size);
     1106        g_value_set_int(value, priv->minimumLogicalFontSize);
    11851107        break;
    11861108    case PROP_ENFORCE_96_DPI:
    1187         g_value_set_boolean(value, priv->enforce_96_dpi);
     1109        g_value_set_boolean(value, priv->enforce96DPI);
    11881110        break;
    11891111    case PROP_AUTO_LOAD_IMAGES:
    1190         g_value_set_boolean(value, priv->auto_load_images);
     1112        g_value_set_boolean(value, priv->autoLoadImages);
    11911113        break;
    11921114    case PROP_AUTO_SHRINK_IMAGES:
    1193         g_value_set_boolean(value, priv->auto_shrink_images);
     1115        g_value_set_boolean(value, priv->autoShrinkImages);
    11941116        break;
    11951117    case PROP_PRINT_BACKGROUNDS:
    1196         g_value_set_boolean(value, priv->print_backgrounds);
     1118        g_value_set_boolean(value, priv->printBackgrounds);
    11971119        break;
    11981120    case PROP_ENABLE_SCRIPTS:
    1199         g_value_set_boolean(value, priv->enable_scripts);
     1121        g_value_set_boolean(value, priv->enableScripts);
    12001122        break;
    12011123    case PROP_ENABLE_PLUGINS:
    1202         g_value_set_boolean(value, priv->enable_plugins);
     1124        g_value_set_boolean(value, priv->enablePlugins);
    12031125        break;
    12041126    case PROP_RESIZABLE_TEXT_AREAS:
    1205         g_value_set_boolean(value, priv->resizable_text_areas);
     1127        g_value_set_boolean(value, priv->resizableTextAreas);
    12061128        break;
    12071129    case PROP_USER_STYLESHEET_URI:
    1208         g_value_set_string(value, priv->user_stylesheet_uri);
     1130        g_value_set_string(value, priv->userStylesheetURI.data());
    12091131        break;
    12101132    case PROP_ZOOM_STEP:
    1211         g_value_set_float(value, priv->zoom_step);
     1133        g_value_set_float(value, priv->zoomStep);
    12121134        break;
    12131135    case PROP_ENABLE_DEVELOPER_EXTRAS:
    1214         g_value_set_boolean(value, priv->enable_developer_extras);
     1136        g_value_set_boolean(value, priv->enableDeveloperExtras);
    12151137        break;
    12161138    case PROP_ENABLE_PRIVATE_BROWSING:
    1217         g_value_set_boolean(value, priv->enable_private_browsing);
     1139        g_value_set_boolean(value, priv->enablePrivateBrowsing);
    12181140        break;
    12191141    case PROP_ENABLE_CARET_BROWSING:
    1220         g_value_set_boolean(value, priv->enable_caret_browsing);
     1142        g_value_set_boolean(value, priv->enableCaretBrowsing);
    12211143        break;
    12221144    case PROP_ENABLE_HTML5_DATABASE:
    1223         g_value_set_boolean(value, priv->enable_html5_database);
     1145        g_value_set_boolean(value, priv->enableHTML5Database);
    12241146        break;
    12251147    case PROP_ENABLE_HTML5_LOCAL_STORAGE:
    1226         g_value_set_boolean(value, priv->enable_html5_local_storage);
     1148        g_value_set_boolean(value, priv->enableHTML5LocalStorage);
    12271149        break;
    12281150    case PROP_ENABLE_SPELL_CHECKING:
    1229         g_value_set_boolean(value, priv->enable_spell_checking);
     1151        g_value_set_boolean(value, priv->enableSpellChecking);
    12301152        break;
    12311153    case PROP_SPELL_CHECKING_LANGUAGES:
    1232         g_value_set_string(value, priv->spell_checking_languages);
     1154        g_value_set_string(value, priv->spellCheckingLanguages.data());
    12331155        break;
    12341156    case PROP_ENABLE_XSS_AUDITOR:
    1235         g_value_set_boolean(value, priv->enable_xss_auditor);
     1157        g_value_set_boolean(value, priv->enableXSSAuditor);
    12361158        break;
    12371159    case PROP_ENABLE_SPATIAL_NAVIGATION:
    1238         g_value_set_boolean(value, priv->enable_spatial_navigation);
     1160        g_value_set_boolean(value, priv->enableSpatialNavigation);
    12391161        break;
    12401162    case PROP_ENABLE_FRAME_FLATTENING:
    1241         g_value_set_boolean(value, priv->enable_frame_flattening);
     1163        g_value_set_boolean(value, priv->enableFrameFlattening);
    12421164        break;
    12431165    case PROP_USER_AGENT:
    1244         g_value_set_string(value, priv->user_agent);
     1166        g_value_set_string(value, priv->userAgent.data());
    12451167        break;
    12461168    case PROP_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY:
    1247         g_value_set_boolean(value, priv->javascript_can_open_windows_automatically);
     1169        g_value_set_boolean(value, priv->javascriptCanOpenWindowsAutomatically);
    12481170        break;
    12491171    case PROP_JAVASCRIPT_CAN_ACCESS_CLIPBOARD:
    1250         g_value_set_boolean(value, priv->javascript_can_access_clipboard);
     1172        g_value_set_boolean(value, priv->javascriptCanAccessClipboard);
    12511173        break;
    12521174    case PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE:
    1253         g_value_set_boolean(value, priv->enable_offline_web_application_cache);
     1175        g_value_set_boolean(value, priv->enableOfflineWebApplicationCache);
    12541176        break;
    12551177    case PROP_EDITING_BEHAVIOR:
    1256         g_value_set_enum(value, priv->editing_behavior);
     1178        g_value_set_enum(value, priv->editingBehavior);
    12571179        break;
    12581180    case PROP_ENABLE_UNIVERSAL_ACCESS_FROM_FILE_URIS:
    1259         g_value_set_boolean(value, priv->enable_universal_access_from_file_uris);
     1181        g_value_set_boolean(value, priv->enableUniversalAccessFromFileURIs);
    12601182        break;
    12611183    case PROP_ENABLE_FILE_ACCESS_FROM_FILE_URIS:
    1262         g_value_set_boolean(value, priv->enable_file_access_from_file_uris);
     1184        g_value_set_boolean(value, priv->enableFileAccessFromFileURIs);
    12631185        break;
    12641186    case PROP_ENABLE_DOM_PASTE:
    1265         g_value_set_boolean(value, priv->enable_dom_paste);
     1187        g_value_set_boolean(value, priv->enableDOMPaste);
    12661188        break;
    12671189    case PROP_TAB_KEY_CYCLES_THROUGH_ELEMENTS:
    1268         g_value_set_boolean(value, priv->tab_key_cycles_through_elements);
     1190        g_value_set_boolean(value, priv->tabKeyCyclesThroughElements);
    12691191        break;
    12701192    case PROP_ENABLE_DEFAULT_CONTEXT_MENU:
    1271         g_value_set_boolean(value, priv->enable_default_context_menu);
     1193        g_value_set_boolean(value, priv->enableDefaultContextMenu);
    12721194        break;
    12731195    case PROP_ENABLE_SITE_SPECIFIC_QUIRKS:
    1274         g_value_set_boolean(value, priv->enable_site_specific_quirks);
     1196        g_value_set_boolean(value, priv->enableSiteSpecificQuirks);
    12751197        break;
    12761198    case PROP_ENABLE_PAGE_CACHE:
    1277         g_value_set_boolean(value, priv->enable_page_cache);
     1199        g_value_set_boolean(value, priv->enablePageCache);
    12781200        break;
    12791201    case PROP_AUTO_RESIZE_WINDOW:
    1280         g_value_set_boolean(value, priv->auto_resize_window);
     1202        g_value_set_boolean(value, priv->autoResizeWindow);
    12811203        break;
    12821204    case PROP_ENABLE_JAVA_APPLET:
    1283         g_value_set_boolean(value, priv->enable_java_applet);
     1205        g_value_set_boolean(value, priv->enableJavaApplet);
    12841206        break;
    12851207    case PROP_ENABLE_HYPERLINK_AUDITING:
    1286         g_value_set_boolean(value, priv->enable_hyperlink_auditing);
     1208        g_value_set_boolean(value, priv->enableHyperlinkAuditing);
    12871209        break;
    12881210    case PROP_ENABLE_FULLSCREEN:
    1289         g_value_set_boolean(value, priv->enable_fullscreen);
     1211        g_value_set_boolean(value, priv->enableFullscreen);
    12901212        break;
    12911213    case PROP_ENABLE_DNS_PREFETCHING:
    1292         g_value_set_boolean(value, priv->enable_dns_prefetching);
     1214        g_value_set_boolean(value, priv->enableDNSPrefetching);
    12931215        break;
    12941216    case PROP_ENABLE_WEBGL:
    1295         g_value_set_boolean(value, priv->enable_webgl);
     1217        g_value_set_boolean(value, priv->enableWebgl);
    12961218        break;
    12971219    default:
    … …  
    13221244 * Returns: (transfer full): a new #WebKitWebSettings instance
    13231245 **/
    1324 WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings)
     1246WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* original)
    13251247{
    1326     WebKitWebSettingsPrivate* priv = web_settings->priv;
    1327 
    1328     WebKitWebSettings* copy = WEBKIT_WEB_SETTINGS(g_object_new(WEBKIT_TYPE_WEB_SETTINGS,
    1329                  "default-encoding", priv->default_encoding,
    1330                  "cursive-font-family", priv->cursive_font_family,
    1331                  "default-font-family", priv->default_font_family,
    1332                  "fantasy-font-family", priv->fantasy_font_family,
    1333                  "monospace-font-family", priv->monospace_font_family,
    1334                  "sans-serif-font-family", priv->sans_serif_font_family,
    1335                  "serif-font-family", priv->serif_font_family,
    1336                  "default-font-size", priv->default_font_size,
    1337                  "default-monospace-font-size", priv->default_monospace_font_size,
    1338                  "minimum-font-size", priv->minimum_font_size,
    1339                  "minimum-logical-font-size", priv->minimum_logical_font_size,
    1340                  "auto-load-images", priv->auto_load_images,
    1341                  "auto-shrink-images", priv->auto_shrink_images,
    1342                  "print-backgrounds", priv->print_backgrounds,
    1343                  "enable-scripts", priv->enable_scripts,
    1344                  "enable-plugins", priv->enable_plugins,
    1345                  "resizable-text-areas", priv->resizable_text_areas,
    1346                  "user-stylesheet-uri", priv->user_stylesheet_uri,
    1347                  "zoom-step", priv->zoom_step,
    1348                  "enable-developer-extras", priv->enable_developer_extras,
    1349                  "enable-private-browsing", priv->enable_private_browsing,
    1350                  "enable-spell-checking", priv->enable_spell_checking,
    1351                  "spell-checking-languages", priv->spell_checking_languages,
    1352                  "enable-caret-browsing", priv->enable_caret_browsing,
    1353                  "enable-html5-database", priv->enable_html5_database,
    1354                  "enable-html5-local-storage", priv->enable_html5_local_storage,
    1355                  "enable-xss-auditor", priv->enable_xss_auditor,
    1356                  "enable-spatial-navigation", priv->enable_spatial_navigation,
    1357                  "enable-frame-flattening", priv->enable_frame_flattening,
    1358                  "user-agent", webkit_web_settings_get_user_agent(web_settings),
    1359                  "javascript-can-open-windows-automatically", priv->javascript_can_open_windows_automatically,
    1360                  "javascript-can-access-clipboard", priv->javascript_can_access_clipboard,
    1361                  "enable-offline-web-application-cache", priv->enable_offline_web_application_cache,
    1362                  "editing-behavior", priv->editing_behavior,
    1363                  "enable-universal-access-from-file-uris", priv->enable_universal_access_from_file_uris,
    1364                  "enable-file-access-from-file-uris", priv->enable_file_access_from_file_uris,
    1365                  "enable-dom-paste", priv->enable_dom_paste,
    1366                  "tab-key-cycles-through-elements", priv->tab_key_cycles_through_elements,
    1367                  "enable-default-context-menu", priv->enable_default_context_menu,
    1368                  "enable-site-specific-quirks", priv->enable_site_specific_quirks,
    1369                  "enable-page-cache", priv->enable_page_cache,
    1370                  "auto-resize-window", priv->auto_resize_window,
    1371                  "enable-java-applet", priv->enable_java_applet,
    1372                  "enable-hyperlink-auditing", priv->enable_hyperlink_auditing,
    1373                  "enable-fullscreen", priv->enable_fullscreen,
    1374                  "enable-dns-prefetching", priv->enable_dns_prefetching,
     1248    WebKitWebSettingsPrivate* priv = original->priv;
     1249    return WEBKIT_WEB_SETTINGS(g_object_new(WEBKIT_TYPE_WEB_SETTINGS,
     1250                 "default-encoding", priv->defaultEncoding.data(),
     1251                 "cursive-font-family", priv->cursiveFontFamily.data(),
     1252                 "default-font-family", priv->defaultFontFamily.data(),
     1253                 "fantasy-font-family", priv->fantasyFontFamily.data(),
     1254                 "monospace-font-family", priv->monospaceFontFamily.data(),
     1255                 "sans-serif-font-family", priv->sansSerifFontFamily.data(),
     1256                 "serif-font-family", priv->serifFontFamily.data(),
     1257                 "default-font-size", priv->defaultFontSize,
     1258                 "default-monospace-font-size", priv->defaultMonospaceFontSize,
     1259                 "minimum-font-size", priv->minimumFontSize,
     1260                 "minimum-logical-font-size", priv->minimumLogicalFontSize,
     1261                 "auto-load-images", priv->autoLoadImages,
     1262                 "auto-shrink-images", priv->autoShrinkImages,
     1263                 "print-backgrounds", priv->printBackgrounds,
     1264                 "enable-scripts", priv->enableScripts,
     1265                 "enable-plugins", priv->enablePlugins,
     1266                 "resizable-text-areas", priv->resizableTextAreas,
     1267                 "user-stylesheet-uri", priv->userStylesheetURI.data(),
     1268                 "zoom-step", priv->zoomStep,
     1269                 "enable-developer-extras", priv->enableDeveloperExtras,
     1270                 "spell-checking-languages", priv->spellCheckingLanguages.data(),
     1271                 "enable-caret-browsing", priv->enableCaretBrowsing,
     1272                 "enable-html5-database", priv->enableHTML5Database,
     1273                 "enable-html5-local-storage", priv->enableHTML5LocalStorage,
     1274                 "enable-xss-auditor", priv->enableXSSAuditor,
     1275                 "enable-spatial-navigation", priv->enableSpatialNavigation,
     1276                 "enable-frame-flattening", priv->enableFrameFlattening,
     1277                 "user-agent", webkit_web_settings_get_user_agent(original),
     1278                 "javascript-can-open-windows-automatically", priv->javascriptCanOpenWindowsAutomatically,
     1279                 "javascript-can-access-clipboard", priv->javascriptCanAccessClipboard,
     1280                 "enable-offline-web-application-cache", priv->enableOfflineWebApplicationCache,
     1281                 "editing-behavior", priv->editingBehavior,
     1282                 "enable-universal-access-from-file-uris", priv->enableUniversalAccessFromFileURIs,
     1283                 "enable-file-access-from-file-uris", priv->enableFileAccessFromFileURIs,
     1284                 "enable-dom-paste", priv->enableDOMPaste,
     1285                 "tab-key-cycles-through-elements", priv->tabKeyCyclesThroughElements,
     1286                 "enable-default-context-menu", priv->enableDefaultContextMenu,
     1287                 "enable-site-specific-quirks", priv->enableSiteSpecificQuirks,
     1288                 "enable-page-cache", priv->enablePageCache,
     1289                 "auto-resize-window", priv->autoResizeWindow,
     1290                 "enable-java-applet", priv->enableJavaApplet,
     1291                 "enable-hyperlink-auditing", priv->enableHyperlinkAuditing,
     1292                 "enable-fullscreen", priv->enableFullscreen,
     1293                 "enable-dns-prefetching", priv->enableDNSPrefetching,
    13751294                 NULL));
    1376 
    1377     return copy;
    13781295}
    13791296
    … …  
    13901307{
    13911308    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    1392 
    13931309    PluginDatabase::installedPlugins()->addExtraPluginDirectory(filenameToString(directory));
    13941310}
    … …  
    14051321const gchar* webkit_web_settings_get_user_agent(WebKitWebSettings* webSettings)
    14061322{
    1407     g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(webSettings), NULL);
    1408 
    1409     WebKitWebSettingsPrivate* priv = webSettings->priv;
    1410 
    1411     return priv->user_agent;
     1323    g_return_val_if_fail(WEBKIT_IS_WEB_SETTINGS(webSettings), 0);
     1324    return webSettings->priv->userAgent.data();
    14121325}
    14131326
    … …  
    14161329WebCore::EditingBehaviorType core(WebKitEditingBehavior type)
    14171330{
    1418     return (WebCore::EditingBehaviorType)type;
     1331    return static_cast<WebCore::EditingBehaviorType>(type);
    14191332}
    14201333

  • trunk/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h

    r74933 r89282  
    2424#define webkitwebsettingsprivate_h
    2525
     26#include "CString.h"
    2627#include "webkitwebsettings.h"
    2728
    2829extern "C" {
     30
     31struct _WebKitWebSettingsPrivate {
     32    CString defaultEncoding;
     33    CString cursiveFontFamily;
     34    CString defaultFontFamily;
     35    CString fantasyFontFamily;
     36    CString monospaceFontFamily;
     37    CString sansSerifFontFamily;
     38    CString serifFontFamily;
     39    guint defaultFontSize;
     40    guint defaultMonospaceFontSize;
     41    guint minimumFontSize;
     42    guint minimumLogicalFontSize;
     43    gboolean enforce96DPI;
     44    gboolean autoLoadImages;
     45    gboolean autoShrinkImages;
     46    gboolean printBackgrounds;
     47    gboolean enableScripts;
     48    gboolean enablePlugins;
     49    gboolean resizableTextAreas;
     50    CString userStylesheetURI;
     51    gfloat zoomStep;
     52    gboolean enableDeveloperExtras;
     53    gboolean enablePrivateBrowsing;
     54    gboolean enableSpellChecking;
     55    CString spellCheckingLanguages;
     56    gboolean enableCaretBrowsing;
     57    gboolean enableHTML5Database;
     58    gboolean enableHTML5LocalStorage;
     59    gboolean enableXSSAuditor;
     60    gboolean enableSpatialNavigation;
     61    gboolean enableFrameFlattening;
     62    CString userAgent;
     63    gboolean javascriptCanOpenWindowsAutomatically;
     64    gboolean javascriptCanAccessClipboard;
     65    gboolean enableOfflineWebApplicationCache;
     66    WebKitEditingBehavior editingBehavior;
     67    gboolean enableUniversalAccessFromFileURIs;
     68    gboolean enableFileAccessFromFileURIs;
     69    gboolean enableDOMPaste;
     70    gboolean tabKeyCyclesThroughElements;
     71    gboolean enableDefaultContextMenu;
     72    gboolean enableSiteSpecificQuirks;
     73    gboolean enablePageCache;
     74    gboolean autoResizeWindow;
     75    gboolean enableJavaApplet;
     76    gboolean enableHyperlinkAuditing;
     77    gboolean enableFullscreen;
     78    gboolean enableDNSPrefetching;
     79    gboolean enableWebgl;
     80};
    2981
    3082WEBKIT_API void webkit_web_settings_add_extra_plugin_directory(WebKitWebView*, const gchar* directory);

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

    r88872 r89282  
    145145using namespace WebCore;
    146146
    147 static const double defaultDPI = 96.0;
    148 
    149147enum {
    150148    /* normal signals */
    … …  
    13071305
    13081306    if (priv->webSettings) {
    1309         g_signal_handlers_disconnect_by_func(priv->webSettings.get(), (gpointer)webkit_web_view_settings_notify, webView);
     1307        g_signal_handlers_disconnect_by_func(priv->webSettings.get(), reinterpret_cast<void*>(webkit_web_view_settings_notify), webView);
    13101308        priv->webSettings.clear();
    13111309    }
    … …  
    13961394static gdouble webViewGetDPI(WebKitWebView* webView)
    13971395{
    1398     WebKitWebViewPrivate* priv = webView->priv;
    1399     WebKitWebSettings* webSettings = priv->webSettings.get();
    1400     gboolean enforce96DPI;
    1401     g_object_get(webSettings, "enforce-96-dpi", &enforce96DPI, NULL);
    1402     if (enforce96DPI)
    1403         return 96.0;
    1404 
    1405     gdouble DPI = defaultDPI;
     1396    if (webView->priv->webSettings->priv->enforce96DPI)
     1397        return 96;
     1398
     1399    static const double defaultDPI = 96;
    14061400    GdkScreen* screen = gtk_widget_has_screen(GTK_WIDGET(webView)) ? gtk_widget_get_screen(GTK_WIDGET(webView)) : gdk_screen_get_default();
    1407     if (screen) {
    1408         DPI = gdk_screen_get_resolution(screen);
    1409         // gdk_screen_get_resolution() returns -1 when no DPI is set.
    1410         if (DPI == -1)
    1411             DPI = defaultDPI;
    1412     }
    1413     ASSERT(DPI > 0);
    1414     return DPI;
     1401    if (!screen)
     1402        return defaultDPI;
     1403
     1404    // gdk_screen_get_resolution() returns -1 when no DPI is set.
     1405    gdouble DPI = gdk_screen_get_resolution(screen);
     1406    return DPI != -1 ? DPI : defaultDPI;
    14151407}
    14161408
    … …  
    31823174static void webkit_web_view_update_settings(WebKitWebView* webView)
    31833175{
    3184     WebKitWebViewPrivate* priv = webView->priv;
    3185     WebKitWebSettings* webSettings = priv->webSettings.get();
    3186     Settings* settings = core(webView)->settings();
    3187 
    3188     gchar* defaultEncoding, *cursiveFontFamily, *defaultFontFamily, *fantasyFontFamily, *monospaceFontFamily, *sansSerifFontFamily, *serifFontFamily, *userStylesheetUri, *defaultSpellCheckingLanguages;
    3189     gboolean autoLoadImages, autoShrinkImages, printBackgrounds,
    3190         enableScripts, enablePlugins, enableDeveloperExtras, resizableTextAreas,
    3191         enablePrivateBrowsing, enableCaretBrowsing, enableHTML5Database, enableHTML5LocalStorage,
    3192         enableXSSAuditor, enableSpatialNavigation, enableFrameFlattening, javascriptCanOpenWindows,
    3193         javaScriptCanAccessClipboard, enableOfflineWebAppCache,
    3194         enableUniversalAccessFromFileURI, enableFileAccessFromFileURI,
    3195         enableDOMPaste, tabKeyCyclesThroughElements, enableWebGL,
    3196         enableSiteSpecificQuirks, usePageCache, enableJavaApplet,
    3197         enableHyperlinkAuditing, enableFullscreen, enableDNSPrefetching,
    3198         enableSpellChecking;
    3199 
    3200     WebKitEditingBehavior editingBehavior;
    3201 
    3202     g_object_get(webSettings,
    3203                  "default-encoding", &defaultEncoding,
    3204                  "cursive-font-family", &cursiveFontFamily,
    3205                  "default-font-family", &defaultFontFamily,
    3206                  "fantasy-font-family", &fantasyFontFamily,
    3207                  "monospace-font-family", &monospaceFontFamily,
    3208                  "sans-serif-font-family", &sansSerifFontFamily,
    3209                  "serif-font-family", &serifFontFamily,
    3210                  "auto-load-images", &autoLoadImages,
    3211                  "auto-shrink-images", &autoShrinkImages,
    3212                  "print-backgrounds", &printBackgrounds,
    3213                  "enable-scripts", &enableScripts,
    3214                  "enable-plugins", &enablePlugins,
    3215                  "resizable-text-areas", &resizableTextAreas,
    3216                  "user-stylesheet-uri", &userStylesheetUri,
    3217                  "enable-developer-extras", &enableDeveloperExtras,
    3218                  "enable-private-browsing", &enablePrivateBrowsing,
    3219                  "enable-caret-browsing", &enableCaretBrowsing,
    3220                  "enable-html5-database", &enableHTML5Database,
    3221                  "enable-html5-local-storage", &enableHTML5LocalStorage,
    3222                  "enable-xss-auditor", &enableXSSAuditor,
    3223                  "enable-spatial-navigation", &enableSpatialNavigation,
    3224                  "enable-frame-flattening", &enableFrameFlattening,
    3225                  "javascript-can-open-windows-automatically", &javascriptCanOpenWindows,
    3226                  "javascript-can-access-clipboard", &javaScriptCanAccessClipboard,
    3227                  "enable-offline-web-application-cache", &enableOfflineWebAppCache,
    3228                  "editing-behavior", &editingBehavior,
    3229                  "enable-universal-access-from-file-uris", &enableUniversalAccessFromFileURI,
    3230                  "enable-file-access-from-file-uris", &enableFileAccessFromFileURI,
    3231                  "enable-dom-paste", &enableDOMPaste,
    3232                  "tab-key-cycles-through-elements", &tabKeyCyclesThroughElements,
    3233                  "enable-site-specific-quirks", &enableSiteSpecificQuirks,
    3234                  "enable-page-cache", &usePageCache,
    3235                  "enable-java-applet", &enableJavaApplet,
    3236                  "enable-hyperlink-auditing", &enableHyperlinkAuditing,
    3237                  "enable-spell-checking", &enableSpellChecking,
    3238                  "spell-checking-languages", &defaultSpellCheckingLanguages,
    3239                  "enable-fullscreen", &enableFullscreen,
    3240                  "enable-dns-prefetching", &enableDNSPrefetching,
    3241                  "enable-webgl", &enableWebGL,
    3242                  NULL);
    3243 
    3244     settings->setDefaultTextEncodingName(defaultEncoding);
    3245     settings->setCursiveFontFamily(cursiveFontFamily);
    3246     settings->setStandardFontFamily(defaultFontFamily);
    3247     settings->setFantasyFontFamily(fantasyFontFamily);
    3248     settings->setFixedFontFamily(monospaceFontFamily);
    3249     settings->setSansSerifFontFamily(sansSerifFontFamily);
    3250     settings->setSerifFontFamily(serifFontFamily);
    3251     settings->setLoadsImagesAutomatically(autoLoadImages);
    3252     settings->setShrinksStandaloneImagesToFit(autoShrinkImages);
    3253     settings->setShouldPrintBackgrounds(printBackgrounds);
    3254     settings->setJavaScriptEnabled(enableScripts);
    3255     settings->setPluginsEnabled(enablePlugins);
    3256     settings->setTextAreasAreResizable(resizableTextAreas);
    3257     settings->setUserStyleSheetLocation(KURL(KURL(), userStylesheetUri));
    3258     settings->setDeveloperExtrasEnabled(enableDeveloperExtras);
    3259     settings->setPrivateBrowsingEnabled(enablePrivateBrowsing);
    3260     settings->setCaretBrowsingEnabled(enableCaretBrowsing);
     3176    WebKitWebSettingsPrivate* settingsPrivate = webView->priv->webSettings->priv;
     3177    Settings* coreSettings = core(webView)->settings();
     3178
     3179    coreSettings->setDefaultTextEncodingName(settingsPrivate->defaultEncoding.data());
     3180    coreSettings->setCursiveFontFamily(settingsPrivate->cursiveFontFamily.data());
     3181    coreSettings->setStandardFontFamily(settingsPrivate->defaultFontFamily.data());
     3182    coreSettings->setFantasyFontFamily(settingsPrivate->fantasyFontFamily.data());
     3183    coreSettings->setFixedFontFamily(settingsPrivate->monospaceFontFamily.data());
     3184    coreSettings->setSansSerifFontFamily(settingsPrivate->sansSerifFontFamily.data());
     3185    coreSettings->setSerifFontFamily(settingsPrivate->serifFontFamily.data());
     3186    coreSettings->setLoadsImagesAutomatically(settingsPrivate->autoLoadImages);
     3187    coreSettings->setShrinksStandaloneImagesToFit(settingsPrivate->autoShrinkImages);
     3188    coreSettings->setShouldPrintBackgrounds(settingsPrivate->printBackgrounds);
     3189    coreSettings->setJavaScriptEnabled(settingsPrivate->enableScripts);
     3190    coreSettings->setPluginsEnabled(settingsPrivate->enablePlugins);
     3191    coreSettings->setTextAreasAreResizable(settingsPrivate->resizableTextAreas);
     3192    coreSettings->setUserStyleSheetLocation(KURL(KURL(), settingsPrivate->userStylesheetURI.data()));
     3193    coreSettings->setDeveloperExtrasEnabled(settingsPrivate->enableDeveloperExtras);
     3194    coreSettings->setPrivateBrowsingEnabled(settingsPrivate->enablePrivateBrowsing);
     3195    coreSettings->setCaretBrowsingEnabled(settingsPrivate->enableCaretBrowsing);
     3196    coreSettings->setLocalStorageEnabled(settingsPrivate->enableHTML5LocalStorage);
     3197    coreSettings->setXSSAuditorEnabled(settingsPrivate->enableXSSAuditor);
     3198    coreSettings->setSpatialNavigationEnabled(settingsPrivate->enableSpatialNavigation);
     3199    coreSettings->setFrameFlatteningEnabled(settingsPrivate->enableFrameFlattening);
     3200    coreSettings->setJavaScriptCanOpenWindowsAutomatically(settingsPrivate->javascriptCanOpenWindowsAutomatically);
     3201    coreSettings->setJavaScriptCanAccessClipboard(settingsPrivate->javascriptCanAccessClipboard);
     3202    coreSettings->setOfflineWebApplicationCacheEnabled(settingsPrivate->enableOfflineWebApplicationCache);
     3203    coreSettings->setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(settingsPrivate->editingBehavior));
     3204    coreSettings->setAllowUniversalAccessFromFileURLs(settingsPrivate->enableUniversalAccessFromFileURIs);
     3205    coreSettings->setAllowFileAccessFromFileURLs(settingsPrivate->enableFileAccessFromFileURIs);
     3206    coreSettings->setDOMPasteAllowed(settingsPrivate->enableDOMPaste);
     3207    coreSettings->setNeedsSiteSpecificQuirks(settingsPrivate->enableSiteSpecificQuirks);
     3208    coreSettings->setUsesPageCache(settingsPrivate->enablePageCache);
     3209    coreSettings->setJavaEnabled(settingsPrivate->enableJavaApplet);
     3210    coreSettings->setHyperlinkAuditingEnabled(settingsPrivate->enableHyperlinkAuditing);
     3211    coreSettings->setDNSPrefetchingEnabled(settingsPrivate->enableDNSPrefetching);
     3212
    32613213#if ENABLE(DATABASE)
    3262     AbstractDatabase::setIsAvailable(enableHTML5Database);
     3214    AbstractDatabase::setIsAvailable(settingsPrivate->enableHTML5Database);
    32633215#endif
    3264     settings->setLocalStorageEnabled(enableHTML5LocalStorage);
    3265     settings->setXSSAuditorEnabled(enableXSSAuditor);
    3266     settings->setSpatialNavigationEnabled(enableSpatialNavigation);
    3267     settings->setFrameFlatteningEnabled(enableFrameFlattening);
    3268     settings->setJavaScriptCanOpenWindowsAutomatically(javascriptCanOpenWindows);
    3269     settings->setJavaScriptCanAccessClipboard(javaScriptCanAccessClipboard);
    3270     settings->setOfflineWebApplicationCacheEnabled(enableOfflineWebAppCache);
    3271     settings->setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(editingBehavior));
    3272     settings->setAllowUniversalAccessFromFileURLs(enableUniversalAccessFromFileURI);
    3273     settings->setAllowFileAccessFromFileURLs(enableFileAccessFromFileURI);
    3274     settings->setDOMPasteAllowed(enableDOMPaste);
    3275     settings->setNeedsSiteSpecificQuirks(enableSiteSpecificQuirks);
    3276     settings->setUsesPageCache(usePageCache);
    3277     settings->setJavaEnabled(enableJavaApplet);
    3278     settings->setHyperlinkAuditingEnabled(enableHyperlinkAuditing);
    3279     settings->setDNSPrefetchingEnabled(enableDNSPrefetching);
    32803216
    32813217#if ENABLE(FULLSCREEN_API)
    3282     settings->setFullScreenEnabled(enableFullscreen);
     3218    coreSettings->setFullScreenEnabled(settingsPrivate->enableFullscreen);
    32833219#endif
    32843220
    32853221#if ENABLE(SPELLCHECK)
    3286     if (enableSpellChecking) {
     3222    if (settingsPrivate->enableSpellChecking) {
    32873223        WebKit::EditorClient* client = static_cast<WebKit::EditorClient*>(core(webView)->editorClient());
    3288         static_cast<WebKit::TextCheckerClientGtk*>(client->textChecker())->updateSpellCheckingLanguage(defaultSpellCheckingLanguages);
     3224        static_cast<WebKit::TextCheckerClientGtk*>(client->textChecker())->updateSpellCheckingLanguage(settingsPrivate->spellCheckingLanguages.data());
    32893225    }
    32903226#endif
    32913227
    32923228#if ENABLE(WEBGL)
    3293     settings->setWebGLEnabled(enableWebGL);
     3229    coreSettings->setWebGLEnabled(settingsPrivate->enableWebGL);
    32943230#endif
    32953231
    3296     Page* page = core(webView);
    3297     if (page)
    3298         page->setTabKeyCyclesThroughElements(tabKeyCyclesThroughElements);
    3299 
    3300     g_free(defaultEncoding);
    3301     g_free(cursiveFontFamily);
    3302     g_free(defaultFontFamily);
    3303     g_free(fantasyFontFamily);
    3304     g_free(monospaceFontFamily);
    3305     g_free(sansSerifFontFamily);
    3306     g_free(serifFontFamily);
    3307     g_free(userStylesheetUri);
     3232    if (Page* page = core(webView))
     3233        page->setTabKeyCyclesThroughElements(settingsPrivate->tabKeyCyclesThroughElements);
    33083234
    33093235    webkit_web_view_screen_changed(GTK_WIDGET(webView), NULL);
    … …  
    33123238static inline gint pixelsFromSize(WebKitWebView* webView, gint size)
    33133239{
    3314     gdouble DPI = webViewGetDPI(webView);
    3315     return size / 72.0 * DPI;
     3240    return size / 72.0 * webViewGetDPI(webView);
    33163241}
    33173242
    … …  
    35483473
    35493474    WebKitWebViewPrivate* priv = webView->priv;
    3550     g_signal_handlers_disconnect_by_func(priv->webSettings.get(), (gpointer)webkit_web_view_settings_notify, webView);
     3475    g_signal_handlers_disconnect_by_func(priv->webSettings.get(), reinterpret_cast<void*>(webkit_web_view_settings_notify), webView);
     3476
    35513477    priv->webSettings = webSettings;
    35523478    webkit_web_view_update_settings(webView);
Note: See TracChangeset for help on using the changeset viewer.