Offset scroll area by the scroll origin on Android

 Bug 5268793
 The scrolled area for WebView is 0,0 - maxX,maxY while
 ScrollView can have any origin. On RTL pages, the origin
 is negative when it can scroll. This scrolls the page
 to the right when it detects an RTL page.

 Framework CL: I2537b84a

Change-Id: I6a91b97f90f5ba4c323c56dda9d125108d9502c4

1 files changed, 21 insertions, 0 deletions

diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index a01cca2..d4d2cc7 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -2117,6 +2117,25 @@ static void OrientationChanged(JNIEnv *env, jobject obj, int orientation)
     pFrame->sendOrientationChangeEvent(orientation);
 }
 
+static jboolean GetShouldStartScrolledRight(JNIEnv *env, jobject obj,
+        jint browserFrame)
+{
+    jboolean startScrolledRight = false; // default is start scrolled left
+    WebCore::Frame* frame = reinterpret_cast<WebCore::Frame*>(browserFrame);
+    WebCore::Document* document = frame->document();
+    if (document) {
+        RenderStyle* style = document->renderer()->style();
+        WritingMode writingMode = style->writingMode();
+        LOG_ASSERT(writingMode != WebCore::BottomToTopWritingMode,
+                "BottomToTopWritingMode isn't supported");
+        if (writingMode == WebCore::RightToLeftWritingMode)
+            startScrolledRight = true; // vertical-rl pages start scrolled right
+        else if (writingMode == WebCore::TopToBottomWritingMode)
+            startScrolledRight = !style->isLeftToRightDirection(); // RTL starts right
+    }
+    return startScrolledRight;
+}
+
 #if USE(CHROME_NETWORK_STACK)
 
 static void AuthenticationProceed(JNIEnv *env, jobject obj, int handle, jstring jUsername, jstring jPassword)
@@ -2315,6 +2334,8 @@ static JNINativeMethod gBrowserFrameNativeMethods[] = {
         (void*) SslCertErrorCancel },
     { "nativeSslClientCert", "(I[B[[B)V",
         (void*) SslClientCert },
+    { "nativeGetShouldStartScrolledRight", "(I)Z",
+        (void*) GetShouldStartScrolledRight },
 };
 
 int registerWebFrame(JNIEnv* env)