[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

xan at webkit.org xan at webkit.org
Thu Apr 8 01:50:38 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit e9b293b4211f9a1f5ea18bbc94aa8cc428e9515f
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 18:33:02 2010 +0000

    WebKit/gtk:
    
    2010-02-17  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Rename 'enable-java' setting to 'enable-java-applet', since it
            only controls whether <applet> is supported or not instead of
            whether all Java content is supported or not.
    
            * webkit/webkitwebsettings.cpp:
            (webkit_web_settings_class_init):
            (webkit_web_settings_set_property):
            (webkit_web_settings_get_property):
            (webkit_web_settings_copy):
            * webkit/webkitwebview.cpp:
            (DNDContentsRequest::webkit_web_view_update_settings):
            (DNDContentsRequest::webkit_web_view_settings_notify):
    
    WebKitTools:
    
    2010-02-17  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Update to use new property name.
    
            * DumpRenderTree/gtk/DumpRenderTree.cpp:
            (resetDefaultsToConsistentValues):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54900 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 171b3e9..417a10a 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -2,6 +2,23 @@
 
         Reviewed by Gustavo Noronha.
 
+        Rename 'enable-java' setting to 'enable-java-applet', since it
+        only controls whether <applet> is supported or not instead of
+        whether all Java content is supported or not.
+
+        * webkit/webkitwebsettings.cpp:
+        (webkit_web_settings_class_init):
+        (webkit_web_settings_set_property):
+        (webkit_web_settings_get_property):
+        (webkit_web_settings_copy):
+        * webkit/webkitwebview.cpp:
+        (DNDContentsRequest::webkit_web_view_update_settings):
+        (DNDContentsRequest::webkit_web_view_settings_notify):
+
+2010-02-17  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
         [Linux] Webkit incompatible with Java plugins
         https://bugs.webkit.org/show_bug.cgi?id=24912
 
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index b288d55..4ff4a8e 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -105,7 +105,7 @@ struct _WebKitWebSettingsPrivate {
     gboolean enable_site_specific_quirks;
     gboolean enable_page_cache;
     gboolean auto_resize_window;
-    gboolean enable_java;
+    gboolean enable_java_applet;
 };
 
 #define WEBKIT_WEB_SETTINGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsPrivate))
@@ -153,7 +153,7 @@ enum {
     PROP_ENABLE_SITE_SPECIFIC_QUIRKS,
     PROP_ENABLE_PAGE_CACHE,
     PROP_AUTO_RESIZE_WINDOW,
-    PROP_ENABLE_JAVA
+    PROP_ENABLE_JAVA_APPLET
 };
 
 // Create a default user agent string
@@ -803,17 +803,19 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
                                                           flags));
 
    /**
-    * WebKitWebSettings:enable-java:
+    * WebKitWebSettings:enable-java-applet:
     *
-    * Enable or disable support for Java plugins.
+    * Enable or disable support for the Java <applet> tag. Keep in
+    * mind that Java content can be still shown in the page through
+    * <object> or <embed>, which are the preferred tags for this task.
     *
     * Since: 1.1.22
     */
     g_object_class_install_property(gobject_class,
-                                    PROP_ENABLE_JAVA,
-                                    g_param_spec_boolean("enable-java",
-                                                         _("Enable Java"),
-                                                         _("Whether Java plugin support should be enabled"),
+                                    PROP_ENABLE_JAVA_APPLET,
+                                    g_param_spec_boolean("enable-java-applet",
+                                                         _("Enable Java Applet"),
+                                                         _("Whether Java Applet support through <applet> should be enabled"),
                                                          TRUE,
                                                          flags));
 
@@ -1031,8 +1033,8 @@ static void webkit_web_settings_set_property(GObject* object, guint prop_id, con
     case PROP_AUTO_RESIZE_WINDOW:
         priv->auto_resize_window = g_value_get_boolean(value);
         break;
-    case PROP_ENABLE_JAVA:
-        priv->enable_java = g_value_get_boolean(value);
+    case PROP_ENABLE_JAVA_APPLET:
+        priv->enable_java_applet = g_value_get_boolean(value);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -1166,8 +1168,8 @@ static void webkit_web_settings_get_property(GObject* object, guint prop_id, GVa
     case PROP_AUTO_RESIZE_WINDOW:
         g_value_set_boolean(value, priv->auto_resize_window);
         break;
-    case PROP_ENABLE_JAVA:
-        g_value_set_boolean(value, priv->enable_java);
+    case PROP_ENABLE_JAVA_APPLET:
+        g_value_set_boolean(value, priv->enable_java_applet);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -1240,7 +1242,7 @@ WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings)
                  "enable-site-specific-quirks", priv->enable_site_specific_quirks,
                  "enable-page-cache", priv->enable_page_cache,
                  "auto-resize-window", priv->auto_resize_window,
-                 "enable-java", priv->enable_java,
+                 "enable-java-applet", priv->enable_java_applet,
                  NULL));
 
     return copy;
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 5057c3d..d6a8b83 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -2552,7 +2552,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
         enableXSSAuditor, javascriptCanOpenWindows, enableOfflineWebAppCache,
         enableUniversalAccessFromFileURI, enableFileAccessFromFileURI,
         enableDOMPaste, tabKeyCyclesThroughElements,
-        enableSiteSpecificQuirks, usePageCache, enableJava;
+        enableSiteSpecificQuirks, usePageCache, enableJavaApplet;
 
     WebKitEditingBehavior editingBehavior;
 
@@ -2586,7 +2586,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
                  "tab-key-cycles-through-elements", &tabKeyCyclesThroughElements,
                  "enable-site-specific-quirks", &enableSiteSpecificQuirks,
                  "enable-page-cache", &usePageCache,
-                 "enable-java", &enableJava,
+                 "enable-java-applet", &enableJavaApplet,
                  NULL);
 
     settings->setDefaultTextEncodingName(defaultEncoding);
@@ -2617,7 +2617,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
     settings->setDOMPasteAllowed(enableDOMPaste);
     settings->setNeedsSiteSpecificQuirks(enableSiteSpecificQuirks);
     settings->setUsesPageCache(usePageCache);
-    settings->setJavaEnabled(enableJava);
+    settings->setJavaEnabled(enableJavaApplet);
 
     Page* page = core(webView);
     if (page)
@@ -2720,7 +2720,7 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar
         settings->setNeedsSiteSpecificQuirks(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-page-cache"))
         settings->setUsesPageCache(g_value_get_boolean(&value));
-    else if (name == g_intern_string("enable-java"))
+    else if (name == g_intern_string("enable-java-applet"))
         settings->setJavaEnabled(g_value_get_boolean(&value));
     else if (!g_object_class_find_property(G_OBJECT_GET_CLASS(webSettings), name))
         g_warning("Unexpected setting '%s'", name);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c5bb397..f15cdce 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-17  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Update to use new property name.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+
 2010-02-17  Julien Chaffraix  <jchaffraix at webkit.org>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 4584f84..81734ee 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -336,7 +336,7 @@ static void resetDefaultsToConsistentValues()
                  "enable-caret-browsing", FALSE,
                  "enable-page-cache", FALSE,
                  "auto-resize-window", TRUE,
-                 "enable-java", FALSE,
+                 "enable-java-applet", FALSE,
                  NULL);
 
     webkit_web_frame_clear_main_frame_name(mainFrame);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list