From 139f64c6307428ff5ccc8a6e3fd5fa607f2f95ef Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 May 2010 14:29:48 +0200 Subject: import Firefox, 3.6.3plugin1 --- xulrunner-remi.patch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 xulrunner-remi.patch (limited to 'xulrunner-remi.patch') diff --git a/xulrunner-remi.patch b/xulrunner-remi.patch new file mode 100644 index 0000000..038058e --- /dev/null +++ b/xulrunner-remi.patch @@ -0,0 +1,30 @@ +--- mozilla-1.9.2/layout/generic/nsFrame.h.orig 2009-11-06 19:29:14.000000000 +0100 ++++ mozilla-1.9.2/layout/generic/nsFrame.h 2009-11-06 19:30:54.000000000 +0100 +@@ -153,23 +153,14 @@ + friend nsIFrame* NS_NewEmptyFrame(nsIPresShell* aShell, + nsStyleContext* aContext); + ++ ++ // Set this public as in 1.9.1 ! ++ void operator delete(void* aPtr, size_t sz); ++ + private: + // Left undefined; nsFrame objects are never allocated from the heap. + void* operator new(size_t sz) CPP_THROW_NEW; + +-protected: +- // Overridden to prevent the global delete from being called, since +- // the memory came out of an arena instead of the heap. +- // +- // Ideally this would be private and undefined, like the normal +- // operator new. Unfortunately, the C++ standard requires an +- // overridden operator delete to be accessible to any subclass that +- // defines a virtual destructor, so we can only make it protected; +- // worse, some C++ compilers will synthesize calls to this function +- // from the "deleting destructors" that they emit in case of +- // delete-expressions, so it can't even be undefined. +- void operator delete(void* aPtr, size_t sz); +- + public: + + // nsQueryFrame -- cgit