summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b7401aa)
[Title] Changed the point for searching clickable node to get focus ring rect.
[Issue#] DCM-2047
[Problem] focus ring is displayed above two link menu than tapped link menu.
[Cause] When user tap contents in iframe, it is searching clickable node using the point from iframe.
But, the point from main frame is needed for searching clickable node.
So, focus ring is displayed at wrong position.
[Solution] Changed the point for searching clickable node to the main frame point.
Change-Id: I9df118900b39aefdb0671bd167acc91beea4b582
#if ENABLE(TIZEN_WEBKIT2_HIT_TEST)
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
#if ENABLE(TOUCH_ADJUSTMENT)
#if ENABLE(TIZEN_WEBKIT2_HIT_TEST)
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
#if ENABLE(TOUCH_ADJUSTMENT)
-static IntRect getFocusedRect(HitTestResult hitTestResult, Page* page, const IntSize& area)
+static IntRect getFocusedRect(HitTestResult hitTestResult, Page* page, const IntPoint& point, const IntSize& area)
#else
static IntRect getFocusedRect(HitTestResult hitTestResult, Page* page)
#endif
#else
static IntRect getFocusedRect(HitTestResult hitTestResult, Page* page)
#endif
Node* adjustedNode = 0;
IntPoint adustedPoint;
Frame* mainFrame = page->mainFrame();
Node* adjustedNode = 0;
IntPoint adustedPoint;
Frame* mainFrame = page->mainFrame();
- mainFrame->eventHandler()->bestClickableNodeForTouchPoint(hitTestResult.roundedPoint(), IntSize(area.width() / 2, area.height() / 2), adustedPoint, adjustedNode);
+ mainFrame->eventHandler()->bestClickableNodeForTouchPoint(point, IntSize(area.width() / 2, area.height() / 2), adustedPoint, adjustedNode);
if (adjustedNode)
node = adjustedNode;
if (adjustedNode)
node = adjustedNode;
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
#if ENABLE(TOUCH_ADJUSTMENT)
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
#if ENABLE(TOUCH_ADJUSTMENT)
- hitTestResultData.focusedRect = getFocusedRect(hitTestResult, m_page.get(), area);
+ hitTestResultData.focusedRect = getFocusedRect(hitTestResult, m_page.get(), point, area);
#else
hitTestResultData.focusedRect = getFocusedRect(hitTestResult, m_page.get());
#endif
#else
hitTestResultData.focusedRect = getFocusedRect(hitTestResult, m_page.get());
#endif