Changeset 59045 in webkit

Timestamp:

May 8, 2010 8:05:46 PM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

Spatial Navigation: create a getter for the "fudgeFactor"
​https://bugs.webkit.org/show_bug.cgi?id=38488

Reviewed by Kenneth Christiansen.
Patch by Antonio Gomes <​tonikitoo@webkit.org>

A couple of places in the Spatial Navigation code make use of a "fudge factor"
to improve precision by working around outline focus metrics and such. Patch adds
a helper method for unify getter operations of this value, instead of having it
declared locally in the various methods it is used.

No behaviour change.

• page/SpatialNavigation.cpp:

(WebCore::scrollIntoView):
(WebCore::deflateIfOverlapped):

• page/SpatialNavigation.h:

(WebCore::fudgeFactor):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/SpatialNavigation.cpp (modified) (2 diffs)
• page/SpatialNavigation.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-03  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+
+        Spatial Navigation: create a getter for the "fudgeFactor"
+        https://bugs.webkit.org/show_bug.cgi?id=38488
+
+        A couple of places in the Spatial Navigation code make use of a "fudge factor"
+        to improve precision by working around outline focus metrics and such. Patch adds
+        a helper method for unify getter operations of this value, instead of having it
+        declared locally in the various methods it is used.
+
+        No behaviour change.
+
+        * page/SpatialNavigation.cpp:
+        (WebCore::scrollIntoView):
+        (WebCore::deflateIfOverlapped):
+        * page/SpatialNavigation.h:
+        (WebCore::fudgeFactor):
+
 2010-05-08  Stuart Morgan  <stuartmorgan@chromium.org>
 

trunk/WebCore/page/SpatialNavigation.cpp

@@ -478 +478 @@
     // scrolling it for accurate reason.
     // Element's scrollIntoView method does not provide this flexibility.
-    static const int fudgeFactor = 2;
     IntRect bounds = element->getRect();
-    bounds.inflate(fudgeFactor);
+    bounds.inflate(fudgeFactor());
     element->renderer()->enclosingLayer()->scrollRectToVisible(bounds);
 }
@@ -498 +497 @@
         return;
 
-    static const int fudgeFactor = -2;
+    int deflateFactor = -fudgeFactor();
 
     // Avoid negative width or height values.
-    if ((a.width() + 2 * fudgeFactor > 0) && (a.height() + 2 * fudgeFactor > 0))
-        a.inflate(fudgeFactor);
-
-    if ((b.width() + 2 * fudgeFactor > 0) && (b.height() + 2 * fudgeFactor > 0))
-        b.inflate(fudgeFactor);
+    if ((a.width() + 2 * deflateFactor > 0) && (a.height() + 2 * deflateFactor > 0))
+        a.inflate(deflateFactor);
+
+    if ((b.width() + 2 * deflateFactor > 0) && (b.height() + 2 * deflateFactor > 0))
+        b.inflate(deflateFactor);
 }
 

trunk/WebCore/page/SpatialNavigation.h

@@ -39 +39 @@
 {
     return numeric_limits<long long>::max();
+}
+
+inline unsigned int fudgeFactor()
+{
+    return 2;
 }