packages: xulrunner/xulrunner-gtkmozembed.patch, xulrunner/xulrunner.spec -...
arekm
arekm at pld-linux.org
Sat Nov 12 08:00:51 CET 2011
Author: arekm Date: Sat Nov 12 07:00:50 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 8.0
---- Files affected:
packages/xulrunner:
xulrunner-gtkmozembed.patch (1.5 -> 1.6) , xulrunner.spec (1.196 -> 1.197)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner-gtkmozembed.patch
diff -u packages/xulrunner/xulrunner-gtkmozembed.patch:1.5 packages/xulrunner/xulrunner-gtkmozembed.patch:1.6
--- packages/xulrunner/xulrunner-gtkmozembed.patch:1.5 Wed Sep 28 14:59:31 2011
+++ packages/xulrunner/xulrunner-gtkmozembed.patch Sat Nov 12 08:00:45 2011
@@ -1,6 +1,6 @@
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed 2011-09-02 14:32:09.591292225 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in 2011-09-02 14:32:09.591292225 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/Makefile.in
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed 2011-10-11 15:32:56.211500043 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/Makefile.in 2011-10-11 15:32:56.211500043 +0200
@@ -0,0 +1,54 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
@@ -56,9 +56,9 @@
+endif
+
+include $(topsrcdir)/config/rules.mk
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed 2011-09-02 14:32:09.591292225 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp 2011-09-02 14:32:09.591292225 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed 2011-10-11 15:32:56.212500050 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp 2011-10-11 15:32:56.212500050 +0200
@@ -0,0 +1,253 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 tw=80 et cindent: */
@@ -118,7 +118,7 @@
+#include "nsStringAPI.h"
+#endif
+#include "nsIPrompt.h"
-+#include "nsIDOMWindowInternal.h"
++#include "nsIDOMWindow.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIStringBundle.h"
@@ -313,9 +313,9 @@
+ return NS_OK;
+}
+
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed 2011-09-02 14:32:09.591292225 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h 2011-09-02 14:32:09.591292225 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed 2011-10-11 15:32:56.213500057 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h 2011-10-11 15:32:56.213500057 +0200
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
@@ -401,9 +401,9 @@
+ nsCOMPtr<nsIStringBundle> mPIPStringBundle;
+};
+#endif /* __EmbedCertificates_h */
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed 2011-09-02 14:32:09.592292230 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp 2011-09-02 14:32:09.592292230 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed 2011-10-11 15:32:56.214500063 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp 2011-10-11 15:32:56.214500063 +0200
@@ -0,0 +1,156 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -561,9 +561,9 @@
+ return NS_ERROR_NOT_IMPLEMENTED;
+}
+
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed 2011-09-02 14:32:09.593292235 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h 2011-09-02 14:32:09.593292235 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed 2011-10-11 15:32:56.217500082 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h 2011-10-11 15:32:56.217500082 +0200
@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -631,9 +631,9 @@
+};
+
+#endif /* __EmbedContentListener_h */
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed 2011-09-02 14:32:09.594292240 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp 2011-09-02 14:32:09.594292240 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed 2011-10-11 15:32:56.219500096 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp 2011-10-11 15:32:56.219500096 +0200
@@ -0,0 +1,618 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 tw=80 et cindent: */
@@ -1253,9 +1253,9 @@
+ mEmbedCtxType |= GTK_MOZ_EMBED_CTX_DOCUMENT;
+ return NS_OK;
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed 2011-09-02 14:32:09.595292245 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h 2011-09-02 14:32:09.595292245 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed 2011-10-11 15:32:56.222500116 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h 2011-10-11 15:32:56.222500116 +0200
@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 tw=80 et cindent: */
@@ -1358,10 +1358,10 @@
+ nsString mCtxDocTitle;
+}; // class EmbedContextMenuInfo
+#endif // EmbedContextMenuInfo_h__
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed 2011-09-02 14:32:09.596292250 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp 2011-09-02 14:32:09.596292250 +0200
-@@ -0,0 +1,304 @@
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed 2011-10-11 15:32:56.223500122 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp 2011-10-11 19:12:12.742427564 +0200
+@@ -0,0 +1,280 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
@@ -1417,15 +1417,7 @@
+{
+}
+
-+NS_IMPL_ADDREF(EmbedEventListener)
-+NS_IMPL_RELEASE(EmbedEventListener)
-+NS_INTERFACE_MAP_BEGIN(EmbedEventListener)
-+ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMKeyListener)
-+ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMKeyListener)
-+ NS_INTERFACE_MAP_ENTRY(nsIDOMKeyListener)
-+ NS_INTERFACE_MAP_ENTRY(nsIDOMMouseListener)
-+ NS_INTERFACE_MAP_ENTRY(nsIDOMUIListener)
-+NS_INTERFACE_MAP_END
++NS_IMPL_ISUPPORTS1(EmbedEventListener, nsIDOMEventListener)
+
+nsresult
+EmbedEventListener::Init(EmbedPrivate *aOwner)
@@ -1435,24 +1427,14 @@
+}
+
+NS_IMETHODIMP
-+EmbedEventListener::HandleEvent(nsIDOMEvent* aDOMEvent)
-+{
-+ return NS_OK;
-+}
-+
-+NS_IMETHODIMP
+EmbedEventListener::KeyDown(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMKeyEvent> keyEvent;
-+ keyEvent = do_QueryInterface(aDOMEvent);
-+ if (!keyEvent)
-+ return NS_OK;
+ // Return FALSE to this function to mark the event as not
+ // consumed...
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_KEY_DOWN], 0,
-+ (void *)keyEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1463,16 +1445,12 @@
+NS_IMETHODIMP
+EmbedEventListener::KeyUp(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMKeyEvent> keyEvent;
-+ keyEvent = do_QueryInterface(aDOMEvent);
-+ if (!keyEvent)
-+ return NS_OK;
+ // return FALSE to this function to mark this event as not
+ // consumed...
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_KEY_UP], 0,
-+ (void *)keyEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1483,15 +1461,11 @@
+NS_IMETHODIMP
+EmbedEventListener::KeyPress(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMKeyEvent> keyEvent;
-+ keyEvent = do_QueryInterface(aDOMEvent);
-+ if (!keyEvent)
-+ return NS_OK;
+ // Return TRUE from your signal handler to mark the event as consumed.
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_KEY_PRESS], 0,
-+ (void *)keyEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1502,15 +1476,11 @@
+NS_IMETHODIMP
+EmbedEventListener::MouseDown(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMMouseEvent> mouseEvent;
-+ mouseEvent = do_QueryInterface(aDOMEvent);
-+ if (!mouseEvent)
-+ return NS_OK;
+ // Return TRUE from your signal handler to mark the event as consumed.
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_MOUSE_DOWN], 0,
-+ (void *)mouseEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1521,15 +1491,11 @@
+NS_IMETHODIMP
+EmbedEventListener::MouseUp(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMMouseEvent> mouseEvent;
-+ mouseEvent = do_QueryInterface(aDOMEvent);
-+ if (!mouseEvent)
-+ return NS_OK;
+ // Return TRUE from your signal handler to mark the event as consumed.
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_MOUSE_UP], 0,
-+ (void *)mouseEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1540,15 +1506,11 @@
+NS_IMETHODIMP
+EmbedEventListener::MouseClick(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMMouseEvent> mouseEvent;
-+ mouseEvent = do_QueryInterface(aDOMEvent);
-+ if (!mouseEvent)
-+ return NS_OK;
+ // Return TRUE from your signal handler to mark the event as consumed.
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_MOUSE_CLICK], 0,
-+ (void *)mouseEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1559,15 +1521,11 @@
+NS_IMETHODIMP
+EmbedEventListener::MouseDblClick(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMMouseEvent> mouseEvent;
-+ mouseEvent = do_QueryInterface(aDOMEvent);
-+ if (!mouseEvent)
-+ return NS_OK;
+ // Return TRUE from your signal handler to mark the event as consumed.
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_MOUSE_DBL_CLICK], 0,
-+ (void *)mouseEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1578,15 +1536,11 @@
+NS_IMETHODIMP
+EmbedEventListener::MouseOver(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMMouseEvent> mouseEvent;
-+ mouseEvent = do_QueryInterface(aDOMEvent);
-+ if (!mouseEvent)
-+ return NS_OK;
+ // Return TRUE from your signal handler to mark the event as consumed.
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_MOUSE_OVER], 0,
-+ (void *)mouseEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1597,15 +1551,11 @@
+NS_IMETHODIMP
+EmbedEventListener::MouseOut(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMMouseEvent> mouseEvent;
-+ mouseEvent = do_QueryInterface(aDOMEvent);
-+ if (!mouseEvent)
-+ return NS_OK;
+ // Return TRUE from your signal handler to mark the event as consumed.
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_MOUSE_OUT], 0,
-+ (void *)mouseEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1616,14 +1566,11 @@
+NS_IMETHODIMP
+EmbedEventListener::Activate(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMUIEvent> uiEvent = do_QueryInterface(aDOMEvent);
-+ if (!uiEvent)
-+ return NS_OK;
+ // Return TRUE from your signal handler to mark the event as consumed.
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_ACTIVATE], 0,
-+ (void *)uiEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1634,14 +1581,11 @@
+NS_IMETHODIMP
+EmbedEventListener::FocusIn(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMUIEvent> uiEvent = do_QueryInterface(aDOMEvent);
-+ if (!uiEvent)
-+ return NS_OK;
+ // Return TRUE from your signal handler to mark the event as consumed.
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_FOCUS_IN], 0,
-+ (void *)uiEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
@@ -1652,24 +1596,56 @@
+NS_IMETHODIMP
+EmbedEventListener::FocusOut(nsIDOMEvent* aDOMEvent)
+{
-+ nsCOMPtr <nsIDOMUIEvent> uiEvent = do_QueryInterface(aDOMEvent);
-+ if (!uiEvent)
-+ return NS_OK;
+ // Return TRUE from your signal handler to mark the event as consumed.
+ gint return_val = FALSE;
+ g_signal_emit(G_OBJECT(mOwner->mOwningWidget),
+ moz_embed_signals[DOM_FOCUS_OUT], 0,
-+ (void *)uiEvent, &return_val);
++ (void *)aDOMEvent, &return_val);
+ if (return_val) {
+ aDOMEvent->StopPropagation();
+ aDOMEvent->PreventDefault();
+ }
+ return NS_OK;
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed 2011-09-02 14:32:09.596292250 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h 2011-09-02 14:32:09.596292250 +0200
-@@ -0,0 +1,90 @@
++
++NS_IMETHODIMP
++EmbedEventListener::HandleEvent(nsIDOMEvent* aDOMEvent)
++{
++ nsAutoString eventType;
++ aDOMEvent->GetType(eventType);
++
++ if (eventType.EqualsLiteral("keydown"))
++ return KeyDown(aDOMEvent);
++ else if (eventType.EqualsLiteral("keyup"))
++ return KeyUp(aDOMEvent);
++ else if (eventType.EqualsLiteral("keypress"))
++ return KeyPress(aDOMEvent);
++ else if (eventType.EqualsLiteral("mousedown"))
++ return MouseDown(aDOMEvent);
++ else if (eventType.EqualsLiteral("mouseup"))
++ return MouseUp(aDOMEvent);
++ else if (eventType.EqualsLiteral("click"))
++ return MouseClick(aDOMEvent);
++ else if (eventType.EqualsLiteral("dblclick"))
++ return MouseDblClick(aDOMEvent);
++ else if (eventType.EqualsLiteral("mouseover"))
++ return MouseOver(aDOMEvent);
++ else if (eventType.EqualsLiteral("mouseout"))
++ return MouseOut(aDOMEvent);
++ else if (eventType.EqualsLiteral("DOMActivate"))
++ return Activate(aDOMEvent);
++ else if (eventType.EqualsLiteral("DOMFocusIn"))
++ return FocusIn(aDOMEvent);
++ else if (eventType.EqualsLiteral("DOMFocusOut"))
++ return FocusOut(aDOMEvent);
++
++ NS_ERROR("Unexpected event type");
++ return NS_OK;
++}
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed 2011-10-11 15:32:56.225500136 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h 2011-10-11 16:13:11.417521103 +0200
+@@ -0,0 +1,89 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
@@ -1710,15 +1686,14 @@
+#ifndef __EmbedEventListener_h
+#define __EmbedEventListener_h
+
-+#include "nsIDOMKeyListener.h"
-+#include "nsIDOMMouseListener.h"
-+#include "nsIDOMUIListener.h"
++//#include "nsIDOMKeyListener.h"
++//#include "nsIDOMMouseListener.h"
++//#include "nsIDOMUIListener.h"
++#include "nsIDOMEventListener.h"
+
+class EmbedPrivate;
+
-+class EmbedEventListener : public nsIDOMKeyListener,
-+ public nsIDOMMouseListener,
-+ public nsIDOMUIListener
++class EmbedEventListener : public nsIDOMEventListener
+{
+ public:
+
@@ -1760,9 +1735,9 @@
+};
+
+#endif /* __EmbedEventListener_h */
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed 2011-09-02 14:32:09.597292255 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp 2011-09-02 14:32:09.597292255 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed 2011-10-11 15:32:56.226500143 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp 2011-10-11 15:32:56.226500143 +0200
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=4 sts=2 tw=80 et cindent: */
@@ -1852,9 +1827,9 @@
+ NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
+ return docShell->GetContentViewer(aViewer);
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed 2011-09-02 14:32:09.597292255 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h 2011-09-02 14:32:09.597292255 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed 2011-10-11 15:32:56.227500150 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h 2011-10-11 15:32:56.227500150 +0200
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
@@ -1923,10 +1898,10 @@
+GetContentViewer(nsIWebBrowser *webBrowser, nsIContentViewer **aViewer);
+
+#endif /* __EmbedTools_h */
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed 2011-09-02 14:32:09.598292260 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp 2011-09-02 14:32:09.598292260 +0200
-@@ -0,0 +1,983 @@
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed 2011-10-11 15:32:56.230500171 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp 2011-10-11 19:01:06.189128684 +0200
+@@ -0,0 +1,1016 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
@@ -1991,7 +1966,7 @@
+// and when chrome windows finish loading
+#include "nsIDOMWindow.h"
+#include "nsPIDOMWindow.h"
-+#include "nsIDOMWindowInternal.h"
++
+
+// For seting scrollbar visibilty
+#include "nsIDOMBarProp.h"
@@ -2169,7 +2144,7 @@
+ // that this will be destroyed before we go out of scope.
+ mEventListener = new EmbedEventListener();
+ mEventListenerGuard =
-+ static_cast<nsISupports *>(static_cast<nsIDOMKeyListener *>(mEventListener));
++ static_cast<nsISupports *>(static_cast<nsIDOMEventListener *>(mEventListener));
+ mEventListener->Init(this);
+
+ // has the window creator service been set up?
@@ -2758,30 +2733,48 @@
+ return;
+
+ nsIDOMEventListener *eventListener =
-+ static_cast<nsIDOMEventListener *>(static_cast<nsIDOMKeyListener *>(mEventListener));
++ static_cast<nsIDOMEventListener *>(static_cast<nsIDOMEventListener *>(mEventListener));
+
+ // add the key listener
+ nsresult rv;
-+ rv = mEventTarget->AddEventListenerByIID(eventListener,
-+ NS_GET_IID(nsIDOMKeyListener));
-+ if (NS_FAILED(rv)) {
-+ NS_WARNING("Failed to add key listener\n");
-+ return;
-+ }
-+
-+ rv = mEventTarget->AddEventListenerByIID(eventListener,
-+ NS_GET_IID(nsIDOMMouseListener));
-+ if (NS_FAILED(rv)) {
-+ NS_WARNING("Failed to add mouse listener\n");
-+ return;
-+ }
-+
-+ rv = mEventTarget->AddEventListenerByIID(eventListener,
-+ NS_GET_IID(nsIDOMUIListener));
-+ if (NS_FAILED(rv)) {
-+ NS_WARNING("Failed to add UI listener\n");
-+ return;
-+ }
++
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("keydown"),
++ eventListener, PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("keyup"),
++ eventListener, PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("keypress"),
++ eventListener, PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("mousedown"), eventListener,
++ PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("mouseup"), eventListener,
++ PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("click"), eventListener,
++ PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("dblclick"), eventListener,
++ PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("mouseover"), eventListener,
++ PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("mouseout"), eventListener,
++ PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("DOMActivate"), eventListener,
++ PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("DOMFocusIn"), eventListener,
++ PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
++ rv = mEventTarget->AddEventListener(NS_LITERAL_STRING("DOMFocusOut"), eventListener,
++ PR_FALSE, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv,);
+
+ // ok, all set.
+ mListenersAttached = PR_TRUE;
@@ -2794,30 +2787,45 @@
+ return;
+
+ nsIDOMEventListener *eventListener =
-+ static_cast<nsIDOMEventListener *>(static_cast<nsIDOMKeyListener *>(mEventListener));
++ static_cast<nsIDOMEventListener *>(static_cast<nsIDOMEventListener *>(mEventListener));
+
+ nsresult rv;
-+ rv = mEventTarget->RemoveEventListenerByIID(eventListener,
-+ NS_GET_IID(nsIDOMKeyListener));
-+ if (NS_FAILED(rv)) {
-+ NS_WARNING("Failed to remove key listener\n");
-+ return;
-+ }
-+
-+ rv =
-+ mEventTarget->RemoveEventListenerByIID(eventListener,
-+ NS_GET_IID(nsIDOMMouseListener));
-+ if (NS_FAILED(rv)) {
-+ NS_WARNING("Failed to remove mouse listener\n");
-+ return;
-+ }
-+
-+ rv = mEventTarget->RemoveEventListenerByIID(eventListener,
-+ NS_GET_IID(nsIDOMUIListener));
-+ if (NS_FAILED(rv)) {
-+ NS_WARNING("Failed to remove UI listener\n");
-+ return;
-+ }
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("keydown"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("keyup"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("keypress"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("mousedown"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("mouseup"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("click"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("dblclick"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("mouseover"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-gtkmozembed.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.196&r2=1.197&f=u
More information about the pld-cvs-commit
mailing list