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

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

Issue 15932012: HitTestResult::innerElement should check its parent node for rendering and styling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.cpp ('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/rendering/HitTestResult.h" 23 #include "core/rendering/HitTestResult.h"
24 24
25 #include "HTMLNames.h" 25 #include "HTMLNames.h"
26 #include "SVGNames.h" 26 #include "SVGNames.h"
27 #include "XLinkNames.h" 27 #include "XLinkNames.h"
28 #include "core/dom/DocumentMarkerController.h" 28 #include "core/dom/DocumentMarkerController.h"
29 #include "core/dom/NodeRenderingTraversal.h"
29 #include "core/dom/shadow/ShadowRoot.h" 30 #include "core/dom/shadow/ShadowRoot.h"
30 #include "core/editing/FrameSelection.h" 31 #include "core/editing/FrameSelection.h"
31 #include "core/html/HTMLAnchorElement.h" 32 #include "core/html/HTMLAnchorElement.h"
32 #include "core/html/HTMLImageElement.h" 33 #include "core/html/HTMLImageElement.h"
33 #include "core/html/HTMLInputElement.h" 34 #include "core/html/HTMLInputElement.h"
34 #include "core/html/HTMLMediaElement.h" 35 #include "core/html/HTMLMediaElement.h"
35 #include "core/html/parser/HTMLParserIdioms.h" 36 #include "core/html/parser/HTMLParserIdioms.h"
36 #include "core/loader/cache/CachedImage.h" 37 #include "core/loader/cache/CachedImage.h"
37 #include "core/page/Frame.h" 38 #include "core/page/Frame.h"
38 #include "core/page/FrameTree.h" 39 #include "core/page/FrameTree.h"
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 466
466 Element* element = node->parentElement(); 467 Element* element = node->parentElement();
467 if (element && element->inDocument()) 468 if (element && element->inDocument())
468 return element; 469 return element;
469 470
470 return node; 471 return node;
471 } 472 }
472 473
473 Element* HitTestResult::innerElement() const 474 Element* HitTestResult::innerElement() const
474 { 475 {
475 for (Node* node = m_innerNode.get(); node; node = node->parentNode()) { 476 NodeRenderingTraversal::ParentDetails details;
477 for (Node* node = m_innerNode.get(); node; node = NodeRenderingTraversal::pa rent(node, &details))
476 if (node->isElementNode()) 478 if (node->isElementNode())
477 return toElement(node); 479 return toElement(node);
478 }
479 480
480 return 0; 481 return 0;
481 } 482 }
482 483
483 } // namespace WebCore 484 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698