<!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>[172918] trunk/Source/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/172918">172918</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-08-25 05:24:20 -0700 (Mon, 25 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Remove PopupMenuGtk, SearchPopupMenuGtk
https://bugs.webkit.org/show_bug.cgi?id=136211
Reviewed by Carlos Garcia Campos.
Remove the two classes from the codebase. They're not used anymore
after the WebKit1 layer of the GTK port was removed some time ago.
* PlatformGTK.cmake:
* platform/gtk/PopupMenuGtk.cpp: Removed.
* platform/gtk/PopupMenuGtk.h: Removed.
* platform/gtk/SearchPopupMenuGtk.cpp: Removed.
* platform/gtk/SearchPopupMenuGtk.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgtkPopupMenuGtkcpp">trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPopupMenuGtkh">trunk/Source/WebCore/platform/gtk/PopupMenuGtk.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkSearchPopupMenuGtkcpp">trunk/Source/WebCore/platform/gtk/SearchPopupMenuGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkSearchPopupMenuGtkh">trunk/Source/WebCore/platform/gtk/SearchPopupMenuGtk.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172917 => 172918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-25 12:22:58 UTC (rev 172917)
+++ trunk/Source/WebCore/ChangeLog 2014-08-25 12:24:20 UTC (rev 172918)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-25 Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] Remove PopupMenuGtk, SearchPopupMenuGtk
+ https://bugs.webkit.org/show_bug.cgi?id=136211
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove the two classes from the codebase. They're not used anymore
+ after the WebKit1 layer of the GTK port was removed some time ago.
+
+ * PlatformGTK.cmake:
+ * platform/gtk/PopupMenuGtk.cpp: Removed.
+ * platform/gtk/PopupMenuGtk.h: Removed.
+ * platform/gtk/SearchPopupMenuGtk.cpp: Removed.
+ * platform/gtk/SearchPopupMenuGtk.h: Removed.
+
</ins><span class="cx"> 2014-08-25 Shivakumar JM <shiva.jm@samsung.com>
</span><span class="cx">
</span><span class="cx"> Web Core: Fix unused parameter build warning.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (172917 => 172918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-08-25 12:22:58 UTC (rev 172917)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-08-25 12:24:20 UTC (rev 172918)
</span><span class="lines">@@ -237,7 +237,6 @@
</span><span class="cx"> platform/gtk/PlatformMouseEventGtk.cpp
</span><span class="cx"> platform/gtk/PlatformScreenGtk.cpp
</span><span class="cx"> platform/gtk/PlatformWheelEventGtk.cpp
</span><del>- platform/gtk/PopupMenuGtk.cpp
</del><span class="cx"> platform/gtk/RedirectedXCompositeWindow.cpp
</span><span class="cx"> platform/gtk/RenderThemeGtk.cpp
</span><span class="cx"> platform/gtk/RenderThemeGtk2.cpp
</span><span class="lines">@@ -245,7 +244,6 @@
</span><span class="cx"> platform/gtk/ScrollbarThemeGtk.cpp
</span><span class="cx"> platform/gtk/ScrollbarThemeGtk2.cpp
</span><span class="cx"> platform/gtk/ScrollbarThemeGtk3.cpp
</span><del>- platform/gtk/SearchPopupMenuGtk.cpp
</del><span class="cx"> platform/gtk/SharedBufferGtk.cpp
</span><span class="cx"> platform/gtk/SharedTimerGtk.cpp
</span><span class="cx"> platform/gtk/SoundGtk.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPopupMenuGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp (172917 => 172918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp 2014-08-25 12:22:58 UTC (rev 172917)
+++ trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp 2014-08-25 12:24:20 UTC (rev 172918)
</span><span class="lines">@@ -1,126 +0,0 @@
</span><del>-/*
- * This file is part of the popup menu implementation for <select> elements in WebCore.
- *
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
- * Copyright (C) 2008 Collabora Ltd.
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2010 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "PopupMenuGtk.h"
-
-#include "FrameView.h"
-#include "GUniquePtrGtk.h"
-#include "GtkUtilities.h"
-#include "HostWindow.h"
-#include <gtk/gtk.h>
-#include <wtf/text/CString.h>
-
-namespace WebCore {
-
-PopupMenuGtk::PopupMenuGtk(PopupMenuClient* client)
- : m_popupClient(client)
-{
-}
-
-PopupMenuGtk::~PopupMenuGtk()
-{
- if (m_popup) {
- g_signal_handlers_disconnect_matched(m_popup->platformMenu(), G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, this);
- hide();
- }
-}
-
-GtkAction* PopupMenuGtk::createGtkActionForMenuItem(int itemIndex)
-{
- GUniquePtr<char> actionName(g_strdup_printf("popup-menu-action-%d", itemIndex));
- GtkAction* action = gtk_action_new(actionName.get(), client()->itemText(itemIndex).utf8().data(), client()->itemToolTip(itemIndex).utf8().data(), 0);
- g_object_set_data(G_OBJECT(action), "popup-menu-action-index", GINT_TO_POINTER(itemIndex));
- g_signal_connect(action, "activate", G_CALLBACK(menuItemActivated), this);
- // FIXME: Apply the PopupMenuStyle from client()->itemStyle(i)
- gtk_action_set_visible(action, !client()->itemStyle(itemIndex).isDisplayNone());
- gtk_action_set_sensitive(action, client()->itemIsEnabled(itemIndex));
-
- return action;
-}
-
-void PopupMenuGtk::show(const IntRect& rect, FrameView* view, int index)
-{
- ASSERT(client());
-
- if (!m_popup) {
- m_popup = GtkPopupMenu::create();
- g_signal_connect(m_popup->platformMenu(), "unmap", G_CALLBACK(PopupMenuGtk::menuUnmapped), this);
- } else
- m_popup->clear();
-
- const int size = client()->listSize();
- for (int i = 0; i < size; ++i) {
- if (client()->itemIsSeparator(i))
- m_popup->appendSeparator();
- else {
- GRefPtr<GtkAction> action = adoptGRef(createGtkActionForMenuItem(i));
- m_popup->appendItem(action.get());
- }
- }
-
- IntPoint menuPosition = convertWidgetPointToScreenPoint(GTK_WIDGET(view->hostWindow()->platformPageClient()), view->contentsToWindow(rect.location()));
- menuPosition.move(0, rect.height());
-
- GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
- m_popup->popUp(rect.size(), menuPosition, size, index, currentEvent.get());
-
- // GTK can refuse to actually open the menu when mouse grabs fails.
- // Ensure WebCore does not go into some pesky state.
- if (!gtk_widget_get_visible(m_popup->platformMenu()))
- client()->popupDidHide();
-}
-
-void PopupMenuGtk::hide()
-{
- ASSERT(m_popup);
- m_popup->popDown();
-}
-
-void PopupMenuGtk::updateFromElement()
-{
- client()->setTextFromItem(client()->selectedIndex());
-}
-
-void PopupMenuGtk::disconnectClient()
-{
- m_popupClient = 0;
-}
-
-void PopupMenuGtk::menuItemActivated(GtkAction* action, PopupMenuGtk* that)
-{
- ASSERT(that->client());
- that->client()->valueChanged(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "popup-menu-action-index")));
-}
-
-void PopupMenuGtk::menuUnmapped(GtkWidget*, PopupMenuGtk* that)
-{
- ASSERT(that->client());
- that->client()->popupDidHide();
-}
-
-}
-
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPopupMenuGtkh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/PopupMenuGtk.h (172917 => 172918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PopupMenuGtk.h 2014-08-25 12:22:58 UTC (rev 172917)
+++ trunk/Source/WebCore/platform/gtk/PopupMenuGtk.h 2014-08-25 12:24:20 UTC (rev 172918)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef PopupMenuGtk_h
-#define PopupMenuGtk_h
-
-#include "GtkPopupMenu.h"
-#include "IntRect.h"
-#include "PopupMenu.h"
-#include "PopupMenuClient.h"
-
-namespace WebCore {
-
-class FrameView;
-class Scrollbar;
-
-class PopupMenuGtk : public PopupMenu {
-public:
- PopupMenuGtk(PopupMenuClient*);
- ~PopupMenuGtk();
-
- virtual void show(const IntRect&, FrameView*, int index);
- virtual void hide();
- virtual void updateFromElement();
- virtual void disconnectClient();
-
-private:
- PopupMenuClient* client() const { return m_popupClient; }
- GtkAction* createGtkActionForMenuItem(int itemIndex);
-
- static void menuUnmapped(GtkWidget*, PopupMenuGtk*);
- static void menuItemActivated(GtkAction*, PopupMenuGtk*);
-
- PopupMenuClient* m_popupClient;
- OwnPtr<GtkPopupMenu> m_popup;
-};
-
-}
-
-#endif // PopupMenuGtk_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkSearchPopupMenuGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/SearchPopupMenuGtk.cpp (172917 => 172918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/SearchPopupMenuGtk.cpp 2014-08-25 12:22:58 UTC (rev 172917)
+++ trunk/Source/WebCore/platform/gtk/SearchPopupMenuGtk.cpp 2014-08-25 12:24:20 UTC (rev 172918)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "SearchPopupMenuGtk.h"
-
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-SearchPopupMenuGtk::SearchPopupMenuGtk(PopupMenuClient* client)
- : m_popup(adoptRef(new PopupMenuGtk(client)))
-{
- notImplemented();
-}
-
-PopupMenu* SearchPopupMenuGtk::popupMenu()
-{
- return m_popup.get();
-}
-
-void SearchPopupMenuGtk::saveRecentSearches(const AtomicString&, const Vector<String>&)
-{
- notImplemented();
-}
-
-void SearchPopupMenuGtk::loadRecentSearches(const AtomicString&, Vector<String>&)
-{
- notImplemented();
-}
-
-bool SearchPopupMenuGtk::enabled()
-{
- notImplemented();
- return false;
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkSearchPopupMenuGtkh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/SearchPopupMenuGtk.h (172917 => 172918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/SearchPopupMenuGtk.h 2014-08-25 12:22:58 UTC (rev 172917)
+++ trunk/Source/WebCore/platform/gtk/SearchPopupMenuGtk.h 2014-08-25 12:24:20 UTC (rev 172918)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SearchPopupMenuGtk_h
-#define SearchPopupMenuGtk_h
-
-#include "PopupMenuGtk.h"
-#include "SearchPopupMenu.h"
-
-namespace WebCore {
-
-class SearchPopupMenuGtk : public SearchPopupMenu {
-public:
- SearchPopupMenuGtk(PopupMenuClient*);
-
- virtual PopupMenu* popupMenu();
- virtual void saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems);
- virtual void loadRecentSearches(const AtomicString& name, Vector<String>& searchItems);
- virtual bool enabled();
-
-private:
- RefPtr<PopupMenuGtk> m_popup;
-};
-
-}
-
-#endif // SearchPopupMenuGtk_h
</del></span></pre>
</div>
</div>
</body>
</html>