1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
--- WebCore/plugins/gtk/gtk2xtbin.c.orig 2010-09-10 06:20:33.000000000 -0700
+++ WebCore/plugins/gtk/gtk2xtbin.c 2010-10-06 09:45:37.000000000 -0700
@@ -41,7 +41,7 @@
* The GtkXtBin widget allows for Xt toolkit code to be used
* inside a GTK application.
*/
-
+#if 0
#include "GtkVersioning.h"
#include "xembed.h"
#include "gtk2xtbin.h"
@@ -951,3 +951,4 @@
return;
}
+#endif
--- WebCore/plugins/gtk/PluginViewGtk.cpp.orig 2010-09-10 06:20:33.000000000 -0700
+++ WebCore/plugins/gtk/PluginViewGtk.cpp 2010-10-06 09:45:37.000000000 -0700
@@ -60,10 +60,13 @@
#include "runtime_root.h"
#include <runtime/JSLock.h>
#include <runtime/JSValue.h>
+#include "NotImplemented.h"
#include <gdkconfig.h>
#include <gtk/gtk.h>
+#undef XP_UNIX
+
#if defined(XP_UNIX)
#include "gtk2xtbin.h"
#define Bool int // this got undefined somewhere
@@ -441,9 +444,9 @@
event->setDefaultHandled();
}
-#if defined(XP_UNIX)
void PluginView::handleFocusInEvent()
{
+#if defined(XP_UNIX)
XEvent npEvent;
initXEvent(&npEvent);
@@ -453,10 +456,12 @@
event.detail = NotifyDetailNone;
dispatchNPEvent(npEvent);
+#endif
}
void PluginView::handleFocusOutEvent()
{
+#if defined(XP_UNIX)
XEvent npEvent;
initXEvent(&npEvent);
@@ -466,8 +471,8 @@
event.detail = NotifyDetailNone;
dispatchNPEvent(npEvent);
-}
#endif
+}
void PluginView::setParent(ScrollView* parent)
{
@@ -797,8 +802,8 @@
}
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
|
GitWeb