Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

com.mozilla to org.mozilla

Browse source
This commit is contained in:
Paul Rouget 2018-09-28 11:37:38 +02:00
parent 057acdca2d
commit 6d543dec28
15 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
etc/run_in_headless_android_emulator.py
View file

@ -59,7 +59,7 @@ def main(avd_name, apk_path, *args):
json_params = shell_quote(json.dumps(args)) json_params = shell_quote(json.dumps(args))
extra = "-e servoargs " + json_params extra = "-e servoargs " + json_params
cmd = "am start " + extra + " com.mozilla.servo/com.mozilla.servo.MainActivity" cmd = "am start " + extra + " org.mozilla.servo/org.mozilla.servo.MainActivity"
check_call(adb + ["shell", cmd], stdout=sys.stderr) check_call(adb + ["shell", cmd], stdout=sys.stderr)
# Start showing logs as soon as the application starts, # Start showing logs as soon as the application starts,
@ -128,7 +128,7 @@ def check_call(*args, **kwargs):
def write_user_stylesheets(adb, args): def write_user_stylesheets(adb, args):
data_dir = "/sdcard/Android/data/com.mozilla.servo/files" data_dir = "/sdcard/Android/data/org.mozilla.servo/files"
check_call(adb + ["shell", "mkdir -p %s" % data_dir]) check_call(adb + ["shell", "mkdir -p %s" % data_dir])
for i, (pos, path) in enumerate(extract_args("--user-stylesheet", args)): for i, (pos, path) in enumerate(extract_args("--user-stylesheet", args)):
remote_path = "%s/user%s.css" % (data_dir, i) remote_path = "%s/user%s.css" % (data_dir, i)
@ -139,7 +139,7 @@ def write_user_stylesheets(adb, args):
def write_hosts_file(adb): def write_hosts_file(adb):
hosts_file = os.environ.get("HOST_FILE") hosts_file = os.environ.get("HOST_FILE")
if hosts_file: if hosts_file:
data_dir = "/sdcard/Android/data/com.mozilla.servo/files" data_dir = "/sdcard/Android/data/org.mozilla.servo/files"
check_call(adb + ["shell", "mkdir -p %s" % data_dir]) check_call(adb + ["shell", "mkdir -p %s" % data_dir])
remote_path = data_dir + "/android_hosts" remote_path = data_dir + "/android_hosts"
check_call(adb + ["push", hosts_file, remote_path], stdout=sys.stderr) check_call(adb + ["push", hosts_file, remote_path], stdout=sys.stderr)

36
ports/libsimpleservo/src/jniapi.rs
View file

