summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-12-08 18:11:01 -0800
committerShimeng (Simon) Wang <swang@google.com>2010-12-22 14:15:41 -0800
commitd15092ffa5957f6f3a2f4709db4e6a49130eab0e (patch)
tree80ab212cd7700a2d5f1a56644e29742e6ca2d07a /WebKit
parent39cdda4b996f83ace0df43ddaf2268faad1b64bd (diff)
downloadexternal_webkit-d15092ffa5957f6f3a2f4709db4e6a49130eab0e.zip
external_webkit-d15092ffa5957f6f3a2f4709db4e6a49130eab0e.tar.gz
external_webkit-d15092ffa5957f6f3a2f4709db4e6a49130eab0e.tar.bz2
Merge Webkit at r73109: add new method.
This is because: http://trac.webkit.org/changeset/72631 This is to merge the following change into Android: https://android-git.corp.google.com/g/#change,81198 Change-Id: Ifc7ca98388ca88828669371df501b616f8021e80
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/WebCoreSupport/PlatformBridge.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index 2c238b2..baeddb2 100644
--- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -184,6 +184,13 @@ void PlatformBridge::updateTextfield(FrameView* frameView, Node* nodePtr, bool c
webViewCore->updateTextfield(nodePtr, changeToPassword, text);
}
+void PlatformBridge::setScrollPosition(ScrollView* scrollView, int x, int y) {
+ // Check to make sure the view is the main FrameView.
+ android::WebViewCore *webViewCore = android::WebViewCore::getWebViewCore(scrollView);
+ if (webViewCore->mainFrame()->view() == scrollView)
+ webViewCore->scrollTo(x, y);
+}
+
int PlatformBridge::lowMemoryUsageMB()
{
return MemoryUsage::lowMemoryUsageMb();