Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog (145522 => 145523)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog 2013-03-12 11:26:44 UTC (rev 145522)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog 2013-03-12 11:31:07 UTC (rev 145523)
@@ -1,3 +1,23 @@
+2013-03-07 Tomas Popela <[email protected]>
+
+ [GTK] Expose "ShouldRespectImageOrientation" setting into WebKitWebSettings
+ https://bugs.webkit.org/show_bug.cgi?id=111414
+
+ Reviewed by Carlos Garcia Campos.
+
+ We should expose ShouldRespectImageOrientation setting into
+ WebKitWebSettings. When it is enabled, the images are shown with right
+ orientation regarding to images EXIF data.
+
+ * webkit/webkitwebsettings.cpp:
+ (webkit_web_settings_class_init):
+ (webkit_web_settings_set_property):
+ (webkit_web_settings_get_property):
+ * webkit/webkitwebsettingsprivate.h:
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_update_settings):
+ (webkit_web_view_settings_notify):
+
2013-02-26 Martin Robinson <[email protected]>
REGRESSION (r143619): Crashes in three layout tests
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkitwebsettings.cpp (145522 => 145523)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2013-03-12 11:26:44 UTC (rev 145522)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2013-03-12 11:31:07 UTC (rev 145523)
@@ -79,6 +79,7 @@
PROP_ENFORCE_96_DPI,
PROP_AUTO_LOAD_IMAGES,
PROP_AUTO_SHRINK_IMAGES,
+ PROP_RESPECT_IMAGE_ORIENTATION,
PROP_PRINT_BACKGROUNDS,
PROP_ENABLE_SCRIPTS,
PROP_ENABLE_PLUGINS,
@@ -280,6 +281,15 @@
flags));
g_object_class_install_property(gobject_class,
+ PROP_RESPECT_IMAGE_ORIENTATION,
+ g_param_spec_boolean(
+ "respect-image-orientation",
+ _("Respect Image Orientation"),
+ _("Whether WebKit should respect image orientation."),
+ FALSE,
+ flags));
+
+ g_object_class_install_property(gobject_class,
PROP_PRINT_BACKGROUNDS,
g_param_spec_boolean(
"print-backgrounds",
@@ -1075,6 +1085,9 @@
case PROP_AUTO_SHRINK_IMAGES:
priv->autoShrinkImages = g_value_get_boolean(value);
break;
+ case PROP_RESPECT_IMAGE_ORIENTATION:
+ priv->respectImageOrientation = g_value_get_boolean(value);
+ break;
case PROP_PRINT_BACKGROUNDS:
priv->printBackgrounds = g_value_get_boolean(value);
break;
@@ -1264,6 +1277,9 @@
case PROP_AUTO_SHRINK_IMAGES:
g_value_set_boolean(value, priv->autoShrinkImages);
break;
+ case PROP_RESPECT_IMAGE_ORIENTATION:
+ g_value_set_boolean(value, priv->respectImageOrientation);
+ break;
case PROP_PRINT_BACKGROUNDS:
g_value_set_boolean(value, priv->printBackgrounds);
break;
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h (145522 => 145523)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h 2013-03-12 11:26:44 UTC (rev 145522)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h 2013-03-12 11:31:07 UTC (rev 145523)
@@ -43,6 +43,7 @@
gboolean enforce96DPI;
gboolean autoLoadImages;
gboolean autoShrinkImages;
+ gboolean respectImageOrientation;
gboolean printBackgrounds;
gboolean enableScripts;
gboolean enablePlugins;
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkitwebview.cpp (145522 => 145523)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-03-12 11:26:44 UTC (rev 145522)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-03-12 11:31:07 UTC (rev 145523)
@@ -3385,6 +3385,7 @@
coreSettings->setSerifFontFamily(settingsPrivate->serifFontFamily.data());
coreSettings->setLoadsImagesAutomatically(settingsPrivate->autoLoadImages);
coreSettings->setShrinksStandaloneImagesToFit(settingsPrivate->autoShrinkImages);
+ coreSettings->setShouldRespectImageOrientation(settingsPrivate->respectImageOrientation);
coreSettings->setShouldPrintBackgrounds(settingsPrivate->printBackgrounds);
coreSettings->setScriptEnabled(settingsPrivate->enableScripts);
coreSettings->setPluginsEnabled(settingsPrivate->enablePlugins);
@@ -3504,6 +3505,8 @@
settings->setLoadsImagesAutomatically(g_value_get_boolean(&value));
else if (name == g_intern_string("auto-shrink-images"))
settings->setShrinksStandaloneImagesToFit(g_value_get_boolean(&value));
+ else if (name == g_intern_string("respect-image-orientation"))
+ settings->setShouldRespectImageOrientation(g_value_get_boolean(&value));
else if (name == g_intern_string("print-backgrounds"))
settings->setShouldPrintBackgrounds(g_value_get_boolean(&value));
else if (name == g_intern_string("enable-scripts"))
