[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 126ae4d834ac76a1ddc316ad5fc25f106f6dad61
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 21:35:29 2010 +0000

    2010-03-04  Simon Fraser  <simon.fraser at apple.com>
    
            Build fix.
    
            Delcare updateFocusCandidateIfCloser static to avoid warning.
    
            * page/FocusController.cpp:
            (WebCore::updateFocusCandidateIfCloser):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4c4fbce..0810eaa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-04  Simon Fraser  <simon.fraser at apple.com>
+
+        Build fix.
+
+        Delcare updateFocusCandidateIfCloser static to avoid warning.
+
+        * page/FocusController.cpp:
+        (WebCore::updateFocusCandidateIfCloser):
+
 2010-03-04  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebCore/page/FocusController.cpp b/WebCore/page/FocusController.cpp
index 5f4bb70..cd9aa4d 100644
--- a/WebCore/page/FocusController.cpp
+++ b/WebCore/page/FocusController.cpp
@@ -338,7 +338,7 @@ bool FocusController::advanceFocusDirectionally(FocusDirection direction, Keyboa
     return true;
 }
 
-void updateFocusCandidateIfCloser(Node* focusedNode, Node* candidate, long long distance, FocusCandidate& closestFocusCandidate)
+static void updateFocusCandidateIfCloser(Node* focusedNode, Node* candidate, long long distance, FocusCandidate& closestFocusCandidate)
 {
     // Bail out if |distance| is bigger than the current closest candidate.
     if (distance >= closestFocusCandidate.distance)

-- 
WebKit Debian packaging