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

Side by Side Diff: third_party/WebKit/Source/core/editing/SelectionController.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: rebase-and-stuff Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
5 * Copyright (C) 2015 Google Inc. All rights reserved. 5 * Copyright (C) 2015 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 return m_mouseDownMayStartSelect; 603 return m_mouseDownMayStartSelect;
604 } 604 }
605 605
606 bool SelectionController::mouseDownWasSingleClickInSelection() const 606 bool SelectionController::mouseDownWasSingleClickInSelection() const
607 { 607 {
608 return m_mouseDownWasSingleClickInSelection; 608 return m_mouseDownWasSingleClickInSelection;
609 } 609 }
610 610
611 void SelectionController::notifySelectionChanged() 611 void SelectionController::notifySelectionChanged()
612 { 612 {
613 if (selection().selectionType() == SelectionType::RangeSelection) 613 if (selection().getSelectionType() == SelectionType::RangeSelection)
614 m_selectionState = SelectionState::ExtendedSelection; 614 m_selectionState = SelectionState::ExtendedSelection;
615 else if (selection().selectionType() == SelectionType::CaretSelection) 615 else if (selection().getSelectionType() == SelectionType::CaretSelection)
616 m_selectionState = SelectionState::PlacedCaret; 616 m_selectionState = SelectionState::PlacedCaret;
617 else 617 else
618 m_selectionState = SelectionState::HaveNotStartedSelection; 618 m_selectionState = SelectionState::HaveNotStartedSelection;
619 } 619 }
620 620
621 FrameSelection& SelectionController::selection() const 621 FrameSelection& SelectionController::selection() const
622 { 622 {
623 return m_frame->selection(); 623 return m_frame->selection();
624 } 624 }
625 625
626 } // namespace blink 626 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/editing/PendingSelection.cpp ('k') | third_party/WebKit/Source/core/editing/VisibleSelection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698