Rename FrameSelection::m_pendingSelection to m_layoutSelection

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 76 matching lines @@
 namespace blink {
 
 using namespace HTMLNames;
 
 static inline bool shouldAlwaysUseDirectionalSelection(LocalFrame* frame) {
   return frame->editor().behavior().shouldConsiderSelectionAsDirectional();
 }
 
 FrameSelection::FrameSelection(LocalFrame& frame)
     : m_frame(frame),
-      m_pendingSelection(LayoutSelection::create(*this)),
+      m_layoutSelection(LayoutSelection::create(*this)),
       m_selectionEditor(SelectionEditor::create(frame)),
       m_granularity(CharacterGranularity),
       m_xPosForVerticalArrowNavigation(NoXPosForVerticalArrowNavigation()),
       m_focused(frame.page() &&
                 frame.page()->focusController().focusedFrame() == frame),
       m_frameCaret(new FrameCaret(frame, *m_selectionEditor)) {}
 
 FrameSelection::~FrameSelection() {}
 
 const DisplayItemClient& FrameSelection::caretDisplayItemClientForTesting()
@@ skipping 644 matching lines @@
 
   focusedOrActiveStateChanged();
 }
 
 bool FrameSelection::isFocusedAndActive() const {
   return m_focused && m_frame->page() &&
          m_frame->page()->focusController().isActive();
 }
 
 bool FrameSelection::isAppearanceDirty() const {
-  return m_pendingSelection->hasPendingSelection();
+  return m_layoutSelection->hasPendingSelection();
 }
 
 void FrameSelection::commitAppearanceIfNeeded(LayoutView& layoutView) {
-  return m_pendingSelection->commit(layoutView);
+  return m_layoutSelection->commit(layoutView);
 }
 
 void FrameSelection::didLayout() {
   updateAppearance();
 }
 
 void FrameSelection::updateAppearance() {
   DCHECK(!m_frame->contentLayoutItem().isNull());
   m_frameCaret->scheduleVisualUpdateForPaintInvalidationIfNeeded();
-  m_pendingSelection->setHasPendingSelection();
+  m_layoutSelection->setHasPendingSelection();
 }
 
 void FrameSelection::notifyLayoutObjectOfSelectionChange(
     EUserTriggered userTriggered) {
   TextControlElement* textControl =
       enclosingTextControl(selectionInDOMTree().base());
   if (!textControl)
     return;
   textControl->selectionChanged(userTriggered == UserTriggered);
 }
@@ skipping 220 matching lines @@
 #ifndef NDEBUG
 
 void FrameSelection::showTreeForThis() const {
   computeVisibleSelectionInDOMTreeDeprecated().showTreeForThis();
 }
 
 #endif
 
 DEFINE_TRACE(FrameSelection) {
   visitor->trace(m_frame);
-  visitor->trace(m_pendingSelection);
+  visitor->trace(m_layoutSelection);
   visitor->trace(m_selectionEditor);
   visitor->trace(m_frameCaret);
   SynchronousMutationObserver::trace(visitor);
 }
 
 void FrameSelection::scheduleVisualUpdate() const {
   if (Page* page = m_frame->page())
     page->animator().scheduleVisualUpdate(m_frame->localFrameRoot());
 }
 
@@ skipping 116 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif