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

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 49367e29dfdeff7ede8db4f8bd48aca6704ccfc4
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 30 13:47:46 2010 +0000

    2010-07-30  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Unreviewed build fix.
    
            [Qt] Build fix for recent API changes in WebKit2.
    
            * UIProcess/API/cpp/qt/WKStringQt.cpp:
            (WKStringCopyQString):
            * UIProcess/API/cpp/qt/WKURLQt.cpp:
            (WKURLCopyQUrl):
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPage::QWKPage):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64355 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0745e3e..f0309cb 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-30  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Unreviewed build fix.
+
+        [Qt] Build fix for recent API changes in WebKit2.
+
+        * UIProcess/API/cpp/qt/WKStringQt.cpp:
+        (WKStringCopyQString):
+        * UIProcess/API/cpp/qt/WKURLQt.cpp:
+        (WKURLCopyQUrl):
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::QWKPage):
+
 2010-07-29  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp b/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
index 16f005a..2052f1e 100644
--- a/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
+++ b/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
@@ -36,5 +36,6 @@ QString WKStringCopyQString(WKStringRef stringRef)
 {
     if (!stringRef)
         return QString();
-    return QString(reinterpret_cast<const QChar*>(toWK(stringRef)->characters()), toWK(stringRef)->length());
+    const WebCore::String& string = toWK(stringRef)->string();
+    return QString(reinterpret_cast<const QChar*>(string.characters()), string.length());
 }
diff --git a/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp b/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
index 8fbea29..22fe5d6 100644
--- a/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
+++ b/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
@@ -36,5 +36,6 @@ QUrl WKURLCopyQUrl(WKURLRef urlRef)
 {
     if (!urlRef)
         return QUrl();
-    return QUrl(QString(reinterpret_cast<const QChar*>(toWK(urlRef)->characters()), toWK(urlRef)->length()));
+    const WebCore::String& string = toWK(urlRef)->string();
+    return QUrl(QString(reinterpret_cast<const QChar*>(string.characters()), string.length()));
 }
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 5c3c6d5..d17a3c2 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -235,7 +235,9 @@ QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
         qt_wk_didChangeProgress,
         qt_wk_didFinishProgress,
         qt_wk_didBecomeUnresponsive,
-        qt_wk_didBecomeResponsive
+        qt_wk_didBecomeResponsive,
+        0,  /* processDidExit */
+        0   /* didChangeBackForwardList */
     };
     WKPageSetPageLoaderClient(pageRef(), &loadClient);
 
@@ -246,6 +248,8 @@ QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
         qt_wk_showPage,
         qt_wk_close,
         qt_wk_runJavaScriptAlert,
+        0,  /* runJavaScriptConfirm */
+        0   /* runJavaScriptPrompt */
     };
     WKPageSetPageUIClient(pageRef(), &uiClient);
 }

-- 
WebKit Debian packaging