pulled mac-specific patches to the tip in order to allow typing in the url bar in navigator to work w/out firing cmd-keybindings. (r=saari, no explicit bug number).

layout/html/forms/src/nsGfxTextControlFrame.cpp

@@ -1968,7 +1968,9 @@ nsEnderKeyListener::KeyDown(nsIDOMEvent* aKeyEvent)
     uiEvent->GetShiftKey(&(event.isShift));
     uiEvent->GetCtrlKey(&(event.isControl));
     uiEvent->GetAltKey(&(event.isAlt));
-
+#ifdef XP_MAC
+    uiEvent->GetMetaKey(&(event.isCommand)); 
+#endif
 
     nsIEventStateManager *manager=nsnull;
     result = mContext->GetEventStateManager(&manager);
@@ -2022,6 +2024,9 @@ nsEnderKeyListener::KeyUp(nsIDOMEvent* aKeyEvent)
     uiEvent->GetShiftKey(&(event.isShift));
     uiEvent->GetCtrlKey(&(event.isControl));
     uiEvent->GetAltKey(&(event.isAlt));
+#ifdef XP_MAC
+    uiEvent->GetMetaKey(&(event.isCommand)); 
+#endif
 
 
     nsIEventStateManager *manager=nsnull;
@@ -2076,6 +2081,9 @@ nsEnderKeyListener::KeyPress(nsIDOMEvent* aKeyEvent)
     uiEvent->GetShiftKey(&(event.isShift));
     uiEvent->GetCtrlKey(&(event.isControl));
     uiEvent->GetAltKey(&(event.isAlt));
+#ifdef XP_MAC
+    uiEvent->GetMetaKey(&(event.isCommand)); 
+#endif
 
 
     nsIEventStateManager *manager=nsnull;
@@ -2208,6 +2216,9 @@ nsEnderMouseListener::MouseDown(nsIDOMEvent* aEvent)
     uiEvent->GetShiftKey(&(event.isShift));
     uiEvent->GetCtrlKey(&(event.isControl));
     uiEvent->GetAltKey(&(event.isAlt));
+#ifdef XP_MAC
+    uiEvent->GetMetaKey(&(event.isCommand)); 
+#endif
     PRUint16 clickCount;
     uiEvent->GetClickcount(&clickCount);
     NS_ASSERTION(clickCount>0 && clickCount<3, "bad click count");