Changeset 134339 in webkit
- Timestamp:
- Nov 12, 2012 6:47:43 PM (11 years ago)
- Location:
- trunk/Source/WebKit/gtk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/gtk/ChangeLog
r133517 r134339 1 2012-11-12 Josh Rickmar <jrick@devio.us> 2 3 Add WebCore::Setting to block displaying and/or running insecure content on secure pages 4 https://bugs.webkit.org/show_bug.cgi?id=58378 5 6 Reviewed by Martin Robinson. 7 8 * webkit/webkitwebsettings.cpp: 9 (webkit_web_settings_class_init): 10 (webkit_web_settings_set_property): 11 (webkit_web_settings_get_property): 12 (webkit_web_settings_copy): 13 * webkit/webkitwebview.cpp: 14 (webkit_web_view_update_settings): 15 (webkit_web_view_settings_notify): 16 1 17 2012-11-05 Simon Fraser <simon.fraser@apple.com> 2 18 -
trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp
r129000 r134339 121 121 PROP_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE, 122 122 PROP_MEDIA_PLAYBACK_ALLOWS_INLINE, 123 PROP_ENABLE_CSS_SHADERS 123 PROP_ENABLE_CSS_SHADERS, 124 PROP_ENABLE_RUNNING_OF_INSECURE_CONTENT, 125 PROP_ENABLE_DISPLAY_OF_INSECURE_CONTENT 124 126 }; 125 127 … … 982 984 flags)); 983 985 986 /** 987 * WebKitWebSettings:enable-display-of-insecure-content 988 * 989 * Whether pages loaded via HTTPS should load subresources such as 990 * images and frames from non-HTTPS URLs. 991 * 992 * Since: 2.0 993 */ 994 g_object_class_install_property(gobject_class, 995 PROP_ENABLE_DISPLAY_OF_INSECURE_CONTENT, 996 g_param_spec_boolean("enable-display-of-insecure-content", 997 _("Enable display of insecure content"), 998 _("Whether non-HTTPS resources can display on HTTPS pages."), 999 TRUE, 1000 flags)); 1001 1002 /** 1003 * WebKitWebSettings:enable-running-of-insecure-content 1004 * 1005 * Whether pages loaded via HTTPS should run subresources such as 1006 * CSS, scripts, and plugins from non-HTTPS URLs. 1007 * 1008 * Since: 2.0 1009 */ 1010 g_object_class_install_property(gobject_class, 1011 PROP_ENABLE_RUNNING_OF_INSECURE_CONTENT, 1012 g_param_spec_boolean("enable-running-of-insecure-content", 1013 _("Enable running of insecure content"), 1014 _("Whether non-HTTPS resources can run on HTTPS pages."), 1015 TRUE, 1016 flags)); 984 1017 } 985 1018 … … 1172 1205 priv->mediaPlaybackAllowsInline = g_value_get_boolean(value); 1173 1206 break; 1207 case PROP_ENABLE_DISPLAY_OF_INSECURE_CONTENT: 1208 priv->enableDisplayOfInsecureContent = g_value_get_boolean(value); 1209 break; 1210 case PROP_ENABLE_RUNNING_OF_INSECURE_CONTENT: 1211 priv->enableRunningOfInsecureContent = g_value_get_boolean(value); 1212 break; 1174 1213 default: 1175 1214 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); … … 1351 1390 case PROP_MEDIA_PLAYBACK_ALLOWS_INLINE: 1352 1391 g_value_set_boolean(value, priv->mediaPlaybackAllowsInline); 1392 break; 1393 case PROP_ENABLE_DISPLAY_OF_INSECURE_CONTENT: 1394 g_value_set_boolean(value, priv->enableDisplayOfInsecureContent); 1395 break; 1396 case PROP_ENABLE_RUNNING_OF_INSECURE_CONTENT: 1397 g_value_set_boolean(value, priv->enableRunningOfInsecureContent); 1353 1398 break; 1354 1399 default: -
trunk/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h
r129000 r134339 86 86 gboolean mediaPlaybackRequiresUserGesture; 87 87 gboolean mediaPlaybackAllowsInline; 88 gboolean enableDisplayOfInsecureContent; 89 gboolean enableRunningOfInsecureContent; 88 90 }; 89 91 -
trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp
r130867 r134339 3402 3402 coreSettings->setMediaPlaybackRequiresUserGesture(settingsPrivate->mediaPlaybackRequiresUserGesture); 3403 3403 coreSettings->setMediaPlaybackAllowsInline(settingsPrivate->mediaPlaybackAllowsInline); 3404 coreSettings->setAllowDisplayOfInsecureContent(settingsPrivate->enableDisplayOfInsecureContent); 3405 coreSettings->setAllowRunningOfInsecureContent(settingsPrivate->enableRunningOfInsecureContent); 3404 3406 3405 3407 #if ENABLE(SQL_DATABASE)
Note: See TracChangeset
for help on using the changeset viewer.