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

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

Issue 859943002: Use the composed tree for the title attributes in Shadow DOM (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix tests Created 5 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 unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/dom/shadow/attr-title-inherit.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/DocumentMarkerController.h" 26 #include "core/dom/DocumentMarkerController.h"
27 #include "core/dom/NodeRenderingTraversal.h" 27 #include "core/dom/NodeRenderingTraversal.h"
28 #include "core/dom/shadow/ComposedTreeTraversal.h"
28 #include "core/dom/shadow/ShadowRoot.h" 29 #include "core/dom/shadow/ShadowRoot.h"
29 #include "core/editing/FrameSelection.h" 30 #include "core/editing/FrameSelection.h"
30 #include "core/fetch/ImageResource.h" 31 #include "core/fetch/ImageResource.h"
31 #include "core/frame/LocalFrame.h" 32 #include "core/frame/LocalFrame.h"
32 #include "core/html/HTMLAnchorElement.h" 33 #include "core/html/HTMLAnchorElement.h"
33 #include "core/html/HTMLImageElement.h" 34 #include "core/html/HTMLImageElement.h"
34 #include "core/html/HTMLInputElement.h" 35 #include "core/html/HTMLInputElement.h"
35 #include "core/html/HTMLMediaElement.h" 36 #include "core/html/HTMLMediaElement.h"
36 #include "core/html/HTMLTextAreaElement.h" 37 #include "core/html/HTMLTextAreaElement.h"
37 #include "core/html/parser/HTMLParserIdioms.h" 38 #include "core/html/parser/HTMLParserIdioms.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 if (LayoutObject* renderer = m_innerNonSharedNode->renderer()) 214 if (LayoutObject* renderer = m_innerNonSharedNode->renderer())
214 dir = renderer->style()->direction(); 215 dir = renderer->style()->direction();
215 return marker->description(); 216 return marker->description();
216 } 217 }
217 218
218 String HitTestResult::title(TextDirection& dir) const 219 String HitTestResult::title(TextDirection& dir) const
219 { 220 {
220 dir = LTR; 221 dir = LTR;
221 // Find the title in the nearest enclosing DOM node. 222 // Find the title in the nearest enclosing DOM node.
222 // For <area> tags in image maps, walk the tree for the <area>, not the <img > using it. 223 // For <area> tags in image maps, walk the tree for the <area>, not the <img > using it.
223 for (Node* titleNode = m_innerNode.get(); titleNode; titleNode = titleNode-> parentNode()) { 224 for (Node* titleNode = m_innerNode.get(); titleNode; titleNode = ComposedTre eTraversal::parent(*titleNode)) {
224 if (titleNode->isElementNode()) { 225 if (titleNode->isElementNode()) {
225 String title = toElement(titleNode)->title(); 226 String title = toElement(titleNode)->title();
226 if (!title.isNull()) { 227 if (!title.isNull()) {
227 if (LayoutObject* renderer = titleNode->renderer()) 228 if (LayoutObject* renderer = titleNode->renderer())
228 dir = renderer->style()->direction(); 229 dir = renderer->style()->direction();
229 return title; 230 return title;
230 } 231 }
231 } 232 }
232 } 233 }
233 return String(); 234 return String();
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 { 467 {
467 for (Node* node = m_innerNode.get(); node; node = NodeRenderingTraversal::pa rent(*node)) { 468 for (Node* node = m_innerNode.get(); node; node = NodeRenderingTraversal::pa rent(*node)) {
468 if (node->isElementNode()) 469 if (node->isElementNode())
469 return toElement(node); 470 return toElement(node);
470 } 471 }
471 472
472 return 0; 473 return 0;
473 } 474 }
474 475
475 } // namespace blink 476 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/shadow/attr-title-inherit.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698