@ -39,14 +39,14 @@ where
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_version(env: JNIEnv, _class: JClass) -> jstring { pub fn Java_org_mozilla_servoview_JNIServo_version(env: JNIEnv, _class: JClass) -> jstring {
let v = api::servo_version(); let v = api::servo_version();
let output = env.new_string(v).expect("Couldn't create java string"); let output = env.new_string(v).expect("Couldn't create java string");
output.into_inner() output.into_inner()
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_init( pub fn Java_org_mozilla_servoview_JNIServo_init(
env: JNIEnv, env: JNIEnv,
_: JClass, _: JClass,
activity: JObject, activity: JObject,
@ -122,7 +122,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_init(
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_setBatchMode( pub fn Java_org_mozilla_servoview_JNIServo_setBatchMode(
env: JNIEnv, env: JNIEnv,
_: JClass, _: JClass,
batch: jboolean, batch: jboolean,
@ -132,7 +132,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_setBatchMode(
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_resize( pub fn Java_org_mozilla_servoview_JNIServo_resize(
env: JNIEnv, env: JNIEnv,
_: JClass, _: JClass,
width: jint, width: jint,
@ -143,50 +143,50 @@ pub fn Java_com_mozilla_servoview_JNIServo_resize(
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_performUpdates(env: JNIEnv, _class: JClass) { pub fn Java_org_mozilla_servoview_JNIServo_performUpdates(env: JNIEnv, _class: JClass) {
debug!("performUpdates"); debug!("performUpdates");
call(env, |s| s.perform_updates()); call(env, |s| s.perform_updates());
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_loadUri(env: JNIEnv, _class: JClass, url: JString) { pub fn Java_org_mozilla_servoview_JNIServo_loadUri(env: JNIEnv, _class: JClass, url: JString) {
debug!("loadUri"); debug!("loadUri");
let url: String = env.get_string(url).unwrap().into(); let url: String = env.get_string(url).unwrap().into();
call(env, |s| s.load_uri(&url)); call(env, |s| s.load_uri(&url));
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_reload(env: JNIEnv, _class: JClass) { pub fn Java_org_mozilla_servoview_JNIServo_reload(env: JNIEnv, _class: JClass) {
debug!("reload"); debug!("reload");
call(env, |s| s.reload()); call(env, |s| s.reload());
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_stop(env: JNIEnv, _class: JClass) { pub fn Java_org_mozilla_servoview_JNIServo_stop(env: JNIEnv, _class: JClass) {
debug!("stop"); debug!("stop");
call(env, |s| s.stop()); call(env, |s| s.stop());
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_refresh(env: JNIEnv, _class: JClass) { pub fn Java_org_mozilla_servoview_JNIServo_refresh(env: JNIEnv, _class: JClass) {
debug!("refresh"); debug!("refresh");
call(env, |s| s.refresh()); call(env, |s| s.refresh());
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_goBack(env: JNIEnv, _class: JClass) { pub fn Java_org_mozilla_servoview_JNIServo_goBack(env: JNIEnv, _class: JClass) {
debug!("goBack"); debug!("goBack");
call(env, |s| s.go_back()); call(env, |s| s.go_back());
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_goForward(env: JNIEnv, _class: JClass) { pub fn Java_org_mozilla_servoview_JNIServo_goForward(env: JNIEnv, _class: JClass) {
debug!("goForward"); debug!("goForward");
call(env, |s| s.go_forward()); call(env, |s| s.go_forward());
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_scrollStart( pub fn Java_org_mozilla_servoview_JNIServo_scrollStart(
env: JNIEnv, env: JNIEnv,
_: JClass, _: JClass,
dx: jint, dx: jint,
@ -199,7 +199,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_scrollStart(
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_scrollEnd( pub fn Java_org_mozilla_servoview_JNIServo_scrollEnd(
env: JNIEnv, env: JNIEnv,
_: JClass, _: JClass,
dx: jint, dx: jint,
@ -213,7 +213,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_scrollEnd(
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_scroll( pub fn Java_org_mozilla_servoview_JNIServo_scroll(
env: JNIEnv, env: JNIEnv,
_: JClass, _: JClass,
dx: jint, dx: jint,
@ -226,7 +226,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_scroll(
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_pinchZoomStart( pub fn Java_org_mozilla_servoview_JNIServo_pinchZoomStart(
env: JNIEnv, env: JNIEnv,
_: JClass, _: JClass,
factor: jfloat, factor: jfloat,
@ -238,7 +238,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_pinchZoomStart(
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_pinchZoom( pub fn Java_org_mozilla_servoview_JNIServo_pinchZoom(
env: JNIEnv, env: JNIEnv,
_: JClass, _: JClass,
factor: jfloat, factor: jfloat,
@ -250,7 +250,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_pinchZoom(
} }
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_pinchZoomEnd( pub fn Java_org_mozilla_servoview_JNIServo_pinchZoomEnd(
env: JNIEnv, env: JNIEnv,
_: JClass, _: JClass,
factor: jfloat, factor: jfloat,
@ -263,7 +263,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_pinchZoomEnd(
#[no_mangle] #[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_click(env: JNIEnv, _: JClass, x: jint, y: jint) { pub fn Java_org_mozilla_servoview_JNIServo_click(env: JNIEnv, _: JClass, x: jint, y: jint) {
debug!("click"); debug!("click");
call(env, |s| s.click(x as u32, y as u32)); call(env, |s| s.click(x as u32, y as u32));
} }

2
python/servo/devenv_commands.py
View file

@ -318,7 +318,7 @@ class MachCommands(CommandBase):
ndk_gdb, ndk_gdb,
"--adb", adb_path, "--adb", adb_path,
"--project", "support/android/apk/servoapp/src/main/", "--project", "support/android/apk/servoapp/src/main/",
"--launch", "com.mozilla.servo.MainActivity", "--launch", "org.mozilla.servo.MainActivity",
"-x", f.name, "-x", f.name,
"--verbose", "--verbose",
], env=env) ], env=env)

6
python/servo/post_build_commands.py
View file

@ -95,7 +95,7 @@ class PostBuildCommands(CommandBase):
print("https://github.com/servo/servo/wiki/Building-for-Android#debugging-on-device") print("https://github.com/servo/servo/wiki/Building-for-Android#debugging-on-device")
return return
script = [ script = [
"am force-stop com.mozilla.servo", "am force-stop org.mozilla.servo",
] ]
json_params = shell_quote(json.dumps(params)) json_params = shell_quote(json.dumps(params))
extra = "-e servoargs " + json_params extra = "-e servoargs " + json_params
@ -103,9 +103,9 @@ class PostBuildCommands(CommandBase):
if rust_log: if rust_log:
extra += " -e servolog " + rust_log extra += " -e servolog " + rust_log
script += [ script += [
"am start " + extra + " com.mozilla.servo/com.mozilla.servo.MainActivity", "am start " + extra + " org.mozilla.servo/org.mozilla.servo.MainActivity",
"sleep 0.5", "sleep 0.5",
"echo Servo PID: $(pidof com.mozilla.servo)", "echo Servo PID: $(pidof org.mozilla.servo)",
"exit" "exit"
] ]
args = [self.android_adb_path(env)] args = [self.android_adb_path(env)]

2
support/android/apk/servoapp/build.gradle
View file

@ -10,7 +10,7 @@ android {
buildDir = rootDir.absolutePath + "/../../../target/gradle/servoapp" buildDir = rootDir.absolutePath + "/../../../target/gradle/servoapp"
defaultConfig { defaultConfig {
applicationId "com.mozilla.servo" applicationId "org.mozilla.servo"
minSdkVersion 18 minSdkVersion 18
targetSdkVersion 27 targetSdkVersion 27
versionCode 1 versionCode 1

2
support/android/apk/servoapp/src/main/AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- BEGIN_INCLUDE(manifest) --> <!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"
package="com.mozilla.servo"> package="org.mozilla.servo">
<uses-feature android:glEsVersion="0x00030000" android:required="true" /> <uses-feature android:glEsVersion="0x00030000" android:required="true" />
<uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/> <uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>

6
support/android/apk/servoapp/src/main/java/com/mozilla/servo/MainActivity.java → support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
View file

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package com.mozilla.servo; package org.mozilla.servo;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
@ -20,8 +20,8 @@ import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import com.mozilla.servoview.ServoView; import org.mozilla.servoview.ServoView;
import com.mozilla.servoview.Servo; import org.mozilla.servoview.Servo;
import java.io.File; import java.io.File;

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

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.mozilla.servo.MainActivity"> tools:context="org.mozilla.servo.MainActivity">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
@ -95,7 +95,7 @@
</LinearLayout> </LinearLayout>
<com.mozilla.servoview.ServoView <org.mozilla.servoview.ServoView
android:id="@+id/servoview" android:id="@+id/servoview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
support/android/apk/servoview/src/googlevr/AndroidManifest.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- BEGIN_INCLUDE(manifest) --> <!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.mozilla.servoview"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.servoview">
<application> <application>
<activity android:name=".MainActivity" <activity android:name=".MainActivity"
android:screenOrientation="landscape" android:screenOrientation="landscape"

2
support/android/apk/servoview/src/main/AndroidManifest.xml
View file

@ -1,2 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mozilla.servoview" /> package="org.mozilla.servoview" />

2
support/android/apk/servoview/src/main/java/com/mozilla/servoview/JNIServo.java → support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java
View file

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package com.mozilla.servoview; package org.mozilla.servoview;
import android.app.Activity; import android.app.Activity;

2
support/android/apk/servoview/src/main/java/com/mozilla/servoview/Servo.java → support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java
View file

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package com.mozilla.servoview; package org.mozilla.servoview;
import android.app.Activity; import android.app.Activity;
import android.content.res.AssetManager; import android.content.res.AssetManager;

8
support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoSurface.java → support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoSurface.java
View file

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package com.mozilla.servoview; package org.mozilla.servoview;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
@ -20,9 +20,9 @@ import android.os.Message;
import android.util.Log; import android.util.Log;
import android.view.Surface; import android.view.Surface;
import com.mozilla.servoview.Servo.Client; import org.mozilla.servoview.Servo.Client;
import com.mozilla.servoview.Servo.GfxCallbacks; import org.mozilla.servoview.Servo.GfxCallbacks;
import com.mozilla.servoview.Servo.RunCallback; import org.mozilla.servoview.Servo.RunCallback;
import static android.opengl.EGL14.EGL_CONTEXT_CLIENT_VERSION; import static android.opengl.EGL14.EGL_CONTEXT_CLIENT_VERSION;
import static android.opengl.EGL14.EGL_OPENGL_ES2_BIT; import static android.opengl.EGL14.EGL_OPENGL_ES2_BIT;

8
support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoView.java → support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
View file

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package com.mozilla.servoview; package org.mozilla.servoview;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
@ -19,9 +19,9 @@ import android.view.MotionEvent;
import android.view.ScaleGestureDetector; import android.view.ScaleGestureDetector;
import android.widget.OverScroller; import android.widget.OverScroller;
import com.mozilla.servoview.Servo.Client; import org.mozilla.servoview.Servo.Client;
import com.mozilla.servoview.Servo.GfxCallbacks; import org.mozilla.servoview.Servo.GfxCallbacks;
import com.mozilla.servoview.Servo.RunCallback; import org.mozilla.servoview.Servo.RunCallback;
import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10; import javax.microedition.khronos.opengles.GL10;

2
support/android/apk/servoview/src/oculusvr/AndroidManifest.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- BEGIN_INCLUDE(manifest) --> <!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.mozilla.servoview">> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.servoview">>
<application> <application>
<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/> <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
<activity android:name=".MainActivity" android:screenOrientation="landscape"> <activity android:name=".MainActivity" android:screenOrientation="landscape">