Merge 58961 - Reviewed by Adele Peterson....

Merge 58961 -         Reviewed by Adele Peterson.

        https://bugs.webkit.org/show_bug.cgi?id=38546
        Node.focus() fails to move focus from subframe properly

        Test: fast/frames/takefocusfromiframe.html

        * html/HTMLFrameElementBase.cpp: (WebCore::HTMLFrameElementBase::setFocus): Don't clear
        focus if this frame doesn't have it. This can happen if page's and HTMLFrameElement's ideas
        of focused frame get out of sync temporarily.



TBR=ap@apple.com
BUG=15766
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=48065