Rename *Focus*-methods of FrameSelection to clarify its public API

third_party/WebKit/Source/core/editing/FrameSelection.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 732 matching lines @@
     return;
 
   ScheduleVisualUpdate();
 }
 
 void FrameSelection::NotifyEventHandlerForSelectionChange() {
   frame_->GetEventHandler().GetSelectionController().NotifySelectionChanged();
 }
 
 void FrameSelection::FocusedOrActiveStateChanged() {
-  bool active_and_focused = IsFocusedAndActive();
+  bool active_and_focused = FrameIsFocusedAndActive();
 
   // Trigger style invalidation from the focused element. Even though
   // the focused element hasn't changed, the evaluation of focus pseudo
   // selectors are dependent on whether the frame is focused and active.
   if (Element* element = GetDocument().FocusedElement())
     element->FocusStateChanged();
 
   GetDocument().UpdateStyleAndLayoutTree();
 
   // Because LayoutObject::selectionBackgroundColor() and
@@ skipping 18 matching lines @@
   // Secure keyboard entry is set by the active frame.
   if (use_secure_keyboard_entry_when_active_)
     SetUseSecureKeyboardEntry(active_and_focused);
 }
 
 void FrameSelection::PageActivationChanged() {
   FocusedOrActiveStateChanged();
 }
 
 void FrameSelection::UpdateSecureKeyboardEntryIfActive() {
-  if (!IsFocusedAndActive())
+  if (!FrameIsFocusedAndActive())
     return;
   SetUseSecureKeyboardEntry(use_secure_keyboard_entry_when_active_);
 }
 
 void FrameSelection::SetUseSecureKeyboardEntryWhenActive(
     bool uses_secure_keyboard) {
   if (use_secure_keyboard_entry_when_active_ == uses_secure_keyboard)
     return;
   use_secure_keyboard_entry_when_active_ = uses_secure_keyboard;
   UpdateSecureKeyboardEntryIfActive();
 }
 
 void FrameSelection::SetUseSecureKeyboardEntry(bool enable) {
   if (enable)
     EnableSecureTextInput();
   else
     DisableSecureTextInput();
 }
 
-void FrameSelection::SetFocused(bool flag) {
+void FrameSelection::SetFrameIsFocused(bool flag) {
   if (focused_ == flag)
     return;
   focused_ = flag;
 
   FocusedOrActiveStateChanged();
 }
 
-bool FrameSelection::IsFocusedAndActive() const {
+bool FrameSelection::FrameIsFocusedAndActive() const {
   return focused_ && frame_->GetPage() &&
          frame_->GetPage()->GetFocusController().IsActive();
 }
 
 bool FrameSelection::NeedsLayoutSelectionUpdate() const {
   return layout_selection_->HasPendingSelection();
 }
 
 void FrameSelection::CommitAppearanceIfNeeded() {
   return layout_selection_->Commit();
@@ skipping 23 matching lines @@
 static bool IsFrameElement(const Node* n) {
   if (!n)
     return false;
   LayoutObject* layout_object = n->GetLayoutObject();
   if (!layout_object || !layout_object->IsLayoutPart())
     return false;
   return ToLayoutPart(layout_object)->ChildFrameView();
 }
 
 void FrameSelection::SetFocusedNodeIfNeeded() {
-  if (ComputeVisibleSelectionInDOMTreeDeprecated().IsNone() || !IsFocused())
+  if (ComputeVisibleSelectionInDOMTreeDeprecated().IsNone() ||
+      !FrameIsFocused())
     return;
 
   if (Element* target =
           ComputeVisibleSelectionInDOMTreeDeprecated().RootEditableElement()) {
     // Walk up the DOM tree to search for a node to focus.
     GetDocument().UpdateStyleAndLayoutTreeIgnorePendingStylesheets();
     while (target) {
       // We don't want to set focus on a subframe when selecting in a parent
       // frame, so add the !isFrameElement check here. There's probably a better
       // way to make this work in the long term, but this is the safest fix at
@@ skipping 343 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->ShowTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif