[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tonikitoo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 231b20fc97353f1ef0f75b2da6857494ae65686b
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 22:16:12 2010 +0000

    Make FocusController::focusedOrMainFrame method const
    https://bugs.webkit.org/show_bug.cgi?id=45406
    
    Reviewed by Daniel Bates.
    Patch by Antonio Gomes <agomes at rim.com>
    
    No new tests once it is not a behavior change.
    
    * page/FocusController.cpp:
    (WebCore::FocusController::focusedOrMainFrame):
    * page/FocusController.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67025 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bd3c157..d120862 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-08  Antonio Gomes  <agomes at rim.com>
+
+        Reviewed by Daniel Bates.
+
+        Make FocusController::focusedOrMainFrame method const
+        https://bugs.webkit.org/show_bug.cgi?id=45406
+
+        No new tests.
+
+        * page/FocusController.cpp:
+        (WebCore::FocusController::focusedOrMainFrame):
+        * page/FocusController.h:
+
 2010-09-08  Jian Li  <jianli at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index d35bb4b..fa56ca2 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -341,7 +341,7 @@ __ZN7WebCore15DatabaseTracker9setClientEPNS_21DatabaseTrackerClientE
 __ZN7WebCore15FocusController10setFocusedEb
 __ZN7WebCore15FocusController15setFocusedFrameEN3WTF10PassRefPtrINS_5FrameEEE
 __ZN7WebCore15FocusController15setInitialFocusENS_14FocusDirectionEPNS_13KeyboardEventE
-__ZN7WebCore15FocusController18focusedOrMainFrameEv
+__ZNK7WebCore15FocusController18focusedOrMainFrameEv
 __ZN7WebCore15FocusController9setActiveEb
 __ZN7WebCore15GraphicsContext12setFillColorERKNS_5ColorENS_10ColorSpaceE
 __ZN7WebCore15GraphicsContext4clipERKNS_9FloatRectE
diff --git a/WebCore/page/FocusController.cpp b/WebCore/page/FocusController.cpp
index a87d6a6..aeb4fa0 100644
--- a/WebCore/page/FocusController.cpp
+++ b/WebCore/page/FocusController.cpp
@@ -110,7 +110,7 @@ void FocusController::setFocusedFrame(PassRefPtr<Frame> frame)
     m_isChangingFocusedFrame = false;
 }
 
-Frame* FocusController::focusedOrMainFrame()
+Frame* FocusController::focusedOrMainFrame() const
 {
     if (Frame* frame = focusedFrame())
         return frame;
diff --git a/WebCore/page/FocusController.h b/WebCore/page/FocusController.h
index 4410833..050a08f 100644
--- a/WebCore/page/FocusController.h
+++ b/WebCore/page/FocusController.h
@@ -46,7 +46,7 @@ public:
 
     void setFocusedFrame(PassRefPtr<Frame>);
     Frame* focusedFrame() const { return m_focusedFrame.get(); }
-    Frame* focusedOrMainFrame();
+    Frame* focusedOrMainFrame() const;
 
     bool setInitialFocus(FocusDirection, KeyboardEvent*);
     bool advanceFocus(FocusDirection, KeyboardEvent*, bool initialFocus = false);

-- 
WebKit Debian packaging