Update Gradle and SDK

support/android/apk/servoapp/src/main/AndroidManifest.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BEGIN_INCLUDE(manifest) -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"
+        package="com.mozilla.servo">
+
+    <uses-feature android:glEsVersion="0x00030000" android:required="true" />
+    <uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application android:label="Servo" android:icon="@mipmap/servo">
+        <activity android:name=".MainActivity"
+                android:label="Servo"
+                android:configChanges="orientation|keyboardHidden|screenSize">
+            <meta-data android:name="android.app.lib_name" android:value="servo" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <!-- Web browser intents -->
+            <intent-filter>
+              <action android:name="android.intent.action.VIEW" />
+              <category android:name="android.intent.category.DEFAULT" />
+              <category android:name="android.intent.category.BROWSABLE" />
+              <data android:scheme="http" />
+              <data android:scheme="https" />
+              <data android:scheme="data" />
+              <data android:scheme="javascript" />
+            </intent-filter>
+            <intent-filter>
+              <action android:name="android.intent.action.VIEW" />
+              <category android:name="android.intent.category.DEFAULT" />
+              <category android:name="android.intent.category.BROWSABLE" />
+              <data android:scheme="file" />
+              <data android:scheme="http" />
+              <data android:scheme="https" />
+              <data android:mimeType="text/html"/>
+              <data android:mimeType="text/plain"/>
+              <data android:mimeType="application/xhtml+xml"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
+<!-- END_INCLUDE(manifest) -->

support/android/apk/servoapp/src/main/java/com/mozilla/servo/MainActivity.java

@@ -0,0 +1,160 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+package com.mozilla.servo;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.util.Log;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.URLUtil;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+
+import com.mozilla.servoview.ServoView;
+
+import java.io.File;
+
+public class MainActivity extends Activity implements ServoView.Client {
+
+    private static final String LOGTAG = "MainActivity";
+
+    ServoView mServoView;
+    Button mBackButton;
+    Button mFwdButton;
+    Button mReloadButton;
+    Button mStopButton;
+    EditText mUrlField;
+    ProgressBar mProgressBar;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mServoView = (ServoView)findViewById(R.id.servoview);
+        mBackButton = (Button)findViewById(R.id.backbutton);
+        mFwdButton = (Button)findViewById(R.id.forwardbutton);
+        mReloadButton = (Button)findViewById(R.id.reloadbutton);
+        mStopButton = (Button)findViewById(R.id.stopbutton);
+        mUrlField = (EditText)findViewById(R.id.urlfield);
+        mProgressBar = (ProgressBar)findViewById(R.id.progressbar);
+
+        mServoView.setClient(this);
+        mBackButton.setEnabled(false);
+        mFwdButton.setEnabled(false);
+
+        mServoView.requestFocus();
+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+          File sdcard = getExternalFilesDir("");
+          String host = sdcard.toPath().resolve("android_hosts").toString();
+          try {
+            Os.setenv("HOST_FILE", host, false);
+          } catch (ErrnoException e) {
+            e.printStackTrace();
+          }
+        }
+
+        String args = getIntent().getStringExtra("servoargs");
+        if (args != null) {
+          mServoView.setServoArgs(args);
+        }
+
+        setupUrlField();
+    }
+
+    private void setupUrlField() {
+        mUrlField.setOnEditorActionListener((v, actionId, event) -> {
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
+                loadUrlFromField();
+                mServoView.requestFocus();
+                return true;
+            }
+            return false;
+        });
+        mUrlField.setOnFocusChangeListener((v, hasFocus) -> {
+            if(v.getId() == R.id.urlfield && !hasFocus) {
+                InputMethodManager imm =  (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                assert imm != null;
+                imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+            }
+        });
+    }
+
+    private void loadUrlFromField() {
+        String text = mUrlField.getText().toString();
+        text = text.trim();
+        String uri;
+
+        if (text.contains(" ") || !text.contains(".")) {
+            uri =  URLUtil.composeSearchUrl(text, "https://duckduckgo.com/html/?q=%s", "%s");
+        } else {
+            uri = URLUtil.guessUrl(text);
+        }
+
+        mServoView.loadUri(Uri.parse(uri));
+    }
+
+    public void onReloadClicked(View v) {
+        mServoView.reload();
+    }
+
+    public void onBackClicked(View v) {
+        mServoView.goBack();
+    }
+
+    public void onForwardClicked(View v) {
+        mServoView.goForward();
+    }
+
+    public void onStopClicked(View v) {
+        mServoView.stop();
+    }
+
+    @Override
+    public void onLoadStarted() {
+        mReloadButton.setEnabled(false);
+        mStopButton.setEnabled(true);
+        mReloadButton.setVisibility(View.GONE);
+        mStopButton.setVisibility(View.VISIBLE);
+        mProgressBar.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void onLoadEnded() {
+        mReloadButton.setEnabled(true);
+        mStopButton.setEnabled(false);
+        mReloadButton.setVisibility(View.VISIBLE);
+        mStopButton.setVisibility(View.GONE);
+        mProgressBar.setVisibility(View.INVISIBLE);
+    }
+
+    @Override
+    public void onTitleChanged(String title) {
+    }
+
+    @Override
+    public void onUrlChanged(String url) {
+        mUrlField.setText(url);
+    }
+
+    @Override
+    public void onHistoryChanged(boolean canGoBack, boolean canGoForward) {
+        mBackButton.setEnabled(canGoBack);
+        mFwdButton.setEnabled(canGoForward);
+    }
+
+}

