Focus problem when clearing selection

webkit/api/src/WebViewImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 890 matching lines @@
 {
 }
 
 void WebViewImpl::setFocus(bool enable)
 {
     m_page->focusController()->setFocused(enable);
     if (enable) {
         // Note that we don't call setActive() when disabled as this cause extra
         // focus/blur events to be dispatched.
         m_page->focusController()->setActive(true);
+        RefPtr<Frame> focusedFrame = m_page->focusController()->focusedFrame();
+        if (focusedFrame) {
+            Node* focusedNode = focusedFrame->document()->focusedNode();
+            if (focusedNode && focusedNode->isElementNode()
+                && focusedFrame->selection()->selection().isNone()) {
+                // If the selection was cleared while the WebView was not
+                // focused, then the focus element shows with a focus ring but
+                // no caret and does respond to keyboard inputs.
+                Element* element = static_cast<Element*>(focusedNode);
+                if (element->isTextFormControl()) {
+                    element->updateFocusAppearance(true);
+                } else {
+                    // updateFocusAppearance() selects all the text of
+                    // contentseditable DIVs. So we set the selection explicitly
+                    // instead. Note that this has the side effect of moving the
+                    // caret back to the begining of the text.
+                    Position position(focusedNode, 0,
+                                      Position::PositionIsOffsetInAnchor);
+                    focusedFrame->selection()->setSelection(
+                        VisibleSelection(position, SEL_DEFAULT_AFFINITY));
+                }
+            }
+        }
         m_imeAcceptEvents = true;
     } else {
         hideAutoCompletePopup();
 
         // Clear focus on the currently focused frame if any.
         if (!m_page.get())
             return;
 
         Frame* frame = m_page->mainFrame();
         if (!frame)
@@ skipping 830 matching lines @@
 {
     m_tabsToLinks = enable;
 }
 
 bool WebViewImpl::tabsToLinks() const
 {
     return m_tabsToLinks;
 }
 
 } // namespace WebKit