<!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>[174425] releases/WebKitGTK/webkit-2.6/Source/WebKit2</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/174425">174425</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-08 03:19:47 -0700 (Wed, 08 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174327">r174327</a> - [GTK] The new web inspector can't be docked again once undocked
https://bugs.webkit.org/show_bug.cgi?id=121544

Reviewed by Martin Robinson.

Use a GtkHeaderBar for the inspector window to add dock buttons
when building with GTK+ &gt;= 3.10.

* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::WebInspectorProxy):
* UIProcess/WebInspectorProxy.h:
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
(WebKit::WebInspectorProxy::dockButtonClicked):
(WebKit::WebInspectorProxy::createInspectorWindow):
(WebKit::WebInspectorProxy::updateInspectorWindowTitle):
(WebKit::WebInspectorProxy::platformInspectedURLChanged):
(WebKit::WebInspectorProxy::platformAttachAvailabilityChanged):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessWebInspectorProxycpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessWebInspectorProxyh">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/WebInspectorProxy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (174424 => 174425)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog        2014-10-08 10:01:55 UTC (rev 174424)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog        2014-10-08 10:19:47 UTC (rev 174425)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-10-05  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        [GTK] The new web inspector can't be docked again once undocked
+        https://bugs.webkit.org/show_bug.cgi?id=121544
+
+        Reviewed by Martin Robinson.
+
+        Use a GtkHeaderBar for the inspector window to add dock buttons
+        when building with GTK+ &gt;= 3.10.
+
+        * UIProcess/WebInspectorProxy.cpp:
+        (WebKit::WebInspectorProxy::WebInspectorProxy):
+        * UIProcess/WebInspectorProxy.h:
+        * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+        (WebKit::WebInspectorProxy::dockButtonClicked):
+        (WebKit::WebInspectorProxy::createInspectorWindow):
+        (WebKit::WebInspectorProxy::updateInspectorWindowTitle):
+        (WebKit::WebInspectorProxy::platformInspectedURLChanged):
+        (WebKit::WebInspectorProxy::platformAttachAvailabilityChanged):
+
</ins><span class="cx"> 2014-10-04  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed. Add missing inspector files to compilation.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (174424 => 174425)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/WebInspectorProxy.cpp        2014-10-08 10:01:55 UTC (rev 174424)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/WebInspectorProxy.cpp        2014-10-08 10:19:47 UTC (rev 174425)
</span><span class="lines">@@ -134,9 +134,14 @@
</span><span class="cx">     , m_ignoreFirstBringToFront(false)
</span><span class="cx">     , m_attachmentSide(AttachmentSideBottom)
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><del>-    , m_inspectorView(0)
-    , m_inspectorWindow(0)
</del><ins>+    , m_inspectorView(nullptr)
+    , m_inspectorWindow(nullptr)
+#if PLATFORM(GTK)
+    , m_headerBar(nullptr)
+    , m_dockBottomButton(nullptr)
+    , m_dockRightButton(nullptr)
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> #if ENABLE(INSPECTOR_SERVER)
</span><span class="cx">     , m_remoteInspectionPageId(0)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/WebInspectorProxy.h (174424 => 174425)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/WebInspectorProxy.h        2014-10-08 10:01:55 UTC (rev 174424)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/WebInspectorProxy.h        2014-10-08 10:19:47 UTC (rev 174425)
</span><span class="lines">@@ -198,6 +198,11 @@
</span><span class="cx">     void createInspectorWindow();
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(GTK)
+    void updateInspectorWindowTitle() const;
+    static void dockButtonClicked(GtkWidget*, WebInspectorProxy*);
+#endif
+
</ins><span class="cx">     static const unsigned minimumWindowWidth;
</span><span class="cx">     static const unsigned minimumWindowHeight;
</span><span class="cx"> 
</span><span class="lines">@@ -238,6 +243,10 @@
</span><span class="cx">     WebInspectorClientGtk m_client;
</span><span class="cx">     GtkWidget* m_inspectorView;
</span><span class="cx">     GtkWidget* m_inspectorWindow;
</span><ins>+    GtkWidget* m_headerBar;
+    GtkWidget* m_dockBottomButton;
+    GtkWidget* m_dockRightButton;
+    String m_inspectedURLString;
</ins><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx">     Evas_Object* m_inspectorView;
</span><span class="cx">     Ecore_Evas* m_inspectorWindow;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (174424 => 174425)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp        2014-10-08 10:01:55 UTC (rev 174424)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp        2014-10-08 10:19:47 UTC (rev 174425)
</span><span class="lines">@@ -67,6 +67,16 @@
</span><span class="cx">     return webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_inspectorView));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebInspectorProxy::dockButtonClicked(GtkWidget* button, WebInspectorProxy* inspector)
+{
+    if (button == inspector-&gt;m_dockBottomButton)
+        inspector-&gt;attach(AttachmentSideBottom);
+    else if (button == inspector-&gt;m_dockRightButton)
+        inspector-&gt;attach(AttachmentSideRight);
+    else
+        ASSERT_NOT_REACHED();
+}
+
</ins><span class="cx"> void WebInspectorProxy::createInspectorWindow()
</span><span class="cx"> {
</span><span class="cx">     if (m_client.openWindow(this))
</span><span class="lines">@@ -79,7 +89,33 @@
</span><span class="cx">     if (WebCore::widgetIsOnscreenToplevelWindow(inspectedViewParent))
</span><span class="cx">         gtk_window_set_transient_for(GTK_WINDOW(m_inspectorWindow), GTK_WINDOW(inspectedViewParent));
</span><span class="cx"> 
</span><del>-    gtk_window_set_title(GTK_WINDOW(m_inspectorWindow), _(&quot;Web Inspector&quot;));
</del><ins>+#if GTK_CHECK_VERSION(3, 10, 0)
+    m_headerBar = gtk_header_bar_new();
+    gtk_header_bar_set_show_close_button(GTK_HEADER_BAR(m_headerBar), TRUE);
+
+    m_dockBottomButton = gtk_button_new();
+    g_object_add_weak_pointer(G_OBJECT(m_dockBottomButton), reinterpret_cast&lt;void**&gt;(&amp;m_dockBottomButton));
+    g_signal_connect(m_dockBottomButton, &quot;clicked&quot;, G_CALLBACK(dockButtonClicked), this);
+    gtk_widget_set_sensitive(m_dockBottomButton, canAttach());
+    gtk_button_set_relief(GTK_BUTTON(m_dockBottomButton), GTK_RELIEF_NONE);
+    gtk_button_set_image(GTK_BUTTON(m_dockBottomButton), gtk_image_new_from_resource(&quot;/org/webkitgtk/inspector/UserInterface/Images/DockBottom.svg&quot;));
+    gtk_header_bar_pack_start(GTK_HEADER_BAR(m_headerBar), m_dockBottomButton);
+    gtk_widget_show(m_dockBottomButton);
+
+    m_dockRightButton = gtk_button_new();
+    g_object_add_weak_pointer(G_OBJECT(m_dockRightButton), reinterpret_cast&lt;void**&gt;(&amp;m_dockRightButton));
+    g_signal_connect(m_dockRightButton, &quot;clicked&quot;, G_CALLBACK(dockButtonClicked), this);
+    gtk_widget_set_sensitive(m_dockRightButton, canAttach());
+    gtk_button_set_relief(GTK_BUTTON(m_dockRightButton), GTK_RELIEF_NONE);
+    gtk_button_set_image(GTK_BUTTON(m_dockRightButton), gtk_image_new_from_resource(&quot;/org/webkitgtk/inspector/UserInterface/Images/DockRight.svg&quot;));
+    gtk_header_bar_pack_start(GTK_HEADER_BAR(m_headerBar), m_dockRightButton);
+    gtk_widget_show(m_dockRightButton);
+
+    gtk_window_set_titlebar(GTK_WINDOW(m_inspectorWindow), m_headerBar);
+    gtk_widget_show(m_headerBar);
+#endif
+
+    updateInspectorWindowTitle();
</ins><span class="cx">     gtk_window_set_default_size(GTK_WINDOW(m_inspectorWindow), initialWindowWidth, initialWindowHeight);
</span><span class="cx"> 
</span><span class="cx">     gtk_container_add(GTK_CONTAINER(m_inspectorWindow), m_inspectorView);
</span><span class="lines">@@ -89,6 +125,23 @@
</span><span class="cx">     gtk_window_present(GTK_WINDOW(m_inspectorWindow));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebInspectorProxy::updateInspectorWindowTitle() const
+{
+    ASSERT(m_inspectorWindow);
+    if (m_inspectedURLString.isEmpty()) {
+        gtk_window_set_title(GTK_WINDOW(m_inspectorWindow), _(&quot;Web Inspector&quot;));
+        return;
+    }
+
+#if GTK_CHECK_VERSION(3, 10, 0)
+    gtk_header_bar_set_title(GTK_HEADER_BAR(m_headerBar), _(&quot;Web Inspector&quot;));
+    gtk_header_bar_set_subtitle(GTK_HEADER_BAR(m_headerBar), m_inspectedURLString.utf8().data());
+#else
+    GUniquePtr&lt;gchar&gt; title(g_strdup_printf(&quot;%s - %s&quot;, _(&quot;Web Inspector&quot;), m_inspectedURLString.utf8().data()));
+    gtk_window_set_title(GTK_WINDOW(m_inspectorWindow), title.get());
+#endif
+}
+
</ins><span class="cx"> void WebInspectorProxy::platformOpen()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_inspectorWindow);
</span><span class="lines">@@ -140,12 +193,11 @@
</span><span class="cx"> 
</span><span class="cx"> void WebInspectorProxy::platformInspectedURLChanged(const String&amp; url)
</span><span class="cx"> {
</span><ins>+    m_inspectedURLString = url;
</ins><span class="cx">     m_client.inspectedURLChanged(this, url);
</span><span class="cx"> 
</span><del>-    if (!m_inspectorWindow)
-        return;
-    GUniquePtr&lt;gchar&gt; title(g_strdup_printf(&quot;%s - %s&quot;, _(&quot;Web Inspector&quot;), url.utf8().data()));
-    gtk_window_set_title(GTK_WINDOW(m_inspectorWindow), title.get());
</del><ins>+    if (m_inspectorWindow)
+        updateInspectorWindowTitle();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> String WebInspectorProxy::inspectorPageURL() const
</span><span class="lines">@@ -250,9 +302,12 @@
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebInspectorProxy::platformAttachAvailabilityChanged(bool)
</del><ins>+void WebInspectorProxy::platformAttachAvailabilityChanged(bool available)
</ins><span class="cx"> {
</span><del>-    notImplemented();
</del><ins>+    if (m_dockBottomButton &amp;&amp; m_dockRightButton) {
+        gtk_widget_set_sensitive(m_dockBottomButton, available);
+        gtk_widget_set_sensitive(m_dockRightButton, available);
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>

</body>
</html>