support/android/apk/servoapp/src/main/java/com/mozilla/servoview/NativeServo.java

@@ -0,0 +1,57 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package com.mozilla.servoview;
+
+import android.app.Activity;
+
+/**
+ * Maps /ports/libsimpleservo API
+ */
+public class NativeServo {
+    public native String version();
+    public native void init(Activity activity,
+                            String args,
+                            String url,
+                            WakeupCallback wakeup,
+                            ReadFileCallback readfile,
+                            ServoCallbacks callbacks,
+                            int width, int height, boolean log);
+    public native void setBatchMode(boolean mode);
+    public native void performUpdates();
+    public native void resize(int width, int height);
+    public native void reload();
+    public native void stop();
+    public native void goBack();
+    public native void goForward();
+    public native void loadUri(String uri);
+    public native void scrollStart(int dx, int dy, int x, int y);
+    public native void scroll(int dx, int dy, int x, int y);
+    public native void scrollEnd(int dx, int dy, int x, int y);
+    public native void click(int x, int y);
+
+    NativeServo() {
+        System.loadLibrary("c++_shared");
+        System.loadLibrary("simpleservo");
+    }
+
+    public interface ReadFileCallback {
+        byte[] readfile(String file);
+    }
+
+    public interface WakeupCallback {
+        void wakeup();
+    }
+
+    public interface ServoCallbacks {
+        void flush();
+        void onLoadStarted();
+        void onLoadEnded();
+        void onTitleChanged(String title);
+        void onUrlChanged(String url);
+        void onHistoryChanged(boolean canGoBack, boolean canGoForward);
+        void onAnimatingChanged(boolean animating);
+    }
+}

support/android/apk/servoapp/src/main/java/com/mozilla/servoview/ServoGLRenderer.java

@@ -0,0 +1,32 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package com.mozilla.servoview;
+
+import android.opengl.GLES31;
+import android.opengl.GLSurfaceView;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+public class ServoGLRenderer implements GLSurfaceView.Renderer {
+
+    private final ServoView mView;
+
+    ServoGLRenderer(ServoView view) {
+        mView = view;
+    }
+
+    public void onSurfaceCreated(GL10 unused, EGLConfig config) {
+        mView.onGLReady();
+    }
+
+    public void onDrawFrame(GL10 unused) {
+    }
+
+    public void onSurfaceChanged(GL10 unused, int width, int height) {
+        GLES31.glViewport(0, 0, width, height);
+        mView.onSurfaceResized(width, height);
+    }
+}

support/android/apk/servoapp/src/main/java/com/mozilla/servoview/ServoView.java

