[mingw-webkitgtk: 13/36] Backported an already upstreamed patch

[Kalev Lember]

commit 12e00c63ff44978ef582548d8afde185b880aaae
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Apr 28 20:46:19 2011 +0200

    Backported an already upstreamed patch
    
    Backported an already upstreamed patch and dropped the relevant parts from our own (non-upstreamed yet) patch

 webkit-1.3.13-mingw-fixes.patch |   96 ---------------------------------------
 1 files changed, 0 insertions(+), 96 deletions(-)
---
diff --git a/webkit-1.3.13-mingw-fixes.patch b/webkit-1.3.13-mingw-fixes.patch
index b1da29d..d2f3064 100644
--- a/webkit-1.3.13-mingw-fixes.patch
+++ b/webkit-1.3.13-mingw-fixes.patch
@@ -47,81 +47,6 @@
      free(m);
  #endif
  }
---- Source/WebCore/plugins/PluginView.h.orig   2010-11-14 01:39:13.104335187 +0100
-+++ Source/WebCore/plugins/PluginView.h        2010-11-14 01:58:44.760665201 +0100
-@@ -384,7 +384,7 @@
-
- private:
-
--#if defined(XP_UNIX) || OS(SYMBIAN)
-+#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK)
-         void setNPWindowIfNeeded();
- #elif defined(XP_MACOSX)
-         NP_CGContext m_npCgContext;
---- Source/WebCore/plugins/gtk/PluginViewGtk.cpp.orig  2010-11-14 01:53:23.131491478 +0100
-+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp       2010-11-14 01:58:15.688495036 +0100
-@@ -47,6 +47,7 @@
- #include "Image.h"
- #include "KeyboardEvent.h"
- #include "MouseEvent.h"
-+#include "NotImplemented.h"
- #include "Page.h"
- #include "PlatformKeyboardEvent.h"
- #include "PlatformMouseEvent.h"
-@@ -74,7 +75,7 @@
- #include <cairo/cairo-xlib.h>
- #include <gdk/gdkx.h>
- #elif defined(GDK_WINDOWING_WIN32)
--#include "PluginMessageThrottlerWin.h"
-+#include "win/PluginMessageThrottlerWin.h"
- #include <gdk/gdkwin32.h>
- #endif
-
-@@ -686,6 +687,7 @@
-         gtk_widget_queue_draw(m_parentFrame->view()->hostWindow()->platformPageClient());
- }
-
-+#ifndef GDK_WINDOWING_WIN32
- static Display* getPluginDisplay()
- {
-     // The plugin toolkit might have a different X connection open.  Since we're
-@@ -699,6 +701,7 @@
-     return 0;
- #endif
- }
-+#endif
-
- #if defined(XP_UNIX)
- static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
-@@ -769,15 +772,17 @@
-         PluginView::setCurrentPluginView(this);
-         JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
-         setCallingPlugin(true);
-+#if defined(XP_UNIX)
-         m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed);
-+#endif
-         setCallingPlugin(false);
-         PluginView::setCurrentPluginView(0);
-     }
-
-     if (m_isWindowed) {
--#if defined(XP_UNIX)
-         GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
-
-+#if defined(XP_UNIX)
-         if (m_needsXEmbed) {
-             // If our parent is not anchored the startup process will
-             // fail miserably for XEmbed plugins a bit later on when
-@@ -798,7 +803,9 @@
- #endif
-     } else {
-         setPlatformWidget(0);
-+#if defined(XP_UNIX)
-         m_pluginDisplay = getPluginDisplay();
-+#endif
-     }
-
-     show();
 --- Source/WebKit/gtk/webkit/webkitwebsettings.cpp.orig	2011-04-21 00:25:52.740516641 +0200
 +++ Source/WebKit/gtk/webkit/webkitwebsettings.cpp	2011-04-21 00:26:00.067653521 +0200
 @@ -40,7 +40,7 @@
@@ -214,17 +139,6 @@
      if (!utf8Size)
          return false;
 
---- Source/WebCore/plugins/PluginView.cpp.orig 2010-11-14 01:31:21.261395772 +0100
-+++ Source/WebCore/plugins/PluginView.cpp      2010-11-14 01:38:16.645071930 +0100
-@@ -340,7 +340,7 @@
- #endif
-
- #if ENABLE(NETSCAPE_PLUGIN_API)
--#ifdef XP_WIN
-+#if defined(XP_WIN) && !PLATFORM(GTK)
-     // Unsubclass the window
-     if (m_isWindowed) {
- #if OS(WINCE)
 --- Source/WebCore/plugins/win/PluginDatabaseWin.cpp.orig	2010-11-14 01:45:58.543238260 +0100
 +++ Source/WebCore/plugins/win/PluginDatabaseWin.cpp	2010-11-14 01:51:18.815019467 +0100
 @@ -102,7 +102,7 @@
@@ -377,13 +291,3 @@
  
      GOwnPtr<char> foldedA;
      GOwnPtr<char> foldedB;
---- Source/WebCore/plugins/gtk/PluginViewGtk.cpp.orig	2011-04-21 00:00:21.327670117 +0200
-+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp	2011-04-21 00:01:13.050661439 +0200
-@@ -79,6 +79,7 @@
- #elif defined(GDK_WINDOWING_WIN32)
- #include "win/PluginMessageThrottlerWin.h"
- #include <gdk/gdkwin32.h>
-+typedef void *HGIOBJ;
- #endif
- 
- using JSC::ExecState;