bug 882196 - Android crash in nsXPCWrappedJS::AddRef, remove nsAppShell::NotifyObservers r=kats

2013-06-17 17:09:09 -04:00
parent f12392615d
commit 21f2493d5e
10 changed files with 64 additions and 102 deletions
--- a/widget/android/AndroidJavaWrappers.h
+++ b/widget/android/AndroidJavaWrappers.h
@@ -707,9 +707,20 @@ public:
        NATIVE_GESTURE_EVENT = 31,
        IME_KEY_EVENT = 32,
        CALL_OBSERVER = 33,
+        LOW_MEMORY = 34,
+        NETWORK_LINK_CHANGE = 35,
        dummy_java_enum_list_end
    };

+    enum {
+        // Memory pressue levels, keep in sync with those in MemoryMonitor.java
+        MEMORY_PRESSURE_NONE = 0,
+        MEMORY_PRESSURE_CLEANUP = 1,
+        MEMORY_PRESSURE_LOW = 2,
+        MEMORY_PRESSURE_MEDIUM = 3,
+        MEMORY_PRESSURE_HIGH = 4
+    };
+
    enum {
        // Internal Gecko events
        IME_FLUSH_CHANGES = -2,