@@ -0,0 +1,281 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package com.mozilla.servoview;
+
+import android.app.Activity;
+import android.os.Build;
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.net.Uri;
+import android.opengl.GLSurfaceView;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Choreographer;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.widget.OverScroller;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ServoView extends GLSurfaceView implements GestureDetector.OnGestureListener, Choreographer.FrameCallback {
+
+    private static final String LOGTAG = "ServoView";
+
+    private Activity mActivity;
+    private NativeServo mServo;
+    private Client mClient = null;
+    private Uri mInitialUri = null;
+    private boolean mAnimating;
+    private String mServoArgs = "";
+
+    public ServoView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mActivity = (Activity) context;
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        setWillNotCacheDrawing(false);
+        setEGLContextClientVersion(3);
+        setEGLConfigChooser(8, 8, 8, 8, 24, 0);
+        ServoGLRenderer mRenderer = new ServoGLRenderer(this);
+        setRenderer(mRenderer);
+        mServo = new NativeServo();
+        setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+        initGestures(context);
+    }
+
+    public void setServoArgs(String args) {
+      mServoArgs = args;
+    }
+
+    public void reload() {
+        queueEvent(() -> mServo.reload());
+    }
+
+    public void goBack() {
+        queueEvent(() -> mServo.goBack());
+    }
+
+    public void goForward() {
+        queueEvent(() -> mServo.goForward());
+    }
+
+    public void stop() {
+        queueEvent(() -> mServo.stop());
+    }
+
+    public void onSurfaceResized(int width, int height) {
+        queueEvent(() -> mServo.resize(width, height));
+    }
+
+    public void loadUri(Uri uri) {
+        if (mServo != null) {
+            queueEvent(() -> mServo.loadUri(uri.toString()));
+        } else {
+            mInitialUri = uri;
+        }
+    }
+
+    class WakeupCallback implements NativeServo.WakeupCallback {
+        public void wakeup() {
+            queueEvent(() -> mServo.performUpdates());
+        };
+    }
+
+    class ReadFileCallback implements NativeServo.ReadFileCallback {
+        public byte[] readfile(String file) {
+            try {
+                AssetManager assetMgr = getContext().getResources().getAssets();
+                InputStream stream = assetMgr.open(file);
+                byte[] bytes = new byte[stream.available()];
+                stream.read(bytes);
+                stream.close();
+                return bytes;
+            } catch (IOException e) {
+                Log.e(LOGTAG, e.getMessage());
+                return null;
+            }
+        }
+    }
+
+    class ServoCallbacks implements NativeServo.ServoCallbacks {
+        public void flush() {
+            requestRender();
+        }
+
+        public void onLoadStarted() {
+            if (mClient != null) {
+                post(() -> mClient.onLoadStarted());
+            }
+        }
+
+        public void onLoadEnded() {
+            if (mClient != null) {
+                post(() -> mClient.onLoadEnded());
+            }
+        }
+
+        public void onTitleChanged(final String title) {
+            if (mClient != null) {
+                post(() -> mClient.onTitleChanged(title));
+            }
+        }
+
+        public void onUrlChanged(final String url) {
+            if (mClient != null) {
+                post(() -> mClient.onUrlChanged(url));
+            }
+        }
+
+        public void onHistoryChanged(final boolean canGoBack, final boolean canGoForward) {
+            if (mClient != null) {
+                post(() -> mClient.onHistoryChanged(canGoBack, canGoForward));
+            }
+        }
+
+        public void onAnimatingChanged(final boolean animating) {
+            if (!mAnimating && animating) {
+                post(() -> Choreographer.getInstance().postFrameCallback(ServoView.this));
+            }
+            mAnimating = animating;
+        }
+    }
+
+    public void onGLReady() {
+        final WakeupCallback c1 = new WakeupCallback();
+        final ReadFileCallback c2 = new ReadFileCallback();
+        final ServoCallbacks c3 = new ServoCallbacks();
+        final boolean showLogs = true;
+        int width = getWidth();
+        int height = getHeight();
+        queueEvent(() -> {
+            String uri = mInitialUri == null ? null : mInitialUri.toString();
+            mServo.init(mActivity, mServoArgs, uri, c1, c2, c3, width, height, showLogs);
+        });
+    }
+
+    public interface Client {
+        void onLoadStarted();
+        void onLoadEnded();
+        void onTitleChanged(String title);
+        void onUrlChanged(String url);
+        void onHistoryChanged(boolean canGoBack, boolean canGoForward);
+    }
+
+    public void setClient(Client client) {
+        mClient = client;
+    }
+
+    // Scroll and click
+
+    private GestureDetector mGestureDetector;
+    private OverScroller mScroller;
+    private int mLastX = 0;
+    private int mCurX = 0;
+    private int mLastY = 0;
+    private int mCurY = 0;
+    private boolean mFlinging;
+
+    private void initGestures(Context context) {
+        mGestureDetector = new GestureDetector(context, this);
+        mScroller = new OverScroller(context);
+    }
+
+    @Override
+    public void doFrame(long frameTimeNanos) {
+
+        if (mScroller.isFinished() && mFlinging) {
+            mFlinging = false;
+            queueEvent(() -> mServo.scrollEnd(0, 0, mCurX, mCurY));
+            if (!mAnimating) {
+                // Not scrolling. Not animating. We don't need to schedule
+                // another frame.
+                return;
+            }
+        }
+
+        if (mFlinging) {
+            mScroller.computeScrollOffset();
+            mCurX = mScroller.getCurrX();
+            mCurY = mScroller.getCurrY();
+        }
+
+        int dx = mCurX - mLastX;
+        int dy = mCurY - mLastY;
+
+        mLastX = mCurX;
+        mLastY = mCurY;
+
+        if (dx != 0 || dy != 0) {
+            queueEvent(() -> mServo.scroll(dx, dy, mCurX, mCurY));
+        } else {
+            if (mAnimating) {
+                requestRender();
+            }
+        }
+
+        Choreographer.getInstance().postFrameCallback(this);
+    }
+
+    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+        mFlinging = true;
+
+        // FIXME: magic values
+        // https://github.com/servo/servo/issues/20361
+        int mPageWidth = 80000;
+        int mPageHeight = 80000;
+        mCurX = velocityX < 0 ? mPageWidth : 0;
+        mLastX = mCurX;
+        mCurY = velocityY < 0 ? mPageHeight : 0;
+        mLastY = mCurY;
+        mScroller.fling(mCurX, mCurY, (int)velocityX, (int)velocityY, 0, mPageWidth, 0, mPageHeight);
+        return true;
+    }
+
+    public boolean onDown(MotionEvent e) {
+        mScroller.forceFinished(true);
+        return true;
+    }
+
+    public boolean onTouchEvent(final MotionEvent e) {
+        mGestureDetector.onTouchEvent(e);
+
+        int action = e.getActionMasked();
+        switch(action) {
+            case (MotionEvent.ACTION_DOWN):
+                mCurX = (int)e.getX();
+                mLastX = mCurX;
+                mCurY = (int)e.getY();
+                mLastY = mCurY;
+                mScroller.forceFinished(true);
+                queueEvent(() -> mServo.scrollStart(0, 0, mCurX, mCurY));
+                Choreographer.getInstance().postFrameCallback(this);
+                return true;
+            case (MotionEvent.ACTION_MOVE):
+                mCurX = (int)e.getX();
+                mCurY = (int)e.getY();
+                return true;
+            case (MotionEvent.ACTION_UP):
+            case (MotionEvent.ACTION_CANCEL):
+                if (!mFlinging) {
+                    queueEvent(() -> mServo.scrollEnd(0, 0, mCurX, mCurY));
+                    Choreographer.getInstance().removeFrameCallback(this);
+                }
+                return true;
+            default:
+                return true;
+        }
+    }
+
+    public boolean onSingleTapUp(MotionEvent e) {
+        queueEvent(() -> mServo.click((int)e.getX(), (int)e.getY()));
+        return false;
+    }
+
+    public void onLongPress(MotionEvent e) { }
+    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { return true; }
+    public void onShowPress(MotionEvent e) { }
+
+}

