Changeset 146090 in webkit

Timestamp:

Mar 18, 2013 11:29:42 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Add Proximity Detector.
​https://bugs.webkit.org/show_bug.cgi?id=112278

Patch by Alberto Garcia <​agarcia@igalia.com> on 2013-03-18
Reviewed by Rob Buis.

Fix variable names so they actually match the function
declarations.

Fix call to rectForPoint(), which was moved from HitTestResult to
HitTestLocation in r117091 and r126859.

• WebKitSupport/ProximityDetector.cpp:

(BlackBerry::WebKit::ProximityDetector::findBestPoint):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/ProximityDetector.cpp (modified) (3 diffs)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-03-18  Alberto Garcia  <agarcia@igalia.com>
+
+        [BlackBerry] Add Proximity Detector.
+        https://bugs.webkit.org/show_bug.cgi?id=112278
+
+        Reviewed by Rob Buis.
+
+        Fix variable names so they actually match the function
+        declarations.
+
+        Fix call to rectForPoint(), which was moved from HitTestResult to
+        HitTestLocation in r117091 and r126859.
+
+        * WebKitSupport/ProximityDetector.cpp:
+        (BlackBerry::WebKit::ProximityDetector::findBestPoint):
+
 2013-03-18  Alberto Garcia  <agarcia@igalia.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/ProximityDetector.cpp

@@ -60 +60 @@
 
     if (!m_webPage->m_mainFrame)
-        return contentPos;
+        return documentPos;
 
     Document* document = m_webPage->m_mainFrame->document();
 
     if (!document || !document->frame()->view())
-        return contentPos;
+        return documentPos;
 
-    unsigned left = -paddingRect.x();
-    unsigned top = -paddingRect.y();
-    unsigned right = paddingRect.maxX();
-    unsigned bottom = paddingRect.maxY();
+    unsigned left = -documentPaddingRect.x();
+    unsigned top = -documentPaddingRect.y();
+    unsigned right = documentPaddingRect.maxX();
+    unsigned bottom = documentPaddingRect.maxY();
 
     // Adjust hit point to frame
-    IntPoint frameContentPos(document->frame()->view()->windowToContents(m_webPage->m_mainFrame->view()->contentsToWindow(contentPos)));
+    IntPoint frameContentPos(document->frame()->view()->windowToContents(m_webPage->m_mainFrame->view()->contentsToWindow(documentPos)));
     HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping);
     HitTestResult result(frameContentPos, top, right, bottom, left);
     document->renderView()->layer()->hitTest(request, result);
 
-    IntPoint bestPoint = contentPos;
+    IntPoint bestPoint = documentPos;
     int bestPriority = 0;
 
@@ -92 +92 @@
 
         IntRect curRect = curNode->renderer()->absoluteBoundingBoxRect(true /*use transforms*/);
-        IntRect hitTestRect = HitTestResult::rectForPoint(contentPos, top, right, bottom, left);
+        IntRect hitTestRect = HitTestLocation::rectForPoint(documentPos, top, right, bottom, left);
 
         // Check that top corner does not exceed padding
@@ -102 +102 @@
             continue;
 
-        bool equalPriorityAndCloser = (priority == bestPriority) && (contentPos.distanceSquaredToPoint(bestPoint) > contentPos.distanceSquaredToPoint(curRect.location()));
+        bool equalPriorityAndCloser = (priority == bestPriority) && (documentPos.distanceSquaredToPoint(bestPoint) > documentPos.distanceSquaredToPoint(curRect.location()));
         if (priority > bestPriority || equalPriorityAndCloser) {
             bestPoint = curRect.location(); // use top left