Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(361)

Unified Diff: third_party/WebKit/Source/core/editing/Editor.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5 Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/editing/Editor.cpp
diff --git a/third_party/WebKit/Source/core/editing/Editor.cpp b/third_party/WebKit/Source/core/editing/Editor.cpp
index b013bcc45c929ef65388306c96a83addd0a09dcc..8ecf4d4cffa6f576030abd0fd20ff7f290bce506 100644
--- a/third_party/WebKit/Source/core/editing/Editor.cpp
+++ b/third_party/WebKit/Source/core/editing/Editor.cpp
@@ -555,7 +555,7 @@ bool Editor::shouldDeleteRange(const EphemeralRange& range) const
void Editor::notifyComponentsOnChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions options)
{
- client().respondToChangedSelection(m_frame, frame().selection().selectionType());
+ client().respondToChangedSelection(m_frame, frame().selection().getSelectionType());
setStartNewKillRingSequence(true);
}
@@ -598,7 +598,7 @@ Element* Editor::findEventTargetFromSelection() const
void Editor::applyStyle(StylePropertySet* style, EditAction editingAction)
{
- switch (frame().selection().selectionType()) {
+ switch (frame().selection().getSelectionType()) {
case NoSelection:
// do nothing
break;
@@ -1118,7 +1118,7 @@ void Editor::changeSelectionAfterCommand(const VisibleSelection& newSelection,
// does not call EditorClient::respondToChangedSelection(), which, on the Mac, sends selection change notifications and
// starts a new kill ring sequence, but we want to do these things (matches AppKit).
if (selectionDidNotChangeDOMPosition)
- client().respondToChangedSelection(m_frame, frame().selection().selectionType());
+ client().respondToChangedSelection(m_frame, frame().selection().getSelectionType());
}
IntRect Editor::firstRectForRange(const EphemeralRange& range) const

Powered by Google App Engine
This is Rietveld 408576698