Merge 58961 - Reviewed by Adele Peterson....

WebCore/html/HTMLFrameElementBase.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Simon Hausmann (hausmann@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 224 matching lines @@
 }
 
 bool HTMLFrameElementBase::supportsFocus() const
 {
     return true;
 }
 
 void HTMLFrameElementBase::setFocus(bool received)
 {
     HTMLFrameOwnerElement::setFocus(received);
-    if (Page* page = document()->page())
-        page->focusController()->setFocusedFrame(received ? contentFrame() : 0);
+    if (Page* page = document()->page()) {
+        if (received)
+            page->focusController()->setFocusedFrame(contentFrame());
+        else if (page->focusController()->focusedFrame() == contentFrame()) // Focus may have already been given to another frame, don't take it away.
+            page->focusController()->setFocusedFrame(0);
+    }
 }
 
 bool HTMLFrameElementBase::isURLAttribute(Attribute *attr) const
 {
     return attr->name() == srcAttr;
 }
 
 int HTMLFrameElementBase::width() const
 {
     if (!renderer())
@@ skipping 35 matching lines @@
 
 void HTMLFrameElementBase::willRemove()
 {
     if (m_remainsAliveOnRemovalFromTree)
         return;
 
     HTMLFrameOwnerElement::willRemove();
 }
 
 } // namespace WebCore