Bug 73373. Allow multiple selections of content using the ctrl/option keys. This is for testing --- it will probably expose bugs in other places. r+sr=roc,patch by Martijn Wargers.

layout/generic/nsFrame.cpp

@@ -1459,7 +1459,11 @@ nsFrame::HandlePress(nsPresContext* aPresContext,
   if (NS_FAILED(rv))
     return rv;
 
-  rv = frameselection->HandleClick(content, startOffset , endOffset, me->isShift, PR_FALSE, beginFrameContent);
+#if defined(XP_MAC) || defined(XP_MACOSX)
+    rv = frameselection->HandleClick(content, startOffset , endOffset, me->isShift, me->isMeta, beginFrameContent);
+#else
+    rv = frameselection->HandleClick(content, startOffset , endOffset, me->isShift, me->isControl, beginFrameContent);
+#endif
 
   if (NS_FAILED(rv))
     return rv;

layout/printing/nsPrintEngine.cpp

@@ -1697,6 +1697,7 @@ nsPrintEngine::IsThereARangeSelection(nsIDOMWindow* aDOMWin)
         return !isCollapsed;
       }
     }
+    if (count > 1) return PR_TRUE;
   }
   return PR_FALSE;
 }