<!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>[69793] trunk/WebCore</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/69793">69793</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2010-10-14 12:29:25 -0700 (Thu, 14 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-10-14  Xan Lopez  &lt;xlopez@igalia.com&gt;

        Reviewed by Martin Robinson.

        [GTK] Small cleanup in PluginViewGtk
        https://bugs.webkit.org/show_bug.cgi?id=47588

        Remove some dead code and use PlatformRefPtr for cairo surfaces.

        No new tests, only refactoring.

        * plugins/gtk/PluginViewGtk.cpp:
        (WebCore::PluginView::paint):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepluginsgtkPluginViewGtkcpp">trunk/WebCore/plugins/gtk/PluginViewGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (69792 => 69793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-10-14 19:23:10 UTC (rev 69792)
+++ trunk/WebCore/ChangeLog        2010-10-14 19:29:25 UTC (rev 69793)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2010-10-14  Xan Lopez  &lt;xlopez@igalia.com&gt;
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Small cleanup in PluginViewGtk
+        https://bugs.webkit.org/show_bug.cgi?id=47588
+
+        Remove some dead code and use PlatformRefPtr for cairo surfaces.
+
+        No new tests, only refactoring.
+
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::paint):
+
</ins><span class="cx"> 2010-10-14  Dawit Alemayehu  &lt;adawit@kde.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Andreas Kling.
</span></span></pre></div>
<a id="trunkWebCorepluginsgtkPluginViewGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/plugins/gtk/PluginViewGtk.cpp (69792 => 69793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/plugins/gtk/PluginViewGtk.cpp        2010-10-14 19:23:10 UTC (rev 69792)
+++ trunk/WebCore/plugins/gtk/PluginViewGtk.cpp        2010-10-14 19:29:25 UTC (rev 69793)
</span><span class="lines">@@ -193,29 +193,20 @@
</span><span class="cx">     exposedRect.intersect(frameRect());
</span><span class="cx">     exposedRect.move(-frameRect().x(), -frameRect().y());
</span><span class="cx"> 
</span><del>-    Window dummyW;
-    int dummyI;
-    unsigned int dummyUI, actualDepth = 0;
-    XGetGeometry(GDK_DISPLAY(), m_drawable, &amp;dummyW, &amp;dummyI, &amp;dummyI,
-                 &amp;dummyUI, &amp;dummyUI, &amp;dummyUI, &amp;actualDepth);
</del><ins>+    PlatformRefPtr&lt;cairo_surface_t&gt; drawableSurface = adoptPlatformRef(cairo_xlib_surface_create(GDK_DISPLAY(),
+                                                                                                 m_drawable,
+                                                                                                 m_visual,
+                                                                                                 m_windowRect.width(),
+                                                                                                 m_windowRect.height()));
</ins><span class="cx"> 
</span><del>-    const unsigned int drawableDepth = ((NPSetWindowCallbackStruct*)m_npWindow.ws_info)-&gt;depth;
-    ASSERT(drawableDepth == actualDepth);
-
-    cairo_surface_t* drawableSurface = cairo_xlib_surface_create(GDK_DISPLAY(),
-                                                                 m_drawable,
-                                                                 m_visual,
-                                                                 m_windowRect.width(),
-                                                                 m_windowRect.height());
-
</del><span class="cx">     if (m_isTransparent) {
</span><span class="cx">         // If we have a 32 bit drawable and the plugin wants transparency,
</span><span class="cx">         // we'll clear the exposed area to transparent first.  Otherwise,
</span><span class="cx">         // we'd end up with junk in there from the last paint, or, worse,
</span><span class="cx">         // uninitialized data.
</span><del>-        PlatformRefPtr&lt;cairo_t&gt; cr = adoptPlatformRef(cairo_create(drawableSurface));
</del><ins>+        PlatformRefPtr&lt;cairo_t&gt; cr = adoptPlatformRef(cairo_create(drawableSurface.get()));
</ins><span class="cx"> 
</span><del>-        if (!(cairo_surface_get_content(drawableSurface) &amp; CAIRO_CONTENT_ALPHA)) {
</del><ins>+        if (!(cairo_surface_get_content(drawableSurface.get()) &amp; CAIRO_CONTENT_ALPHA)) {
</ins><span class="cx">             // Attempt to fake it when we don't have an alpha channel on our
</span><span class="cx">             // pixmap.  If that's not possible, at least clear the window to
</span><span class="cx">             // avoid drawing artifacts.
</span><span class="lines">@@ -251,7 +242,7 @@
</span><span class="cx">     cairo_t* cr = context-&gt;platformContext();
</span><span class="cx">     cairo_save(cr);
</span><span class="cx"> 
</span><del>-    cairo_set_source_surface(cr, drawableSurface, frameRect().x(), frameRect().y());
</del><ins>+    cairo_set_source_surface(cr, drawableSurface.get(), frameRect().x(), frameRect().y());
</ins><span class="cx"> 
</span><span class="cx">     cairo_rectangle(cr,
</span><span class="cx">                     frameRect().x() + exposedRect.x(), frameRect().y() + exposedRect.y(),
</span><span class="lines">@@ -265,7 +256,6 @@
</span><span class="cx">     cairo_paint(cr);
</span><span class="cx"> 
</span><span class="cx">     cairo_restore(cr);
</span><del>-    cairo_surface_destroy(drawableSurface);
</del><span class="cx"> #endif // defined(XP_UNIX)
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>