зеркало из https://github.com/mozilla/gecko-dev.git
Merge fx-team to m-c.
This commit is contained in:
Ryan VanderMeulen
Коммит
7b0d7d89be
|
|
@ -508,6 +508,9 @@
|
|||
</content>
|
||||
|
||||
<implementation>
|
||||
<constructor><![CDATA[
|
||||
this.style.pointerEvents = 'none';
|
||||
]]></constructor>
|
||||
<method name="adjustArrowPosition">
|
||||
<body><![CDATA[
|
||||
var arrow = document.getAnonymousElementByAttribute(this, "anonid", "arrow");
|
||||
|
|
@ -578,15 +581,21 @@
|
|||
]]></handler>
|
||||
<handler event="popupshown" phase="target"><![CDATA[
|
||||
this.setAttribute("panelopen", "true");
|
||||
//XXXgijs: this is sadfaces, reading styles right after we dirty layout, but
|
||||
//I don't know of a way around it.
|
||||
let container = document.getAnonymousElementByAttribute(this, "anonid", "container");
|
||||
let cs = getComputedStyle(container);
|
||||
let transitionProp = cs.transitionProperty;
|
||||
let transitionTime = parseFloat(cs.transitionDuration);
|
||||
if ((transitionProp.indexOf("transform") > -1 || transitionProp == "all") &&
|
||||
transitionTime > 0) {
|
||||
this.style.pointerEvents = 'none';
|
||||
let disablePointerEvents;
|
||||
if (!this.hasAttribute("disablepointereventsfortransition")) {
|
||||
let container = document.getAnonymousElementByAttribute(this, "anonid", "container");
|
||||
let cs = getComputedStyle(container);
|
||||
let transitionProp = cs.transitionProperty;
|
||||
let transitionTime = parseFloat(cs.transitionDuration);
|
||||
disablePointerEvents = (transitionProp.contains("transform") ||
|
||||
transitionProp == "all") &&
|
||||
transitionTime > 0;
|
||||
this.setAttribute("disablepointereventsfortransition", disablePointerEvents);
|
||||
} else {
|
||||
disablePointerEvents = this.getAttribute("disablepointereventsfortransition") == "true";
|
||||
}
|
||||
if (!disablePointerEvents) {
|
||||
this.style.removeProperty("pointer-events");
|
||||
}
|
||||
]]></handler>
|
||||
<handler event="transitionend"><![CDATA[
|
||||
|
|
@ -597,6 +606,9 @@
|
|||
]]></handler>
|
||||
<handler event="popuphidden" phase="target"><![CDATA[
|
||||
this.removeAttribute("panelopen");
|
||||
if (this.getAttribute("disablepointereventsfortransition") == "true") {
|
||||
this.style.pointerEvents = 'none';
|
||||
}
|
||||
]]></handler>
|
||||
</handlers>
|
||||
</binding>
|
||||
|
|
|
|||
|
|
@ -599,8 +599,8 @@ menuitem.subviewbutton@menuStateHover@,
|
|||
|
||||
panelview .toolbarbutton-1@buttonStateActive@,
|
||||
toolbarbutton.subviewbutton@buttonStateActive@,
|
||||
menu.subviewbutton@menuStateActive@
|
||||
menuitem.subviewbutton@menuStateActive@
|
||||
menu.subviewbutton@menuStateActive@,
|
||||
menuitem.subviewbutton@menuStateActive@,
|
||||
.widget-overflow-list .toolbarbutton-1@buttonStateActive@,
|
||||
#edit-controls@inAnyPanel@ > toolbarbutton@buttonStateActive@,
|
||||
#zoom-controls@inAnyPanel@ > toolbarbutton@buttonStateActive@ {
|
||||
|
|
|
|||
|
|
@ -21,15 +21,15 @@
|
|||
color: #f5f7fa;
|
||||
}
|
||||
|
||||
.theme-bg-darker {
|
||||
background-color: rgba(0,0,0,0.5);
|
||||
}
|
||||
|
||||
.theme-selected {
|
||||
background-color: #1d4f73;
|
||||
color: #f5f7fa; /* Light foreground text */
|
||||
}
|
||||
|
||||
.theme-bg-darker {
|
||||
background-color: rgba(0,0,0,0.5);
|
||||
}
|
||||
|
||||
.theme-bg-contrast,
|
||||
.variable-or-property:not([overridden])[changed] { /* contrast bg color to attract attention on a container */
|
||||
background: #a18650;
|
||||
|
|
|
|||
|
|
@ -21,15 +21,15 @@
|
|||
color: #f5f7fa;
|
||||
}
|
||||
|
||||
.theme-bg-darker {
|
||||
background: #EFEFEF;
|
||||
}
|
||||
|
||||
.theme-selected {
|
||||
background-color: #4c9ed9;
|
||||
color: #f5f7fa; /* Light foreground text */
|
||||
}
|
||||
|
||||
.theme-bg-darker {
|
||||
background: #EFEFEF;
|
||||
}
|
||||
|
||||
.theme-bg-contrast,
|
||||
.variable-or-property:not([overridden])[changed] { /* contrast bg color to attract attention on a container */
|
||||
background: #a18650;
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ endef
|
|||
|
||||
$(foreach jar,$(JAVA_JAR_TARGETS),\
|
||||
$(if $($(jar)_DEST),,$(error Missing $(jar)_DEST))\
|
||||
$(if $($(jar)_JAVAFILES),,$(error Missing $(jar)_JAVAFILES))\
|
||||
$(if $($(jar)_JAVAFILES) $($(jar)_PP_JAVAFILES),,$(error Must provide at least one of $(jar)_JAVAFILES and $(jar)_PP_JAVAFILES))\
|
||||
$(eval $(call java_jar_template,$($(jar)_DEST),$($(jar)_JAVAFILES) $($(jar)_PP_JAVAFILES),$($(jar)_EXTRA_JARS),$($(jar)_JAVAC_FLAGS)))\
|
||||
)
|
||||
endif #} JAVA_JAR_TARGETS
|
||||
|
|
|
|||
|
|
@ -164,6 +164,8 @@ public final class ANRReporter extends BroadcastReceiver
|
|||
}
|
||||
} catch (IOException e) {
|
||||
Log.w(LOGTAG, e);
|
||||
} catch (ClassCastException e) {
|
||||
Log.w(LOGTAG, e); // Bug 975436
|
||||
}
|
||||
// Check most common location one last time just in case
|
||||
File tracesFile = new File("/data/anr/traces.txt");
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ GARBAGE_DIRS += classes db jars res sync services generated
|
|||
JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
|
||||
|
||||
ALL_JARS = \
|
||||
gecko-R.jar \
|
||||
gecko-browser.jar \
|
||||
gecko-mozglue.jar \
|
||||
gecko-util.jar \
|
||||
|
|
|
|||
|
|
@ -567,7 +567,6 @@ public class Tabs implements GeckoEventListener {
|
|||
notifyListeners(tab, msg, "");
|
||||
}
|
||||
|
||||
// Throws if not initialized.
|
||||
public void notifyListeners(final Tab tab, final TabEvents msg, final Object data) {
|
||||
if (tab == null &&
|
||||
msg != TabEvents.RESTORED) {
|
||||
|
|
|
|||
|
|
@ -10,6 +10,13 @@ include('android-services.mozbuild')
|
|||
|
||||
thirdparty_source_dir = TOPSRCDIR + '/mobile/android/thirdparty/'
|
||||
|
||||
resjar = add_java_jar('gecko-R')
|
||||
resjar.sources = []
|
||||
resjar.generated_sources += [
|
||||
'org/mozilla/gecko/R.java',
|
||||
]
|
||||
resjar.javac_flags += ['-Xlint:all']
|
||||
|
||||
mgjar = add_java_jar('gecko-mozglue')
|
||||
mgjar.sources += [
|
||||
'mozglue/ByteBufferInputStream.java',
|
||||
|
|
@ -80,6 +87,7 @@ if CONFIG['MOZ_WEBRTC']:
|
|||
audio_root + 'WebRTCAudioDevice.java',
|
||||
]
|
||||
wrjar.extra_jars = [
|
||||
'gecko-R.jar',
|
||||
'gecko-browser.jar',
|
||||
'gecko-util.jar',
|
||||
'gecko-mozglue.jar',
|
||||
|
|
@ -398,7 +406,6 @@ gbjar.generated_sources += [ android_package_dir + f for f in [
|
|||
] ]
|
||||
gbjar.generated_sources += [
|
||||
'org/mozilla/gecko/AppConstants.java',
|
||||
'org/mozilla/gecko/R.java',
|
||||
'org/mozilla/gecko/SysInfo.java',
|
||||
'org/mozilla/gecko/widget/GeckoEditText.java',
|
||||
'org/mozilla/gecko/widget/GeckoImageButton.java',
|
||||
|
|
@ -415,6 +422,7 @@ if CONFIG['MOZ_CRASHREPORTER']:
|
|||
gbjar.sources += sync_java_files
|
||||
gbjar.generated_sources += sync_generated_java_files
|
||||
gbjar.extra_jars = [
|
||||
'gecko-R.jar',
|
||||
'gecko-mozglue.jar',
|
||||
'gecko-util.jar',
|
||||
'squareup-picasso.jar',
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mozilla.geckoview"
|
||||
package="org.mozilla.gecko"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0" >
|
||||
|
||||
|
|
|
|||
|
|
@ -44,8 +44,10 @@ package: $(properties_deps) FORCE
|
|||
# Make empty directories to fit an Android project structure
|
||||
$(MKDIR) -p bin gen libs/$(ANDROID_CPU_ARCH) src
|
||||
|
||||
# Copy the JARs
|
||||
# Copy the JARs, except for the jar containing org.mozilla.gecko.R.
|
||||
# org.mozilla.gecko.R will be provided by the embedding application.
|
||||
cp $(DEPTH)/mobile/android/base/*.jar libs/
|
||||
$(RM) libs/gecko-R.jar
|
||||
|
||||
# Copy the SOs
|
||||
cp $(_ABS_DIST)/bin/libmozglue.so $(_ABS_DIST)/bin/lib/libplugin-container.so libs/$(ANDROID_CPU_ARCH)/
|
||||
|
|
|
|||
|
|
@ -11,5 +11,5 @@
|
|||
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
||||
|
||||
# Project target.
|
||||
target=android-17
|
||||
target=android-16
|
||||
android.library=true
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
android:versionName="1.0" >
|
||||
|
||||
<uses-sdk android:minSdkVersion="8"
|
||||
android:targetSdkVersion="14" />
|
||||
android:targetSdkVersion="16" />
|
||||
|
||||
<uses-permission android:name="@ANDROID_BACKGROUND_TARGET_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
|
||||
<uses-permission android:name="@ANDROID_BACKGROUND_TARGET_PACKAGE_NAME@.permissions.FORMHISTORY_PROVIDER"/>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче