am 8752c4d3: am f8ffa7ae: Merge "adding event to notify the plugin when it is on/off screen." into eclair-mr2

Merge commit '8752c4d3c7d623f1f6314e8b662d3626c849ca97'

* commit '8752c4d3c7d623f1f6314e8b662d3626c849ca97':
  adding event to notify the plugin when it is on/off screen.

1 files changed, 9 insertions, 1 deletions

diff --git a/WebKit/android/plugins/android_npapi.h b/WebKit/android/plugins/android_npapi.h
index 10f7ac9..4173528 100644
--- a/WebKit/android/plugins/android_npapi.h
+++ b/WebKit/android/plugins/android_npapi.h
@@ -847,7 +847,7 @@ enum ANPLifecycleActions {
     /** The web view containing this plugin has been paused.  See documentation
         on the android activity lifecycle for more information.
      */
-    kPause_ANPLifecycleAction            = 0,
+    kPause_ANPLifecycleAction           = 0,
     /** The web view containing this plugin has been resumed. See documentation
         on the android activity lifecycle for more information.
      */
@@ -879,6 +879,14 @@ enum ANPLifecycleActions {
         its original coordinates.
      */
     kExitFullScreen_ANPLifecycleAction  = 7,
+    /** The plugin is visible to the user on the screen. This event will always
+        occur after a kOffScreen_ANPLifecycleAction event.
+     */
+    kOnScreen_ANPLifecycleAction        = 8,
+    /** The plugin is no longer visible to the user on the screen. This event
+        will always occur prior to an kOnScreen_ANPLifecycleAction event.
+     */
+    kOffScreen_ANPLifecycleAction       = 9,
 };
 typedef uint32_t ANPLifecycleAction;