<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42240] trunk/WebKit/gtk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/42240">42240</a></dd>
<dt>Author</dt> <dd>xan@webkit.org</dd>
<dt>Date</dt> <dd>2009-04-06 04:58:02 -0700 (Mon, 06 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-04-05  Xan Lopez  &lt;xlopez@igalia.com&gt;

        Reviewed by Holger Freyther.

        https://bugs.webkit.org/show_bug.cgi?id=25042
        destroying webview widget directly causes crash.

        Do not connect the WebView to its own screen-changed signal, set a
        default handler instead.

        * webkit/webkitwebview.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitgtkChangeLog">trunk/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkWebKitgtkwebkitwebkitwebviewcpp">trunk/WebKit/gtk/webkit/webkitwebview.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/ChangeLog (42239 => 42240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/ChangeLog        2009-04-06 11:57:47 UTC (rev 42239)
+++ trunk/WebKit/gtk/ChangeLog        2009-04-06 11:58:02 UTC (rev 42240)
</span><span class="lines">@@ -5,6 +5,18 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=25042
</span><span class="cx">         destroying webview widget directly causes crash.
</span><span class="cx"> 
</span><ins>+        Do not connect the WebView to its own screen-changed signal, set a
+        default handler instead.
+
+        * webkit/webkitwebview.cpp:
+
+2009-04-05  Xan Lopez  &lt;xlopez@igalia.com&gt;
+
+        Reviewed by Holger Freyther.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25042
+        destroying webview widget directly causes crash.
+
</ins><span class="cx">         GtkWidget::screen-changed can be emitted when a widget is being
</span><span class="cx">         destroyed, protect against it.
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitgtkwebkitwebkitwebviewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/webkit/webkitwebview.cpp (42239 => 42240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/webkit/webkitwebview.cpp        2009-04-06 11:57:47 UTC (rev 42239)
+++ trunk/WebKit/gtk/webkit/webkitwebview.cpp        2009-04-06 11:58:02 UTC (rev 42240)
</span><span class="lines">@@ -963,6 +963,54 @@
</span><span class="cx">     return coreAccessible-&gt;wrapper();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static gdouble webViewGetDPI(WebKitWebView* webView)
+{
+    WebKitWebViewPrivate* priv = webView-&gt;priv;
+    WebKitWebSettings* webSettings = priv-&gt;webSettings;
+    gboolean enforce96DPI;
+    g_object_get(webSettings, &quot;enforce-96-dpi&quot;, &amp;enforce96DPI, NULL);
+    if (enforce96DPI)
+        return 96.0;
+
+    gdouble DPI = defaultDPI;
+    GdkScreen* screen = gtk_widget_has_screen(GTK_WIDGET(webView)) ? gtk_widget_get_screen(GTK_WIDGET(webView)) : gdk_screen_get_default();
+    if (screen) {
+        DPI = gdk_screen_get_resolution(screen);
+        // gdk_screen_get_resolution() returns -1 when no DPI is set.
+        if (DPI == -1)
+            DPI = defaultDPI;
+    }
+    ASSERT(DPI &gt; 0);
+    return DPI;
+}
+
+static void webkit_web_view_screen_changed(GtkWidget* widget, GdkScreen* previousScreen)
+{
+    WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+    WebKitWebViewPrivate* priv = webView-&gt;priv;
+
+    if (priv-&gt;disposing)
+        return;
+
+    WebKitWebSettings* webSettings = priv-&gt;webSettings;
+    Settings* settings = core(webView)-&gt;settings();
+    gdouble DPI = webViewGetDPI(webView);
+
+    guint defaultFontSize, defaultMonospaceFontSize, minimumFontSize, minimumLogicalFontSize;
+
+    g_object_get(webSettings,
+                 &quot;default-font-size&quot;, &amp;defaultFontSize,
+                 &quot;default-monospace-font-size&quot;, &amp;defaultMonospaceFontSize,
+                 &quot;minimum-font-size&quot;, &amp;minimumFontSize,
+                 &quot;minimum-logical-font-size&quot;, &amp;minimumLogicalFontSize,
+                 NULL);
+
+    settings-&gt;setDefaultFontSize(defaultFontSize / 72.0 * DPI);
+    settings-&gt;setDefaultFixedFontSize(defaultMonospaceFontSize / 72.0 * DPI);
+    settings-&gt;setMinimumFontSize(minimumFontSize / 72.0 * DPI);
+    settings-&gt;setMinimumLogicalFontSize(minimumLogicalFontSize / 72.0 * DPI);
+}
+
</ins><span class="cx"> static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
</span><span class="cx"> {
</span><span class="cx">     GtkBindingSet* binding_set;
</span><span class="lines">@@ -1562,6 +1610,7 @@
</span><span class="cx">     widgetClass-&gt;focus_in_event = webkit_web_view_focus_in_event;
</span><span class="cx">     widgetClass-&gt;focus_out_event = webkit_web_view_focus_out_event;
</span><span class="cx">     widgetClass-&gt;get_accessible = webkit_web_view_get_accessible;
</span><ins>+    widgetClass-&gt;screen_changed = webkit_web_view_screen_changed;
</ins><span class="cx"> 
</span><span class="cx">     GtkContainerClass* containerClass = GTK_CONTAINER_CLASS(webViewClass);
</span><span class="cx">     containerClass-&gt;add = webkit_web_view_container_add;
</span><span class="lines">@@ -1819,53 +1868,6 @@
</span><span class="cx">     g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static gdouble webViewGetDPI(WebKitWebView* webView)
-{
-    WebKitWebViewPrivate* priv = webView-&gt;priv;
-    WebKitWebSettings* webSettings = priv-&gt;webSettings;
-    gboolean enforce96DPI;
-    g_object_get(webSettings, &quot;enforce-96-dpi&quot;, &amp;enforce96DPI, NULL);
-    if (enforce96DPI)
-        return 96.0;
-
-    gdouble DPI = defaultDPI;
-    GdkScreen* screen = gtk_widget_has_screen(GTK_WIDGET(webView)) ? gtk_widget_get_screen(GTK_WIDGET(webView)) : gdk_screen_get_default();
-    if (screen) {
-        DPI = gdk_screen_get_resolution(screen);
-        // gdk_screen_get_resolution() returns -1 when no DPI is set.
-        if (DPI == -1)
-            DPI = defaultDPI;
-    }
-    ASSERT(DPI &gt; 0);
-    return DPI;
-}
-
-static void webkit_web_view_screen_changed(WebKitWebView* webView, GdkScreen* previousScreen, gpointer userdata)
-{
-    WebKitWebViewPrivate* priv = webView-&gt;priv;
-
-    if (priv-&gt;disposing)
-        return;
-
-    WebKitWebSettings* webSettings = priv-&gt;webSettings;
-    Settings* settings = core(webView)-&gt;settings();
-    gdouble DPI = webViewGetDPI(webView);
-
-    guint defaultFontSize, defaultMonospaceFontSize, minimumFontSize, minimumLogicalFontSize;
-
-    g_object_get(webSettings,
-                 &quot;default-font-size&quot;, &amp;defaultFontSize,
-                 &quot;default-monospace-font-size&quot;, &amp;defaultMonospaceFontSize,
-                 &quot;minimum-font-size&quot;, &amp;minimumFontSize,
-                 &quot;minimum-logical-font-size&quot;, &amp;minimumLogicalFontSize,
-                 NULL);
-
-    settings-&gt;setDefaultFontSize(defaultFontSize / 72.0 * DPI);
-    settings-&gt;setDefaultFixedFontSize(defaultMonospaceFontSize / 72.0 * DPI);
-    settings-&gt;setMinimumFontSize(minimumFontSize / 72.0 * DPI);
-    settings-&gt;setMinimumLogicalFontSize(minimumLogicalFontSize / 72.0 * DPI);
-}
-
</del><span class="cx"> static void webkit_web_view_update_settings(WebKitWebView* webView)
</span><span class="cx"> {
</span><span class="cx">     WebKitWebViewPrivate* priv = webView-&gt;priv;
</span><span class="lines">@@ -1922,7 +1924,7 @@
</span><span class="cx">     g_free(serifFontFamily);
</span><span class="cx">     g_free(userStylesheetUri);
</span><span class="cx"> 
</span><del>-    webkit_web_view_screen_changed(webView, NULL, NULL);
</del><ins>+    webkit_web_view_screen_changed(GTK_WIDGET(webView), NULL);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static inline gint pixelsFromSize(WebKitWebView* webView, gint size)
</span><span class="lines">@@ -1963,7 +1965,7 @@
</span><span class="cx">     else if (name == g_intern_string(&quot;minimum-logical-font-size&quot;))
</span><span class="cx">         settings-&gt;setMinimumLogicalFontSize(pixelsFromSize(webView, g_value_get_int(&amp;value)));
</span><span class="cx">     else if (name == g_intern_string(&quot;enforce-96-dpi&quot;))
</span><del>-        webkit_web_view_screen_changed(webView, NULL, NULL);
</del><ins>+        webkit_web_view_screen_changed(GTK_WIDGET(webView), NULL);
</ins><span class="cx">     else if (name == g_intern_string(&quot;auto-load-images&quot;))
</span><span class="cx">         settings-&gt;setLoadsImagesAutomatically(g_value_get_boolean(&amp;value));
</span><span class="cx">     else if (name == g_intern_string(&quot;auto-shrink-images&quot;))
</span><span class="lines">@@ -2030,7 +2032,6 @@
</span><span class="cx"> 
</span><span class="cx">     priv-&gt;webSettings = webkit_web_settings_new();
</span><span class="cx">     webkit_web_view_update_settings(webView);
</span><del>-    g_signal_connect(webView, &quot;screen-changed&quot;, G_CALLBACK(webkit_web_view_screen_changed), NULL);
</del><span class="cx">     g_signal_connect(priv-&gt;webSettings, &quot;notify&quot;, G_CALLBACK(webkit_web_view_settings_notify), webView);
</span><span class="cx"> 
</span><span class="cx">     priv-&gt;webWindowFeatures = webkit_web_window_features_new();
</span></span></pre>
</div>
</div>

</body>
</html>