[xulrunner/f15: 1/2] update to 8.0
Martin Stransky
stransky at fedoraproject.org
Tue Nov 8 08:52:49 UTC 2011
commit 4ef9150f989c44aca8989d92d74c25c47ed4dcb6
Author: Martin Stransky <stransky at redhat.com>
Date: Tue Nov 8 09:51:57 2011 +0100
update to 8.0
.gitignore | 1 +
add-gtkmozembed.patch => add-gtkmozembed-8.0.patch | 502 ++++++++++----------
mozilla-686280.patch | 25 +
mozilla-build-sbrk.patch | 24 -
sources | 2 +-
xulrunner-5.0-curl.patch | 44 --
xulrunner-7.0.1-yarr-jit.patch | 44 --
xulrunner.spec | 24 +-
8 files changed, 291 insertions(+), 375 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 283fcb2..b5d0931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ xulrunner-1.9.3.0b3.source.tar.bz2
/xulrunner-6.0.2.source.tar.bz2
/xulrunner-7.0.source.tar.bz2
/xulrunner-7.0.1.source.tar.bz2
+/xulrunner-8.0.source.tar.bz2
diff --git a/add-gtkmozembed.patch b/add-gtkmozembed-8.0.patch
similarity index 93%
rename from add-gtkmozembed.patch
rename to add-gtkmozembed-8.0.patch
index 388cc4f..090f132 100644
--- a/add-gtkmozembed.patch
+++ b/add-gtkmozembed-8.0.patch
@@ -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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembe
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.
+#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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.
+ 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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.
+ 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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListen
+ 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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListen
+};
+
+#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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuIn
+ 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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuIn
+ 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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+{
+}
+
-+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+}
+
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+#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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+};
+
+#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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.
+ 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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gt
+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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.g
+// 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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.g
+ // 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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.g
+ 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 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.g
+ 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, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("mouseout"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("DOMActivate"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("DOMFocusIn"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
++ rv = mEventTarget->RemoveEventListener(NS_LITERAL_STRING("DOMFocusOut"),
++ eventListener, PR_FALSE);
++ NS_ENSURE_SUCCESS(rv, );
+
+ mListenersAttached = PR_FALSE;
+}
@@ -2910,9 +2918,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.g
+ gtk_widget_destroy(sOffscreenWindow);
+ sOffscreenWindow = 0;
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed 2011-09-02 14:32:09.598292260 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h 2011-09-02 15:25:27.671352254 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed 2011-10-11 15:32:56.233500190 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h 2011-10-11 15:32:56.233500190 +0200
@@ -0,0 +1,188 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -3102,9 +3110,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtk
+};
+
+#endif /* __EmbedPrivate_h */
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed 2011-09-02 14:32:09.599292265 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp 2011-09-02 14:32:09.599292265 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed 2011-10-11 15:32:56.234500196 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp 2011-10-11 15:32:56.235500203 +0200
@@ -0,0 +1,215 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -3321,9 +3329,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.
+
+ uri->GetSpec(aString);
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed 2011-09-02 14:32:09.599292265 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h 2011-09-02 14:32:09.599292265 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed 2011-10-11 15:32:56.235500203 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h 2011-10-11 15:32:56.235500203 +0200
@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -3391,9 +3399,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gt
+};
+
+#endif /* __EmbedProgress_h */
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed 2011-09-02 14:32:09.599292265 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp 2011-09-02 14:32:09.599292265 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed 2011-10-11 15:32:56.237500217 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp 2011-10-11 15:32:56.237500217 +0200
@@ -0,0 +1,411 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -3806,9 +3814,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.
+ }
+ }
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed 2011-09-02 14:32:09.600292270 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h 2011-09-02 14:32:09.600292270 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed 2011-10-11 15:32:56.238500224 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h 2011-10-11 15:32:56.238500224 +0200
@@ -0,0 +1,113 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -3923,9 +3931,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gt
+ GtkWidget *mComboBox;
+ GtkWidget *mCheckBox;
+};
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed 2011-09-02 14:32:09.600292270 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp 2011-09-02 14:32:09.600292270 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed 2011-10-11 15:32:56.243500258 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp 2011-10-11 15:32:56.243500258 +0200
@@ -0,0 +1,474 @@
+/*
+ * vim:ts=2:et:sw=2
@@ -4401,9 +4409,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gt
+
+ return rv;
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed 2011-09-02 14:32:09.601292274 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp 2011-09-02 14:32:09.601292274 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed 2011-10-11 15:32:56.245500270 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp 2011-10-11 15:32:56.245500270 +0200
@@ -0,0 +1,106 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4511,9 +4519,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator
+
+ return NS_ERROR_FAILURE;
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed 2011-09-02 14:32:09.601292274 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h 2011-09-02 14:32:09.601292274 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed 2011-10-11 15:32:56.246500277 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h 2011-10-11 15:32:56.246500277 +0200
@@ -0,0 +1,54 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4569,9 +4577,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator
+};
+
+#endif /* __EmbedWindowCreator_h */
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed 2011-09-02 14:32:09.602292278 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h 2011-09-02 14:32:09.602292278 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed 2011-10-11 15:32:56.248500291 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h 2011-10-11 15:32:56.248500291 +0200
@@ -0,0 +1,101 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4674,9 +4682,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkm
+
+
+#endif /* __EmbedWindow_h */
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed 2011-09-02 14:32:09.603292283 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp 2011-09-02 14:32:09.603292283 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed 2011-10-11 15:32:56.250500305 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp 2011-10-11 15:32:56.250500305 +0200
@@ -0,0 +1,1132 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -5810,9 +5818,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.g
+ aNewEmbed, aChromeFlags);
+
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed 2011-09-02 14:32:09.604292288 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp 2011-09-02 14:32:09.604292288 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed 2011-10-11 15:32:56.253500325 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp 2011-10-11 15:32:56.253500325 +0200
@@ -0,0 +1,116 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -5930,9 +5938,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.c
+ return XPCOMGlueLoadXULFunctions(GtkSymbolsInternal);
+}
+
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed 2011-09-02 14:32:09.604292288 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h 2011-09-02 14:32:09.604292288 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed 2011-10-11 15:32:56.255500339 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h 2011-10-11 15:32:56.255500339 +0200
@@ -0,0 +1,287 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6221,9 +6229,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkm
+#endif /* __cplusplus */
+
+#endif /* gtkmozembed_h */
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed 2011-09-02 14:32:09.605292293 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h 2011-09-02 14:32:09.605292293 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed 2011-10-11 15:32:56.256500346 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h 2011-10-11 15:32:56.256500346 +0200
@@ -0,0 +1,70 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6295,9 +6303,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_intern
+
+#endif /* gtkmozembed_internal_h */
+
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed 2011-09-02 14:32:09.605292293 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list 2011-09-02 14:32:09.605292293 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed 2011-10-11 15:32:56.259500366 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list 2011-10-11 15:32:56.259500366 +0200
@@ -0,0 +1,34 @@
+BOOL:STRING
+BOOL:STRING,STRING
@@ -6333,9 +6341,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal
+BOOL:POINTER
+VOID:POINTER
+BOOL:STRING,STRING,POINTER
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed 2011-09-02 14:32:09.606292298 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h 2011-09-02 14:32:09.606292298 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed 2011-10-11 15:32:56.262500386 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h 2011-10-11 15:32:56.262500386 +0200
@@ -0,0 +1,91 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6428,9 +6436,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate
+#endif /* __cplusplus */
+
+#endif /* gtkmozembedprivate_h */
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed 2011-09-02 14:32:09.606292298 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp 2011-09-02 14:32:09.606292298 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed 2011-10-11 15:32:56.264500398 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp 2011-10-11 15:32:56.264500398 +0200
@@ -0,0 +1,349 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -6781,9 +6789,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.c
+ NS_WARNING("Unexpected button flags");
+ }
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed 2011-09-02 14:32:09.607292303 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h 2011-09-02 14:32:09.607292303 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed 2011-10-11 15:32:56.265500405 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h 2011-10-11 15:32:56.265500405 +0200
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -6844,9 +6852,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h
+ void GetButtonLabel(PRUint32 aFlags, PRUint32 aPos,
+ const PRUnichar* aStringValue, nsAString &aLabel);
+};
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed 2011-09-02 14:32:09.607292303 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in 2011-09-02 14:32:09.607292303 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed 2011-10-11 15:32:56.268500426 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in 2011-10-11 15:32:56.268500426 +0200
@@ -0,0 +1,112 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
@@ -6960,9 +6968,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmoz
+
+GARBAGE += $(MARSHAL_FILE).h $(MARSHAL_FILE).c
+
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed 2011-09-02 14:32:09.607292303 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in 2011-09-02 14:32:09.607292303 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed 2011-10-11 15:32:56.269500433 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in 2011-10-11 15:32:56.269500433 +0200
@@ -0,0 +1,101 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
@@ -7065,9 +7073,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkm
+DEFINES += -D_TIME_H=1
+endif
+endif
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed 2011-09-02 14:32:09.608292308 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp 2011-09-02 14:32:09.608292308 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed 2011-10-11 15:32:56.270500440 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp 2011-10-11 15:32:56.270500440 +0200
@@ -0,0 +1,185 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -7254,9 +7262,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChil
+ gtk_moz_embed_load_url(GTK_MOZ_EMBED(embed), text);
+ g_free(text);
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed 2011-09-02 14:32:09.608292308 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp 2011-09-02 14:32:09.608292308 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed 2011-10-11 15:32:56.275500472 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp 2011-10-11 15:32:56.275500472 +0200
@@ -0,0 +1,1145 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -8403,9 +8411,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp
+ gtk_widget_set_sensitive(browser->forwardButton, FALSE);
+ }
+
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed 2011-09-02 14:32:09.609292313 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp 2011-09-02 14:32:09.609292313 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed 2011-10-11 15:32:56.276500479 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp 2011-10-11 15:32:56.276500479 +0200
@@ -0,0 +1,142 @@
+/** simplemdi.c **/
+/*
@@ -8549,9 +8557,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.
+ gtk_main_quit();
+ return(0);
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed 2011-09-02 14:32:09.609292313 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp 2011-09-02 14:32:09.609292313 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed 2011-10-11 15:32:56.277500486 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp 2011-10-11 15:32:56.277500486 +0200
@@ -0,0 +1,86 @@
+#include <gtk/gtk.h>
+#include <gtkmozembed.h>
@@ -8639,9 +8647,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNote
+
+ return 0;
+}
-diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp
---- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed 2011-09-02 14:32:09.609292313 +0200
-+++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp 2011-09-02 14:32:09.609292313 +0200
+diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp
+--- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed 2011-10-11 15:32:56.279500500 +0200
++++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp 2011-10-11 15:32:56.279500500 +0200
@@ -0,0 +1,109 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -8752,9 +8760,9 @@ diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSock
+ fprintf(stderr, "Can't fork.\n");
+ }
+}
-diff -up xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in
---- xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed 2011-08-31 21:16:33.000000000 +0200
-+++ xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in 2011-09-02 14:32:09.610292318 +0200
+diff -up xulrunner-8.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulrunner-8.0/mozilla-beta/toolkit/library/Makefile.in
+--- xulrunner-8.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed 2011-10-07 02:59:21.000000000 +0200
++++ xulrunner-8.0/mozilla-beta/toolkit/library/Makefile.in 2011-10-11 15:32:56.281500514 +0200
@@ -75,6 +75,8 @@ CPPSRCS += dlldeps-xul.cpp
endif
@@ -8764,10 +8772,10 @@ diff -up xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulr
DEFINES += -DMOZ_ENABLE_GTK2
endif
-diff -up xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh
---- xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed 2011-08-31 21:16:37.000000000 +0200
-+++ xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh 2011-09-02 14:32:09.610292318 +0200
-@@ -560,6 +560,9 @@ MAKEFILES_embedding="
+diff -up xulrunner-8.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-8.0/mozilla-beta/toolkit/toolkit-makefiles.sh
+--- xulrunner-8.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed 2011-10-07 02:59:24.000000000 +0200
++++ xulrunner-8.0/mozilla-beta/toolkit/toolkit-makefiles.sh 2011-10-11 15:32:56.283500528 +0200
+@@ -561,6 +561,9 @@ MAKEFILES_embedding="
embedding/browser/Makefile
embedding/browser/build/Makefile
embedding/browser/webBrowser/Makefile
@@ -8777,10 +8785,10 @@ diff -up xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xul
embedding/components/Makefile
embedding/components/appstartup/Makefile
embedding/components/appstartup/src/Makefile
-diff -up xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk
---- xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed 2011-08-31 21:16:37.000000000 +0200
-+++ xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk 2011-09-02 14:32:09.611292323 +0200
-@@ -226,6 +226,12 @@ endif
+diff -up xulrunner-8.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrunner-8.0/mozilla-beta/toolkit/toolkit-tiers.mk
+--- xulrunner-8.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed 2011-10-07 02:59:24.000000000 +0200
++++ xulrunner-8.0/mozilla-beta/toolkit/toolkit-tiers.mk 2011-10-11 15:32:56.284500534 +0200
+@@ -223,6 +223,12 @@ endif
tier_platform_dirs += services/crypto/component
@@ -8793,7 +8801,7 @@ diff -up xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrunn
tier_platform_dirs += startupcache
ifdef APP_LIBXUL_STATICDIRS
-@@ -272,4 +278,3 @@ tier_platform_dirs += testing/xpcshell
+@@ -269,4 +275,3 @@ tier_platform_dirs += testing/xpcshell
tier_platform_dirs += testing/mozmill
tier_platform_dirs += testing/tools/screenshot
endif
diff --git a/mozilla-686280.patch b/mozilla-686280.patch
new file mode 100644
index 0000000..95732bf
--- /dev/null
+++ b/mozilla-686280.patch
@@ -0,0 +1,25 @@
+# HG changeset patch
+# Parent f2a2adaaacba0f0b1d470430c4fb8f6fb6125fbf
+# User Luke Wagner <luke at mozilla.com>
+Add in a const-stripper in order to resolve ambiguities
+
+diff --git a/js/src/jsutil.h b/js/src/jsutil.h
+--- a/js/src/jsutil.h
++++ b/js/src/jsutil.h
+@@ -819,13 +819,16 @@ class MoveRef {
+ operator T &() const { return *pointer; }
+ private:
+ T *pointer;
+ };
+
+ template<typename T>
+ MoveRef<T> Move(T &t) { return MoveRef<T>(t); }
+
++template<typename T>
++MoveRef<T> Move(const T &t) { return MoveRef<T>(const_cast<T &>(t)); }
++
+ } /* namespace js */
+
+ #endif /* defined(__cplusplus) */
+
+ #endif /* jsutil_h___ */
diff --git a/sources b/sources
index 703077e..9c8b87e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b212db48630ba93bb30ec63cca17f4d xulrunner-7.0.1.source.tar.bz2
+9395a5be13da119bd8d53c3225e5d17c xulrunner-8.0.source.tar.bz2
diff --git a/xulrunner.spec b/xulrunner.spec
index f2aa840..34444fb 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -49,8 +49,8 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
-Version: 7.0.1
-Release: 5%{?pre_tag}%{?dist}
+Version: 8.0
+Release: 1%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -64,13 +64,9 @@ Source21: %{name}.sh.in
# build patches
Patch0: xulrunner-version.patch
Patch1: mozilla-build.patch
-Patch9: mozilla-build-sbrk.patch
Patch14: xulrunner-2.0-chromium-types.patch
%if 0%{?fedora} <= 15
-Patch16: add-gtkmozembed.patch
-%endif
-%if 0%{?fedora} > 15
-Patch17: xulrunner-5.0-curl.patch
+Patch16: add-gtkmozembed-8.0.patch
%endif
Patch18: xulrunner-6.0-secondary-ipc.patch
@@ -84,8 +80,7 @@ Patch24: crashreporter-remove-static.patch
Patch34: xulrunner-2.0-network-link-service.patch
Patch35: xulrunner-2.0-NetworkManager09.patch
Patch36: mozilla-670719.patch
-# backport from 8.0beta
-Patch37: xulrunner-7.0.1-yarr-jit.patch
+Patch37: mozilla-686280.patch
# ---------------------------------------------------
@@ -195,14 +190,10 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
%patch1 -p2 -b .build
-%patch9 -p2 -b .sbrk
%patch14 -p1 -b .chromium-types
%if 0%{?fedora} <= 15
%patch16 -p2 -b .gtkmozembed
%endif
-%if 0%{?fedora} > 15
-%patch17 -p2 -b .curl
-%endif
%patch18 -p2 -b .secondary-ipc
%patch20 -p2 -b .pk
@@ -212,8 +203,8 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
%patch34 -p1 -b .network-link-service
%patch35 -p1 -b .NetworkManager09
-%patch36 -p1 -b .moz670719
-%patch37 -p2 -b .yarr-jit
+%patch36 -p1 -b .670719
+%patch37 -p1 -b .686280
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -452,6 +443,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Mon Nov 7 2011 Martin Stransky <stransky at redhat.com> 8.0-1
+- Updated to 8.0
+
* Tue Oct 18 2011 Ville Skyttä <ville.skytta at iki.fi> - 7.0.1-5
- Avoid %%post/un shell invocations
and dependencies (rhbz#736830).
More information about the scm-commits
mailing list