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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bf3d2859a50fe37ef03f48d5a32216bcd2402932
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 21 01:01:56 2010 +0000

    2010-08-20  Ademar de Souza Reis Jr  <ademar.reis at openbossa.org>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] constify core() and kit() parameters
            https://bugs.webkit.org/show_bug.cgi?id=44347
    
            * Api/qwebframe.cpp:
            (QWebFrame::evaluateJavaScript):
            * Api/qwebframe_p.h:
            * Api/qwebhistory.cpp:
            (QWebHistoryItemPrivate::core):
            * Api/qwebhistory_p.h:
            * Api/qwebpage.cpp:
            (QWebPagePrivate::core):
            * Api/qwebpage_p.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65771 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 0bb6922..921281a 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -1407,12 +1407,12 @@ QWebSecurityOrigin QWebFrame::securityOrigin() const
     return QWebSecurityOrigin(priv);
 }
 
-WebCore::Frame* QWebFramePrivate::core(QWebFrame* webFrame)
+WebCore::Frame* QWebFramePrivate::core(const QWebFrame* webFrame)
 {
     return webFrame->d->frame;
 }
 
-QWebFrame* QWebFramePrivate::kit(WebCore::Frame* coreFrame)
+QWebFrame* QWebFramePrivate::kit(const WebCore::Frame* coreFrame)
 {
     return static_cast<FrameLoaderClientQt*>(coreFrame->loader()->client())->webFrame();
 }
diff --git a/WebKit/qt/Api/qwebframe_p.h b/WebKit/qt/Api/qwebframe_p.h
index 15b0549..b5dda62 100644
--- a/WebKit/qt/Api/qwebframe_p.h
+++ b/WebKit/qt/Api/qwebframe_p.h
@@ -81,8 +81,8 @@ public:
     WebCore::Scrollbar* horizontalScrollBar() const;
     WebCore::Scrollbar* verticalScrollBar() const;
 
-    static WebCore::Frame* core(QWebFrame*);
-    static QWebFrame* kit(WebCore::Frame*);
+    static WebCore::Frame* core(const QWebFrame*);
+    static QWebFrame* kit(const WebCore::Frame*);
 
     void renderRelativeCoords(WebCore::GraphicsContext*, QWebFrame::RenderLayer, const QRegion& clip);
 #if ENABLE(TILED_BACKING_STORE)
diff --git a/WebKit/qt/Api/qwebhistory.cpp b/WebKit/qt/Api/qwebhistory.cpp
index 55305c9..1d9935d 100644
--- a/WebKit/qt/Api/qwebhistory.cpp
+++ b/WebKit/qt/Api/qwebhistory.cpp
@@ -554,7 +554,7 @@ QWebPagePrivate* QWebHistoryPrivate::page()
     return QWebFramePrivate::kit(static_cast<WebCore::BackForwardListImpl*>(lst)->page()->mainFrame())->page()->handle();
 }
 
-WebCore::HistoryItem* QWebHistoryItemPrivate::core(QWebHistoryItem* q)
+WebCore::HistoryItem* QWebHistoryItemPrivate::core(const QWebHistoryItem* q)
 {
     return q->d->item;
 }
diff --git a/WebKit/qt/Api/qwebhistory_p.h b/WebKit/qt/Api/qwebhistory_p.h
index c9ff91b..1df2349 100644
--- a/WebKit/qt/Api/qwebhistory_p.h
+++ b/WebKit/qt/Api/qwebhistory_p.h
@@ -45,7 +45,7 @@ public:
             item->deref();
     }
 
-    static WebCore::HistoryItem* core(QWebHistoryItem* q);
+    static WebCore::HistoryItem* core(const QWebHistoryItem* q);
 
     WebCore::HistoryItem* item;
 };
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 516ebc9..5eee21c 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -322,7 +322,7 @@ QWebPagePrivate::~QWebPagePrivate()
 #endif
 }
 
-WebCore::Page* QWebPagePrivate::core(QWebPage* page)
+WebCore::Page* QWebPagePrivate::core(const QWebPage* page)
 {
     return page->d->page;
 }
diff --git a/WebKit/qt/Api/qwebpage_p.h b/WebKit/qt/Api/qwebpage_p.h
index cf4ab88..6310eaf 100644
--- a/WebKit/qt/Api/qwebpage_p.h
+++ b/WebKit/qt/Api/qwebpage_p.h
@@ -72,7 +72,7 @@ public:
     QWebPagePrivate(QWebPage*);
     ~QWebPagePrivate();
 
-    static WebCore::Page* core(QWebPage*);
+    static WebCore::Page* core(const QWebPage*);
     static QWebPagePrivate* priv(QWebPage*);
 
     void createMainFrame();
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 92428df..871d7ab 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-20  Ademar de Souza Reis Jr  <ademar.reis at openbossa.org>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] constify core() and kit() parameters
+        https://bugs.webkit.org/show_bug.cgi?id=44347
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::evaluateJavaScript):
+        * Api/qwebframe_p.h:
+        * Api/qwebhistory.cpp:
+        (QWebHistoryItemPrivate::core):
+        * Api/qwebhistory_p.h:
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::core):
+        * Api/qwebpage_p.h:
+
 2010-08-19  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Reviewed by Antonio Gomes.

-- 
WebKit Debian packaging