Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
michael@0 | 2 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 5 | |
michael@0 | 6 | #include "mozilla/mozalloc.h" |
michael@0 | 7 | #include "nsDebug.h" |
michael@0 | 8 | #include "nsEditorCommands.h" |
michael@0 | 9 | #include "nsEditorController.h" |
michael@0 | 10 | #include "nsError.h" |
michael@0 | 11 | #include "nsIControllerCommandTable.h" |
michael@0 | 12 | |
michael@0 | 13 | class nsIControllerCommand; |
michael@0 | 14 | |
michael@0 | 15 | |
michael@0 | 16 | |
michael@0 | 17 | #define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName) \ |
michael@0 | 18 | { \ |
michael@0 | 19 | _cmdClass* theCmd = new _cmdClass(); \ |
michael@0 | 20 | NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY); \ |
michael@0 | 21 | inCommandTable->RegisterCommand(_cmdName, \ |
michael@0 | 22 | static_cast<nsIControllerCommand *>(theCmd)); \ |
michael@0 | 23 | } |
michael@0 | 24 | |
michael@0 | 25 | #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName) \ |
michael@0 | 26 | { \ |
michael@0 | 27 | _cmdClass* theCmd = new _cmdClass(); \ |
michael@0 | 28 | NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY); \ |
michael@0 | 29 | inCommandTable->RegisterCommand(_cmdName, \ |
michael@0 | 30 | static_cast<nsIControllerCommand *>(theCmd)); |
michael@0 | 31 | |
michael@0 | 32 | #define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName) \ |
michael@0 | 33 | inCommandTable->RegisterCommand(_cmdName, \ |
michael@0 | 34 | static_cast<nsIControllerCommand *>(theCmd)); |
michael@0 | 35 | |
michael@0 | 36 | #define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName) \ |
michael@0 | 37 | inCommandTable->RegisterCommand(_cmdName, \ |
michael@0 | 38 | static_cast<nsIControllerCommand *>(theCmd)); \ |
michael@0 | 39 | } |
michael@0 | 40 | |
michael@0 | 41 | |
michael@0 | 42 | // static |
michael@0 | 43 | nsresult nsEditorController::RegisterEditingCommands(nsIControllerCommandTable *inCommandTable) |
michael@0 | 44 | { |
michael@0 | 45 | // now register all our commands |
michael@0 | 46 | // These are commands that will be used in text widgets, and in composer |
michael@0 | 47 | |
michael@0 | 48 | NS_REGISTER_ONE_COMMAND(nsUndoCommand, "cmd_undo"); |
michael@0 | 49 | NS_REGISTER_ONE_COMMAND(nsRedoCommand, "cmd_redo"); |
michael@0 | 50 | NS_REGISTER_ONE_COMMAND(nsClearUndoCommand, "cmd_clearUndo"); |
michael@0 | 51 | |
michael@0 | 52 | NS_REGISTER_ONE_COMMAND(nsCutCommand, "cmd_cut"); |
michael@0 | 53 | NS_REGISTER_ONE_COMMAND(nsCutOrDeleteCommand, "cmd_cutOrDelete"); |
michael@0 | 54 | NS_REGISTER_ONE_COMMAND(nsCopyCommand, "cmd_copy"); |
michael@0 | 55 | NS_REGISTER_ONE_COMMAND(nsCopyOrDeleteCommand, "cmd_copyOrDelete"); |
michael@0 | 56 | NS_REGISTER_ONE_COMMAND(nsSelectAllCommand, "cmd_selectAll"); |
michael@0 | 57 | |
michael@0 | 58 | NS_REGISTER_ONE_COMMAND(nsPasteCommand, "cmd_paste"); |
michael@0 | 59 | NS_REGISTER_ONE_COMMAND(nsPasteTransferableCommand, "cmd_pasteTransferable"); |
michael@0 | 60 | |
michael@0 | 61 | NS_REGISTER_ONE_COMMAND(nsSwitchTextDirectionCommand, "cmd_switchTextDirection"); |
michael@0 | 62 | |
michael@0 | 63 | NS_REGISTER_FIRST_COMMAND(nsDeleteCommand, "cmd_delete"); |
michael@0 | 64 | NS_REGISTER_NEXT_COMMAND(nsDeleteCommand, "cmd_deleteCharBackward"); |
michael@0 | 65 | NS_REGISTER_NEXT_COMMAND(nsDeleteCommand, "cmd_deleteCharForward"); |
michael@0 | 66 | NS_REGISTER_NEXT_COMMAND(nsDeleteCommand, "cmd_deleteWordBackward"); |
michael@0 | 67 | NS_REGISTER_NEXT_COMMAND(nsDeleteCommand, "cmd_deleteWordForward"); |
michael@0 | 68 | NS_REGISTER_NEXT_COMMAND(nsDeleteCommand, "cmd_deleteToBeginningOfLine"); |
michael@0 | 69 | NS_REGISTER_LAST_COMMAND(nsDeleteCommand, "cmd_deleteToEndOfLine"); |
michael@0 | 70 | |
michael@0 | 71 | // Insert content |
michael@0 | 72 | NS_REGISTER_ONE_COMMAND(nsInsertPlaintextCommand, "cmd_insertText"); |
michael@0 | 73 | NS_REGISTER_ONE_COMMAND(nsPasteQuotationCommand, "cmd_pasteQuote"); |
michael@0 | 74 | |
michael@0 | 75 | return NS_OK; |
michael@0 | 76 | } |
michael@0 | 77 | |
michael@0 | 78 | |
michael@0 | 79 | // static |
michael@0 | 80 | nsresult nsEditorController::RegisterEditorCommands(nsIControllerCommandTable *inCommandTable) |
michael@0 | 81 | { |
michael@0 | 82 | // These are commands that will be used in text widgets only. |
michael@0 | 83 | |
michael@0 | 84 | NS_REGISTER_FIRST_COMMAND(nsSelectionMoveCommands, "cmd_scrollTop"); |
michael@0 | 85 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_scrollBottom"); |
michael@0 | 86 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_moveTop"); |
michael@0 | 87 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_moveBottom"); |
michael@0 | 88 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectTop"); |
michael@0 | 89 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectBottom"); |
michael@0 | 90 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_lineNext"); |
michael@0 | 91 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_linePrevious"); |
michael@0 | 92 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectLineNext"); |
michael@0 | 93 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectLinePrevious"); |
michael@0 | 94 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_charPrevious"); |
michael@0 | 95 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_charNext"); |
michael@0 | 96 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectCharPrevious"); |
michael@0 | 97 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectCharNext"); |
michael@0 | 98 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_beginLine"); |
michael@0 | 99 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_endLine"); |
michael@0 | 100 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectBeginLine"); |
michael@0 | 101 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectEndLine"); |
michael@0 | 102 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_wordPrevious"); |
michael@0 | 103 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_wordNext"); |
michael@0 | 104 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectWordPrevious"); |
michael@0 | 105 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectWordNext"); |
michael@0 | 106 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_scrollPageUp"); |
michael@0 | 107 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_scrollPageDown"); |
michael@0 | 108 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_scrollLineUp"); |
michael@0 | 109 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_scrollLineDown"); |
michael@0 | 110 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_movePageUp"); |
michael@0 | 111 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_movePageDown"); |
michael@0 | 112 | NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectPageUp"); |
michael@0 | 113 | NS_REGISTER_LAST_COMMAND(nsSelectionMoveCommands, "cmd_selectPageDown"); |
michael@0 | 114 | |
michael@0 | 115 | return NS_OK; |
michael@0 | 116 | } |
michael@0 | 117 |