[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 9c0c474c0c8896952ad5d5b59b5d1b0aeb97856d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 22:54:45 2010 +0000

    2010-11-23  Shimeng (Simon) Wang  <swang at google.com>
    
            Reviewed by Steve Block.
    
            Use platform bridge to set scroll position.
            https://bugs.webkit.org/show_bug.cgi?id=49550
    
            Refactoring only.  Existing tests shall suffice.
    
            * platform/android/PlatformBridge.h:
            * platform/android/ScrollViewAndroid.cpp:
            (WebCore::ScrollView::platformSetScrollPosition):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72631 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c51d168..683d301 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-23  Shimeng (Simon) Wang  <swang at google.com>
+
+        Reviewed by Steve Block.
+
+        Use platform bridge to set scroll position.
+        https://bugs.webkit.org/show_bug.cgi?id=49550
+
+        Refactoring only.  Existing tests shall suffice.
+
+        * platform/android/PlatformBridge.h:
+        * platform/android/ScrollViewAndroid.cpp:
+        (WebCore::ScrollView::platformSetScrollPosition):
+
 2010-11-23  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index 2427b3a..4269ef8 100644
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -81,6 +81,7 @@ class NPObject;
 
 namespace WebCore {
 
+class ScrollView;
 class Widget;
 
 // An interface to the embedding layer, which has the ability to answer
@@ -104,6 +105,9 @@ public:
     static bool cookiesEnabled();
     // Plugin
     static NPObject* pluginScriptableObject(Widget*);
+
+    static void setScrollPosition(ScrollView*, int x, int y);
+
     // Language
     static String computeDefaultLanguage();
     // Memory details for V8 GC
diff --git a/WebCore/platform/android/ScrollViewAndroid.cpp b/WebCore/platform/android/ScrollViewAndroid.cpp
index db20591..5d4da18 100644
--- a/WebCore/platform/android/ScrollViewAndroid.cpp
+++ b/WebCore/platform/android/ScrollViewAndroid.cpp
@@ -70,7 +70,7 @@ void ScrollView::platformSetScrollPosition(const WebCore::IntPoint& pt)
 {
     if (parent()) // don't attempt to scroll subframes; they're fully visible
         return;
-    android::WebViewCore::getWebViewCore(this)->scrollTo(pt.x(), pt.y());
+    PlatformBridge::setScrollPosition(this, pt.x(), pt.y());
 }
 
 void ScrollView::platformScrollbarModes(ScrollbarMode& h, ScrollbarMode& v) const

-- 
WebKit Debian packaging