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

reni at webkit.org reni at webkit.org
Wed Dec 22 16:34:57 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3fcbb7bebd259555cc33a3b69177b4e2e561f74d
Author: reni at webkit.org <reni at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 26 15:36:21 2010 +0000

    [Qt] Remove empty ScrollView::platformInit/platformDestroy
    https://bugs.webkit.org/show_bug.cgi?id=50079
    
    Reviewed by Antonio Gomes.
    
    No new test is needed.
    
    * platform/ScrollView.cpp:
    (WebCore::ScrollView::wheelEvent):
    * platform/qt/ScrollViewQt.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72761 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index da2ea4d..fd86969 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-26  Renata Hodovan  <reni at inf.u-szeged.hu>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Remove empty ScrollView::platformInit/platformDestroy
+        https://bugs.webkit.org/show_bug.cgi?id=50079
+
+        No new test is needed.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::wheelEvent):
+        * platform/qt/ScrollViewQt.cpp:
+
 2010-11-26  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed. Fixing inspector tests.
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index 9fafa38..5fe3bee 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -1015,7 +1015,7 @@ void ScrollView::removePanScrollIcon()
     hostWindow()->invalidateContentsAndWindow(IntRect(m_panScrollIconPoint, IntSize(panIconSizeLength, panIconSizeLength)), true /*immediate*/);
 }
 
-#if !PLATFORM(WX) && !PLATFORM(GTK) && !PLATFORM(QT) && !PLATFORM(EFL)
+#if !PLATFORM(WX) && !PLATFORM(GTK) && !PLATFORM(EFL)
 
 void ScrollView::platformInit()
 {
diff --git a/WebCore/platform/qt/ScrollViewQt.cpp b/WebCore/platform/qt/ScrollViewQt.cpp
index 17ad253..8fdfd29 100644
--- a/WebCore/platform/qt/ScrollViewQt.cpp
+++ b/WebCore/platform/qt/ScrollViewQt.cpp
@@ -34,14 +34,6 @@
 
 namespace WebCore {
 
-void ScrollView::platformInit()
-{
-}
-
-void ScrollView::platformDestroy()
-{
-}
-
 void ScrollView::platformAddChild(Widget*)
 {
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list