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

Side by Side Diff: ui/base/touch/touch_editing_controller.cc

Issue 700563002: Implementing directional text selection handles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@new_assets_text
Patch Set: Addressing review feedback. Created 6 years, 1 month 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 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/touch/touch_editing_controller.h" 5 #include "ui/base/touch/touch_editing_controller.h"
6 6
7 namespace ui { 7 namespace ui {
8 8
9 namespace { 9 namespace {
10 TouchSelectionControllerFactory* g_shared_instance = NULL; 10 TouchSelectionControllerFactory* g_shared_instance = NULL;
11 } // namespace 11 } // namespace
12 12
13 SelectionBound::SelectionBound()
14 : type(ui::SelectionBound::EMPTY) {
15 }
16
17 SelectionBound::~SelectionBound() {
18 }
19
20 int SelectionBound::GetHeight() const {
21 return edge_bottom.y() - edge_top.y();
22 }
23
24 bool operator==(const SelectionBound& lhs, const SelectionBound& rhs) {
25 return lhs.type == rhs.type && lhs.edge_top == rhs.edge_top &&
26 lhs.edge_bottom == rhs.edge_bottom;
27 }
28
29 bool operator!=(const SelectionBound& lhs, const SelectionBound& rhs) {
30 return !(lhs == rhs);
31 }
32
33 gfx::Rect RectBetweenSelectionBounds(const SelectionBound& b1,
34 const SelectionBound& b2) {
35 gfx::Rect rect_1 = gfx::BoundingRect(b1.edge_top, b2.edge_bottom);
36 gfx::Rect rect_2 = gfx::BoundingRect(b1.edge_bottom, b2.edge_top);
37 return gfx::UnionRects(rect_1, rect_2);
mohsen 2014/11/10 22:25:59 This might not work properly if width of one of re
mfomitchev 2014/11/10 23:07:29 One of {rect_1, rect_2} will be equal to the union
mohsen 2014/11/11 01:24:39 At least, if both have width of zero (which for ex
mfomitchev 2014/11/12 18:32:49 Yes, good point. Ok, I'll just go with the straigh
38 }
39
13 TouchSelectionController* TouchSelectionController::create( 40 TouchSelectionController* TouchSelectionController::create(
14 TouchEditable* client_view) { 41 TouchEditable* client_view) {
15 if (g_shared_instance) 42 if (g_shared_instance)
16 return g_shared_instance->create(client_view); 43 return g_shared_instance->create(client_view);
17 return NULL; 44 return NULL;
18 } 45 }
19 46
20 // static 47 // static
21 void TouchSelectionControllerFactory::SetInstance( 48 void TouchSelectionControllerFactory::SetInstance(
22 TouchSelectionControllerFactory* instance) { 49 TouchSelectionControllerFactory* instance) {
23 g_shared_instance = instance; 50 g_shared_instance = instance;
24 } 51 }
25 52
26 } // namespace ui 53 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698