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

Side by Side Diff: Source/core/layout/HitTestResult.cpp

Issue 1302353002: Get rid of redundant member function PositionAlgorithm<Strategy>::{upstream,downstream} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-22T04:51:20 Rebase Created 5 years, 4 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, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/layout/HitTestResult.h" 23 #include "core/layout/HitTestResult.h"
24 24
25 #include "core/HTMLNames.h" 25 #include "core/HTMLNames.h"
26 #include "core/dom/PseudoElement.h" 26 #include "core/dom/PseudoElement.h"
27 #include "core/dom/shadow/ComposedTreeTraversal.h" 27 #include "core/dom/shadow/ComposedTreeTraversal.h"
28 #include "core/dom/shadow/ShadowRoot.h" 28 #include "core/dom/shadow/ShadowRoot.h"
29 #include "core/editing/FrameSelection.h" 29 #include "core/editing/FrameSelection.h"
30 #include "core/editing/VisibleUnits.h"
30 #include "core/editing/markers/DocumentMarkerController.h" 31 #include "core/editing/markers/DocumentMarkerController.h"
31 #include "core/fetch/ImageResource.h" 32 #include "core/fetch/ImageResource.h"
32 #include "core/frame/LocalFrame.h" 33 #include "core/frame/LocalFrame.h"
33 #include "core/html/HTMLAnchorElement.h" 34 #include "core/html/HTMLAnchorElement.h"
34 #include "core/html/HTMLAreaElement.h" 35 #include "core/html/HTMLAreaElement.h"
35 #include "core/html/HTMLImageElement.h" 36 #include "core/html/HTMLImageElement.h"
36 #include "core/html/HTMLInputElement.h" 37 #include "core/html/HTMLInputElement.h"
37 #include "core/html/HTMLMapElement.h" 38 #include "core/html/HTMLMapElement.h"
38 #include "core/html/HTMLMediaElement.h" 39 #include "core/html/HTMLMediaElement.h"
39 #include "core/html/HTMLTextAreaElement.h" 40 #include "core/html/HTMLTextAreaElement.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 157 }
157 158
158 PositionWithAffinity HitTestResult::position() const 159 PositionWithAffinity HitTestResult::position() const
159 { 160 {
160 if (!m_innerPossiblyPseudoNode) 161 if (!m_innerPossiblyPseudoNode)
161 return PositionWithAffinity(); 162 return PositionWithAffinity();
162 LayoutObject* layoutObject = this->layoutObject(); 163 LayoutObject* layoutObject = this->layoutObject();
163 if (!layoutObject) 164 if (!layoutObject)
164 return PositionWithAffinity(); 165 return PositionWithAffinity();
165 if (m_innerPossiblyPseudoNode->isPseudoElement() && m_innerPossiblyPseudoNod e->pseudoId() == BEFORE) 166 if (m_innerPossiblyPseudoNode->isPseudoElement() && m_innerPossiblyPseudoNod e->pseudoId() == BEFORE)
166 return Position(m_innerNode, PositionAnchorType::BeforeChildren).downstr eam(); 167 return mostForwardCaretPosition(Position(m_innerNode, PositionAnchorType ::BeforeChildren));
167 return layoutObject->positionForPoint(localPoint()); 168 return layoutObject->positionForPoint(localPoint());
168 } 169 }
169 170
170 LayoutObject* HitTestResult::layoutObject() const 171 LayoutObject* HitTestResult::layoutObject() const
171 { 172 {
172 return m_innerNode ? m_innerNode->layoutObject() : 0; 173 return m_innerNode ? m_innerNode->layoutObject() : 0;
173 } 174 }
174 175
175 void HitTestResult::setToShadowHostIfInUserAgentShadowRoot() 176 void HitTestResult::setToShadowHostIfInUserAgentShadowRoot()
176 { 177 {
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 else if (isHTMLMapElement(m_innerNode)) 524 else if (isHTMLMapElement(m_innerNode))
524 imageMapImageElement = toHTMLMapElement(m_innerNode)->imageElement(); 525 imageMapImageElement = toHTMLMapElement(m_innerNode)->imageElement();
525 526
526 if (!imageMapImageElement) 527 if (!imageMapImageElement)
527 return m_innerNode.get(); 528 return m_innerNode.get();
528 529
529 return imageMapImageElement; 530 return imageMapImageElement;
530 } 531 }
531 532
532 } // namespace blink 533 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/serializers/StyledMarkupSerializer.cpp ('k') | Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698