Changeset 30385 in webkit

Timestamp:

Feb 18, 2008 3:03:57 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-02-18 Alp Toker <​alp@atoker.com>

Reviewed by Mark Rowe.

​http://bugs.webkit.org/show_bug.cgi?id=17312
[GTK] Webview Transparent Background

Add support for WebView background transparency.

• webkit/webkitprivate.h:
• webkit/webkitwebview.cpp:
• webkit/webkitwebview.h:

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitprivate.h (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (7 diffs)
• webkit/webkitwebview.h (modified) (1 diff)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2008-02-18  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Mark Rowe.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17312
+        [GTK] Webview Transparent Background
+
+        Add support for WebView background transparency.
+
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebview.cpp:
+        * webkit/webkitwebview.h:
+
 2008-02-18  Alp Toker  <alp@atoker.com>
 

trunk/WebKit/gtk/webkit/webkitprivate.h

@@ -85 +85 @@
         GtkTargetList* copy_target_list;
         GtkTargetList* paste_target_list;
+
+        gboolean transparent;
     };
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -95 +95 @@
     PROP_PASTE_TARGET_LIST,
     PROP_EDITABLE,
-    PROP_SETTINGS
+    PROP_SETTINGS,
+    PROP_TRANSPARENT
 };
 
@@ -213 +214 @@
         g_value_set_object(value, webkit_web_view_get_settings(webView));
         break;
+    case PROP_TRANSPARENT:
+        g_value_set_boolean(value, webkit_web_view_get_transparent(webView));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -229 +233 @@
         webkit_web_view_set_settings(webView, WEBKIT_WEB_SETTINGS(g_value_get_object(value)));
         break;
+    case PROP_TRANSPARENT:
+        webkit_web_view_set_transparent(webView, g_value_get_boolean(value));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -237 +244 @@
 {
     WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+    WebKitWebViewPrivate* priv = webView->priv;
 
     Frame* frame = core(webView)->mainFrame();
@@ -246 +254 @@
     if (frame->renderer()) {
         frame->view()->layoutIfNeededRecursive();
+
+        if (priv->transparent) {
+            cairo_save(cr);
+            cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
+            cairo_paint(cr);
+            cairo_restore(cr);
+        }
+
         frame->view()->paint(&ctx, clip);
     }
@@ -1077 +1093 @@
                                                          "Editable",
                                                          "Whether content can be modified by the user",
+                                                         FALSE,
+                                                         WEBKIT_PARAM_READWRITE));
+
+    g_object_class_install_property(objectClass, PROP_TRANSPARENT,
+                                    g_param_spec_boolean("transparent",
+                                                         "Transparent",
+                                                         "Whether content has a transparent background",
                                                          FALSE,
                                                          WEBKIT_PARAM_READWRITE));
@@ -1873 +1896 @@
 }
 
-}
+/**
+ * webkit_web_view_get_transparent:
+ * @web_view: a #WebKitWebView
+ *
+ * Returns whether the #WebKitWebView has a transparent background.
+ *
+ * Return value: %FALSE when the #WebKitWebView draws a solid background
+ * (the default), otherwise %TRUE.
+ */
+gboolean webkit_web_view_get_transparent(WebKitWebView* webView)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
+
+    WebKitWebViewPrivate* priv = webView->priv;
+    return priv->transparent;
+}
+
+/**
+ * webkit_web_view_set_transparent:
+ * @web_view: a #WebKitWebView
+ *
+ * Sets whether the #WebKitWebView has a transparent background.
+ *
+ * Pass %FALSE to have the #WebKitWebView draw a solid background
+ * (the default), otherwise %TRUE.
+ */
+void webkit_web_view_set_transparent(WebKitWebView* webView, gboolean flag)
+{
+    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+
+    WebKitWebViewPrivate* priv = webView->priv;
+    priv->transparent = flag;
+
+    // TODO: This needs to be made persistent or it could become a problem when
+    // the main frame is replaced.
+    Frame* frame = core(webView)->mainFrame();
+    g_return_if_fail(frame);
+    frame->view()->setTransparent(flag);
+}
+
+}

trunk/WebKit/gtk/webkit/webkitwebview.h

@@ -212 +212 @@
 webkit_web_view_go_backward (WebKitWebView* web_view);
 
+WEBKIT_API gboolean
+webkit_web_view_get_transparent (WebKitWebView* web_view);
+
+WEBKIT_API void
+webkit_web_view_set_transparent (WebKitWebView* web_view, gboolean flag);
+
 G_END_DECLS