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

Unified Diff: Source/core/dom/TreeScope.cpp

Issue 25668008: Make Document::caretRangeFromPoint() to work with :first-letter style (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 2013-10-07T15:30:03 Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/TreeScope.h ('k') | Source/core/rendering/HitTestResult.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/TreeScope.cpp
diff --git a/Source/core/dom/TreeScope.cpp b/Source/core/dom/TreeScope.cpp
index 086ecf77cec14dbc43c037c71a1ae1211205d7e6..1d6ac1ddb958b1cf41ace169051a10b1dff6569d 100644
--- a/Source/core/dom/TreeScope.cpp
+++ b/Source/core/dom/TreeScope.cpp
@@ -214,7 +214,7 @@ HTMLMapElement* TreeScope::getImageMap(const String& url) const
return toHTMLMapElement(m_imageMapsByName->getElementByMapName(AtomicString(name).impl(), this));
}
-Node* nodeFromPoint(Document* document, int x, int y, LayoutPoint* localPoint)
+RenderObject* rendererFromPoint(Document* document, int x, int y, LayoutPoint* localPoint)
{
Frame* frame = document->frame();
@@ -237,14 +237,19 @@ Node* nodeFromPoint(Document* document, int x, int y, LayoutPoint* localPoint)
if (localPoint)
*localPoint = result.localPoint();
- return result.innerNode();
+ return result.renderer();
}
Element* TreeScope::elementFromPoint(int x, int y) const
{
- Node* node = nodeFromPoint(&rootNode()->document(), x, y);
- if (node && node->isTextNode())
- node = node->parentNode();
+ RenderObject* renderer = rendererFromPoint(&rootNode()->document(), x, y);
+ if (!renderer)
+ return 0;
+ Node* node = renderer->node();
+ if (!node)
+ return 0;
+ if (node->isPseudoElement() || node->isTextNode())
+ node = node->parentOrShadowHostNode();
ASSERT(!node || node->isElementNode() || node->isShadowRoot());
node = ancestorInThisScope(node);
if (!node || !node->isElementNode())
« no previous file with comments | « Source/core/dom/TreeScope.h ('k') | Source/core/rendering/HitTestResult.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698