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

[dbates at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3259c7a8c1f6aff674120c5c1bce099282235f2f
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 03:54:05 2010 +0000

    2010-08-26  Daniel Bates  <dbates at rim.com>
    
            Attempt to fix the Qt WebKit2 build.
    
            * WebProcess/WebPage/qt/WebPageQt.cpp:
            (WebKit::WebPage::performDefaultBehaviorForKeyEvent): Pass m_page.get() to WebKit::scroll()
            instead of m_page since it expects a raw pointer.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66175 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index eec5324..a048855 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-26  Daniel Bates  <dbates at rim.com>
+
+        Attempt to fix the Qt WebKit2 build.
+
+        * WebProcess/WebPage/qt/WebPageQt.cpp:
+        (WebKit::WebPage::performDefaultBehaviorForKeyEvent): Pass m_page.get() to WebKit::scroll()
+        instead of m_page since it expects a raw pointer.
+
 2010-08-26  Gavin Barraclough  <barraclough at apple.com>
 
         Speculative windows build fix.
diff --git a/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp b/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp
index 3e83ba1..4d3bbe5 100644
--- a/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp
+++ b/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp
@@ -226,31 +226,31 @@ bool WebPage::performDefaultBehaviorForKeyEvent(const WebKeyboardEvent& keyboard
             m_page->goBack();
         break;
     case VK_SPACE:
-        scroll(m_page, keyboardEvent.shiftKey() ? ScrollUp : ScrollDown, ScrollByPage);
+        scroll(m_page.get(), keyboardEvent.shiftKey() ? ScrollUp : ScrollDown, ScrollByPage);
         break;
     case VK_LEFT:
-        scroll(m_page, ScrollLeft, ScrollByLine);
+        scroll(m_page.get(), ScrollLeft, ScrollByLine);
         break;
     case VK_RIGHT:
-        scroll(m_page, ScrollRight, ScrollByLine);
+        scroll(m_page.get(), ScrollRight, ScrollByLine);
         break;
     case VK_UP:
-        scroll(m_page, ScrollUp, ScrollByLine);
+        scroll(m_page.get(), ScrollUp, ScrollByLine);
         break;
     case VK_DOWN:
-        scroll(m_page, ScrollDown, ScrollByLine);
+        scroll(m_page.get(), ScrollDown, ScrollByLine);
         break;
     case VK_HOME:
-        scroll(m_page, ScrollUp, ScrollByDocument);
+        scroll(m_page.get(), ScrollUp, ScrollByDocument);
         break;
     case VK_END:
-        scroll(m_page, ScrollDown, ScrollByDocument);
+        scroll(m_page.get(), ScrollDown, ScrollByDocument);
         break;
     case VK_PRIOR:
-        scroll(m_page, ScrollUp, ScrollByPage);
+        scroll(m_page.get(), ScrollUp, ScrollByPage);
         break;
     case VK_NEXT:
-        scroll(m_page, ScrollDown, ScrollByPage);
+        scroll(m_page.get(), ScrollDown, ScrollByPage);
         break;
     default:
         return false;

-- 
WebKit Debian packaging