<!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>[174569] releases/WebKitGTK/webkit-2.6/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/174569">174569</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-10 01:36:16 -0700 (Fri, 10 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174042">r174042</a> - [GTK] Remove unused GtkPluginWidget
https://bugs.webkit.org/show_bug.cgi?id=137176
Reviewed by Csaba Osztrogonác.
It was only used by WebKit1.
* PlatformGTK.cmake:
* platform/gtk/GtkPluginWidget.cpp: Removed.
* platform/gtk/GtkPluginWidget.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorePlatformGTKcmake">releases/WebKitGTK/webkit-2.6/Source/WebCore/PlatformGTK.cmake</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformgtkGtkPluginWidgetcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkPluginWidget.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformgtkGtkPluginWidgeth">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkPluginWidget.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174568 => 174569)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-10 08:34:31 UTC (rev 174568)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-10 08:36:16 UTC (rev 174569)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-09-28 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Remove unused GtkPluginWidget
+ https://bugs.webkit.org/show_bug.cgi?id=137176
+
+ Reviewed by Csaba Osztrogonác.
+
+ It was only used by WebKit1.
+
+ * PlatformGTK.cmake:
+ * platform/gtk/GtkPluginWidget.cpp: Removed.
+ * platform/gtk/GtkPluginWidget.h: Removed.
+
+2014-09-28 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [cairo] GraphicsContext should not depend on GTK+
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137175
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/PlatformGTK.cmake (174568 => 174569)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/PlatformGTK.cmake 2014-10-10 08:34:31 UTC (rev 174568)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/PlatformGTK.cmake 2014-10-10 08:36:16 UTC (rev 174569)
</span><span class="lines">@@ -221,7 +221,6 @@
</span><span class="cx"> platform/gtk/GtkClickCounter.cpp
</span><span class="cx"> platform/gtk/GtkDragAndDropHelper.cpp
</span><span class="cx"> platform/gtk/GtkInputMethodFilter.cpp
</span><del>- platform/gtk/GtkPluginWidget.cpp
</del><span class="cx"> platform/gtk/GtkPopupMenu.cpp
</span><span class="cx"> platform/gtk/GtkTouchContextHelper.cpp
</span><span class="cx"> platform/gtk/GtkUtilities.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformgtkGtkPluginWidgetcpp"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkPluginWidget.cpp (174568 => 174569)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkPluginWidget.cpp 2014-10-10 08:34:31 UTC (rev 174568)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkPluginWidget.cpp 2014-10-10 08:36:16 UTC (rev 174569)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Holger Hans Peter Freyther
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GtkPluginWidget.h"
-
-#include "GraphicsContext.h"
-#include "GtkVersioning.h"
-#include "ScrollView.h"
-
-#include <gtk/gtk.h>
-
-namespace WebCore {
-
-GtkPluginWidget::GtkPluginWidget(GtkWidget* widget)
- : Widget(widget)
-{
- gtk_widget_hide(widget);
-}
-
-GtkPluginWidget::~GtkPluginWidget()
-{
- gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(platformWidget())), platformWidget());
-}
-
-void GtkPluginWidget::invalidateRect(const IntRect& coreRect)
-{
- /* no need to */
- if (!gtk_widget_get_has_window(platformWidget()))
- return;
-
- GdkWindow* window = gtk_widget_get_window(platformWidget());
- if (!window)
- return;
-
- GdkRectangle rect = coreRect;
- gdk_window_invalidate_rect(window, &rect, FALSE);
-}
-
-void GtkPluginWidget::frameRectsChanged()
-{
- IntRect rect = frameRect();
- IntPoint loc = parent()->contentsToWindow(rect.location());
- GtkAllocation allocation = { loc.x(), loc.y(), rect.width(), rect.height() };
-
- gtk_widget_set_size_request(platformWidget(), rect.width(), rect.height());
- gtk_widget_size_allocate(platformWidget(), &allocation);
- gtk_widget_show(platformWidget());
-}
-
-}
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformgtkGtkPluginWidgeth"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkPluginWidget.h (174568 => 174569)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkPluginWidget.h 2014-10-10 08:34:31 UTC (rev 174568)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkPluginWidget.h 2014-10-10 08:36:16 UTC (rev 174569)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Holger Hans Peter Freyther
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GtkPluginWidget_h
-#define GtkPluginWidget_h
-
-#include "Widget.h"
-
-namespace WebCore {
- class GtkPluginWidget : public Widget {
- public:
- GtkPluginWidget(GtkWidget*);
- virtual ~GtkPluginWidget();
- void invalidateRect(const IntRect&);
- void frameRectsChanged();
- };
-}
-
-#endif
</del></span></pre>
</div>
</div>
</body>
</html>