support/android/apk/servoapp/src/main/res/layout/activity_main.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.mozilla.servo.MainActivity">
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/backbutton"
+                style="@android:style/Widget.Material.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:onClick="onBackClicked"
+                android:text="Back"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/forwardbutton"
+                style="@android:style/Widget.Material.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:onClick="onForwardClicked"
+                android:text="Fwd"
+                android:textSize="10sp" />
+
+            <EditText
+                android:id="@+id/urlfield"
+                style="@android:style/Widget.Material.EditText"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:ems="10"
+                android:hint="URL or Search"
+                android:inputType="textUri"
+                android:selectAllOnFocus="true"
+                android:singleLine="true"
+                android:imeOptions="actionDone"/>
+
+            <ProgressBar
+                android:id="@+id/progressbar"
+                style="@android:style/Widget.ProgressBar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:indeterminate="true" />
+
+            <Button
+                android:id="@+id/stopbutton"
+                style="@android:style/Widget.Material.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:onClick="onStopClicked"
+                android:text="Stop"
+                android:textSize="10sp" />
+
+            <Button
+                android:id="@+id/reloadbutton"
+                style="@android:style/Widget.Material.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:onClick="onReloadClicked"
+                android:text="Rld"
+                android:textSize="10sp" />
+
+        </LinearLayout>
+
+        <com.mozilla.servoview.ServoView
+            android:id="@+id/servoview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="true"/>
+
+    </LinearLayout>
+</android.support.constraint.ConstraintLayout>

support/android/apk/servoapp/src/main/res/values/colors.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>

support/android/apk/servoapp/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Servo</string>
+</resources>

support/android/apk/servoapp/src/main/res/values/styles.xml

@@ -0,0 +1,8 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+    </style>
+
+</resources>