commit 5ccf2e7f6b0f1924059a9fc69dc1dc41583ed13e Author: Mike Perry mikeperry-git@fscked.org Date: Wed Aug 29 13:20:11 2012 -0700

Forgot to git add some files in the patches --- ...Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch | 138 ++++++++++++++++++-- ...9-Add-a-redirect-API-for-HTTPS-Everywhere.patch | 2 +- ...solate-the-Image-Cache-per-url-bar-domain.patch | 2 +- 3 files changed, 126 insertions(+), 16 deletions(-)

diff --git a/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch b/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch index e09a3bf..4bdffcc 100644 --- a/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch +++ b/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch @@ -1,4 +1,4 @@ -From c60d40f3ead79d91128f28682dc94fc626c45110 Mon Sep 17 00:00:00 2001 +From 40ffe7af2a41166a91f95fe145d3cb97527e4165 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Tue, 28 Aug 2012 18:22:32 -0700 Subject: [PATCH 18/20] Adapt Steven Michaud's Mac crashfix patch @@ -8,19 +8,23 @@ Source is: https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 Some minor tweaks were needed to get it to apply and to compile on MacOS. --- - widget/Makefile.in | 1 + - widget/cocoa/nsChildView.mm | 28 ++++++++++++++++++---------- - widget/gtk2/nsDragService.cpp | 9 +++++---- - widget/nsIDragService.idl | 4 +--- - widget/qt/nsDragService.h | 2 ++ - widget/windows/Makefile.in | 4 ++++ - widget/windows/nsDragService.cpp | 13 ++++++++----- - widget/windows/nsDragService.h | 12 ++++++------ - widget/windows/nsNativeDragSource.cpp | 7 ++++--- - widget/windows/nsNativeDragTarget.cpp | 28 +++++++++++++++++----------- - widget/xpwidgets/nsBaseDragService.cpp | 16 +++++++++++++++- - widget/xpwidgets/nsBaseDragService.h | 9 ++++----- - 12 files changed, 85 insertions(+), 48 deletions(-) + widget/Makefile.in | 1 + + widget/cocoa/nsChildView.mm | 28 +++++++++++------ + widget/gtk2/nsDragService.cpp | 9 +++-- + widget/nsIDragService.idl | 4 +-- + widget/nsPIDragService.idl | 48 +++++++++++++++++++++++++++++ + widget/qt/nsDragService.h | 2 + + widget/windows/Makefile.in | 4 ++ + widget/windows/nsDragService.cpp | 13 +++++--- + widget/windows/nsDragService.h | 12 +++--- + widget/windows/nsNativeDragSource.cpp | 7 ++-- + widget/windows/nsNativeDragTarget.cpp | 28 ++++++++++------ + widget/windows/nsPIDragServiceWindows.idl | 46 +++++++++++++++++++++++++++ + widget/xpwidgets/nsBaseDragService.cpp | 16 +++++++++- + widget/xpwidgets/nsBaseDragService.h | 9 ++--- + 14 files changed, 179 insertions(+), 48 deletions(-) + create mode 100644 widget/nsPIDragService.idl + create mode 100644 widget/windows/nsPIDragServiceWindows.idl

diff --git a/widget/Makefile.in b/widget/Makefile.in index f1df966..eb6eec2 100644 @@ -148,6 +152,60 @@ index 196761e..c0565bb 100644 };

+diff --git a/widget/nsPIDragService.idl b/widget/nsPIDragService.idl +new file mode 100644 +index 0000000..93a144d +--- /dev/null ++++ b/widget/nsPIDragService.idl +@@ -0,0 +1,48 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * The Mozilla Foundation. ++ * Portions created by the Initial Developer are Copyright (C) 2012 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Steven Michaud smichaud@pobox.com ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsISupports.idl" ++ ++[scriptable, uuid(FAD8C90B-8E1D-446A-9B6C-241486A85CBD)] ++interface nsPIDragService : nsISupports ++{ ++ void dragMoved(in long aX, in long aY); ++ ++ PRUint16 getInputSource(); ++ ++ void setDragEndPoint(in long aX, in long aY); ++}; diff --git a/widget/qt/nsDragService.h b/widget/qt/nsDragService.h index 393be99..56d0312 100644 --- a/widget/qt/nsDragService.h @@ -359,6 +417,58 @@ index da1cd1f..96303c3 100644 serv->EndDragSession(true);

// release the ref that was taken in DragEnter +diff --git a/widget/windows/nsPIDragServiceWindows.idl b/widget/windows/nsPIDragServiceWindows.idl +new file mode 100644 +index 0000000..c8a46dd +--- /dev/null ++++ b/widget/windows/nsPIDragServiceWindows.idl +@@ -0,0 +1,46 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * The Mozilla Foundation. ++ * Portions created by the Initial Developer are Copyright (C) 2012 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Steven Michaud smichaud@pobox.com ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsISupports.idl" ++ ++[scriptable, uuid(6FC2117D-5EB4-441A-9C12-62A783BEBC0C)] ++interface nsPIDragServiceWindows : nsISupports ++{ ++ void setIDataObject(in nsISupports aDataObj); ++ ++ void setDroppedLocal(); ++}; diff --git a/widget/xpwidgets/nsBaseDragService.cpp b/widget/xpwidgets/nsBaseDragService.cpp index 1b2ef0d..627ebd2 100644 --- a/widget/xpwidgets/nsBaseDragService.cpp diff --git a/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch b/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch index 693d372..de0b3ad 100644 --- a/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch +++ b/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch @@ -1,4 +1,4 @@ -From c63f5efde7280d3167a3ba6bdd1140235817b518 Mon Sep 17 00:00:00 2001 +From 704d06cc2310082c12abd7b8ccfbb71dae1c0a9f Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Tue, 28 Aug 2012 18:30:22 -0700 Subject: [PATCH 19/20] Add a redirect API for HTTPS-Everywhere. diff --git a/src/current-patches/firefox/alpha/0020-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/alpha/0020-Isolate-the-Image-Cache-per-url-bar-domain.patch index e82086b..4399ee7 100644 --- a/src/current-patches/firefox/alpha/0020-Isolate-the-Image-Cache-per-url-bar-domain.patch +++ b/src/current-patches/firefox/alpha/0020-Isolate-the-Image-Cache-per-url-bar-domain.patch @@ -1,4 +1,4 @@ -From ec223865a42088ab02009d8f91387d56c1a5c0cf Mon Sep 17 00:00:00 2001 +From 56be32e279b20c1dbb9af6524c3e06a8b3771e94 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Tue, 28 Aug 2012 18:35:33 -0700 Subject: [PATCH 20/20] Isolate the Image Cache per url bar domain.