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

Side by Side Diff: third_party/WebKit/Source/core/editing/DragCaretController.cpp

Issue 2325933002: Move m_caretVisibility from CaretBase to FrameCaret (Closed)
Patch Set: 2016-09-09T14:05:22 Created 4 years, 3 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) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 15 matching lines...) Expand all
26 #include "core/editing/DragCaretController.h" 26 #include "core/editing/DragCaretController.h"
27 27
28 #include "core/editing/EditingUtilities.h" 28 #include "core/editing/EditingUtilities.h"
29 #include "core/frame/Settings.h" 29 #include "core/frame/Settings.h"
30 #include "core/layout/api/LayoutViewItem.h" 30 #include "core/layout/api/LayoutViewItem.h"
31 #include "core/paint/PaintLayer.h" 31 #include "core/paint/PaintLayer.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 DragCaretController::DragCaretController() 35 DragCaretController::DragCaretController()
36 : m_caretBase(new CaretBase(CaretVisibility::Visible)) 36 : m_caretBase(new CaretBase())
37 { 37 {
38 } 38 }
39 39
40 DragCaretController* DragCaretController::create() 40 DragCaretController* DragCaretController::create()
41 { 41 {
42 return new DragCaretController; 42 return new DragCaretController;
43 } 43 }
44 44
45 bool DragCaretController::hasCaretIn(const LayoutBlock& layoutBlock) const 45 bool DragCaretController::hasCaretIn(const LayoutBlock& layoutBlock) const
46 { 46 {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 visitor->trace(m_caretBase); 116 visitor->trace(m_caretBase);
117 } 117 }
118 118
119 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext& con text, const LayoutPoint& paintOffset) const 119 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext& con text, const LayoutPoint& paintOffset) const
120 { 120 {
121 if (m_position.deepEquivalent().anchorNode()->document().frame() == frame) 121 if (m_position.deepEquivalent().anchorNode()->document().frame() == frame)
122 m_caretBase->paintCaret(m_position.deepEquivalent().anchorNode(), contex t, paintOffset, DisplayItem::kDragCaret); 122 m_caretBase->paintCaret(m_position.deepEquivalent().anchorNode(), contex t, paintOffset, DisplayItem::kDragCaret);
123 } 123 }
124 124
125 } // namespace blink 125 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/editing/CaretBase.cpp ('k') | third_party/WebKit/Source/core/editing/FrameCaret.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698