Make FocusController::focusedOrMainFrame method const
authortonikitoo@webkit.org <tonikitoo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Sep 2010 22:16:12 +0000 (22:16 +0000)
committertonikitoo@webkit.org <tonikitoo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Sep 2010 22:16:12 +0000 (22:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=45406

Reviewed by Daniel Bates.
Patch by Antonio Gomes <agomes@rim.com>

No new tests once it is not a behavior change.

* page/FocusController.cpp:
(WebCore::FocusController::focusedOrMainFrame):
* page/FocusController.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@67025 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.exp.in
WebCore/page/FocusController.cpp
WebCore/page/FocusController.h

index bd3c157..d120862 100644 (file)
@@ -1,3 +1,16 @@
+2010-09-08  Antonio Gomes  <agomes@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@chromium.org>
 
         Reviewed by Darin Adler.
index d35bb4b..fa56ca2 100644 (file)
@@ -341,7 +341,7 @@ __ZN7WebCore15DatabaseTracker9setClientEPNS_21DatabaseTrackerClientE
 __ZN7WebCore15FocusController10setFocusedEb
 __ZN7WebCore15FocusController15setFocusedFrameEN3WTF10PassRefPtrINS_5FrameEEE
 __ZN7WebCore15FocusController15setInitialFocusENS_14FocusDirectionEPNS_13KeyboardEventE
-__ZN7WebCore15FocusController18focusedOrMainFrameEv
+__ZNK7WebCore15FocusController18focusedOrMainFrameEv
 __ZN7WebCore15FocusController9setActiveEb
 __ZN7WebCore15GraphicsContext12setFillColorERKNS_5ColorENS_10ColorSpaceE
 __ZN7WebCore15GraphicsContext4clipERKNS_9FloatRectE
index a87d6a6..aeb4fa0 100644 (file)
@@ -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;
index 4410833..050a08f 100644 (file)
@@ -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);