wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-08 16:58:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1751 -- Remove XP_MACOSX conditionals from /layout

Browse source
This commit is contained in:
Moonchild 2021-05-03 12:26:37 +00:00 • committed by roytam1
commit 02c59100a8
19 changed files with 11 additions and 371 deletions
Download patch file Download diff file Expand all files Collapse all files

18
layout/generic/nsSelection.cpp
View file

@ -552,10 +552,6 @@ nsFrameSelection::nsFrameSelection()
mSelectedCellIndex = 0;
nsAutoCopyListener *autoCopy = nullptr;
// On macOS, cache the current selection to send to osx service menu.
#ifdef XP_MACOSX
autoCopy = nsAutoCopyListener::GetInstance(nsIClipboard::kSelectionCache);
#endif
// Check to see if the autocopy pref is enabled
// and add the autocopy listener if it is
@ -1978,16 +1974,6 @@ nsFrameSelection::RepaintSelection(SelectionType aSelectionType)
return NS_ERROR_NULL_POINTER;
NS_ENSURE_STATE(mShell);
// On macOS, update the selection cache to the new active selection
// aka the current selection.
#ifdef XP_MACOSX
nsFocusManager* fm = nsFocusManager::GetFocusManager();
// Check an active window exists otherwise there cannot be a current selection
// and that it's a normal selection.
if (fm->GetActiveWindow() && aSelectionType == SelectionType::eNormal) {
UpdateSelectionCacheOnRepaintSelection(mDomSelections[index]);
}
#endif
return mDomSelections[index]->Repaint(mShell->GetPresContext());
}
@ -2711,11 +2697,7 @@ printf("aTarget == %d\n", aTarget);
// Any other mouseup actions require that Ctrl or Cmd key is pressed
// else stop table selection mode
bool doMouseUpAction = false;
#ifdef XP_MACOSX
doMouseUpAction = aMouseEvent->IsMeta();
#else
doMouseUpAction = aMouseEvent->IsControl();
#endif
if (!doMouseUpAction)
{
#ifdef DEBUG_TABLE_SELECTION