Diff
Modified: trunk/Source/WebCore/ChangeLog (174041 => 174042)
--- trunk/Source/WebCore/ChangeLog 2014-09-28 08:06:08 UTC (rev 174041)
+++ trunk/Source/WebCore/ChangeLog 2014-09-28 08:14:51 UTC (rev 174042)
@@ -1,5 +1,18 @@
2014-09-28 Carlos Garcia Campos <[email protected]>
+ [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 <[email protected]>
+
[cairo] GraphicsContext should not depend on GTK+
https://bugs.webkit.org/show_bug.cgi?id=137175
Modified: trunk/Source/WebCore/PlatformGTK.cmake (174041 => 174042)
--- trunk/Source/WebCore/PlatformGTK.cmake 2014-09-28 08:06:08 UTC (rev 174041)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-09-28 08:14:51 UTC (rev 174042)
@@ -221,7 +221,6 @@
platform/gtk/GtkClickCounter.cpp
platform/gtk/GtkDragAndDropHelper.cpp
platform/gtk/GtkInputMethodFilter.cpp
- platform/gtk/GtkPluginWidget.cpp
platform/gtk/GtkPopupMenu.cpp
platform/gtk/GtkTouchContextHelper.cpp
platform/gtk/GtkUtilities.cpp
Deleted: trunk/Source/WebCore/platform/gtk/GtkPluginWidget.cpp (174041 => 174042)
--- trunk/Source/WebCore/platform/gtk/GtkPluginWidget.cpp 2014-09-28 08:06:08 UTC (rev 174041)
+++ trunk/Source/WebCore/platform/gtk/GtkPluginWidget.cpp 2014-09-28 08:14:51 UTC (rev 174042)
@@ -1,74 +0,0 @@
-/*
- * 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());
-}
-
-}
Deleted: trunk/Source/WebCore/platform/gtk/GtkPluginWidget.h (174041 => 174042)
--- trunk/Source/WebCore/platform/gtk/GtkPluginWidget.h 2014-09-28 08:06:08 UTC (rev 174041)
+++ trunk/Source/WebCore/platform/gtk/GtkPluginWidget.h 2014-09-28 08:14:51 UTC (rev 174042)
@@ -1,42 +0,0 @@
-/*
- * 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
