commit aceb2e3bdaf211fa9992c079dd8da7c9eeb1bcc7
author Chris Craik <ccraik@google.com> Thu Aug 04 17:41:20 2011 -0700
committer Chris Craik <ccraik@google.com> Tue Aug 09 16:34:30 2011 -0700
tree 757a5dad6be01876926e11bf4db321d03cdc4aa6
parent a131fa0b3a3aa4a2a913fb9d0b26521579ba9e2a

updated Animation Plugin for NativeWindow interface

bug:5114637

Uses new ANativeWindow plugin API, supports either software rendering or GL
rendering via flag in RenderingThread.h

Note: Currently crashes on close

Change-Id: Ia7338a6c38c0ca9db02c19814d99b29970cc7b8e

samples/BrowserPlugin/jni/main.cpp

diff --git a/samples/BrowserPlugin/jni/main.cpp b/samples/BrowserPlugin/jni/main.cpp
index 9854848..f6e3400 100644
--- a/samples/BrowserPlugin/jni/main.cpp
+++ b/samples/BrowserPlugin/jni/main.cpp
@@ -77,7 +77,7 @@
 ANPSystemInterfaceV0        gSystemI;
 ANPTypefaceInterfaceV0      gTypefaceI;
 ANPWindowInterfaceV1        gWindowI;
-ANPOpenGLInterfaceV0        gOpenGLI;
+ANPNativeWindowInterfaceV0  gNativeWindowI;
 
 #define ARRAY_COUNT(array)      (sizeof(array) / sizeof(array[0]))
 #define DEBUG_PLUGIN_EVENTS     0
@@ -115,18 +115,18 @@
         uint32_t        size;
         ANPInterface*   i;
     } gPairs[] = {
-        { kAudioTrackInterfaceV0_ANPGetValue,   sizeof(gSoundI),    &gSoundI },
-        { kBitmapInterfaceV0_ANPGetValue,       sizeof(gBitmapI),   &gBitmapI },
-        { kCanvasInterfaceV0_ANPGetValue,       sizeof(gCanvasI),   &gCanvasI },
-        { kEventInterfaceV0_ANPGetValue,        sizeof(gEventI),    &gEventI },
-        { kLogInterfaceV0_ANPGetValue,          sizeof(gLogI),      &gLogI },
-        { kPaintInterfaceV0_ANPGetValue,        sizeof(gPaintI),    &gPaintI },
-        { kPathInterfaceV0_ANPGetValue,         sizeof(gPathI),     &gPathI },
-        { kSurfaceInterfaceV0_ANPGetValue,      sizeof(gSurfaceI),  &gSurfaceI },
-        { kSystemInterfaceV0_ANPGetValue,       sizeof(gSystemI),   &gSystemI },
-        { kTypefaceInterfaceV0_ANPGetValue,     sizeof(gTypefaceI), &gTypefaceI },
-        { kWindowInterfaceV1_ANPGetValue,       sizeof(gWindowI),   &gWindowI },
-        { kOpenGLInterfaceV0_ANPGetValue,       sizeof(gOpenGLI),   &gOpenGLI },
+        { kAudioTrackInterfaceV0_ANPGetValue,   sizeof(gSoundI),        &gSoundI },
+        { kBitmapInterfaceV0_ANPGetValue,       sizeof(gBitmapI),       &gBitmapI },
+        { kCanvasInterfaceV0_ANPGetValue,       sizeof(gCanvasI),       &gCanvasI },
+        { kEventInterfaceV0_ANPGetValue,        sizeof(gEventI),        &gEventI },
+        { kLogInterfaceV0_ANPGetValue,          sizeof(gLogI),          &gLogI },
+        { kPaintInterfaceV0_ANPGetValue,        sizeof(gPaintI),        &gPaintI },
+        { kPathInterfaceV0_ANPGetValue,         sizeof(gPathI),         &gPathI },
+        { kSurfaceInterfaceV0_ANPGetValue,      sizeof(gSurfaceI),      &gSurfaceI },
+        { kSystemInterfaceV0_ANPGetValue,       sizeof(gSystemI),       &gSystemI },
+        { kTypefaceInterfaceV0_ANPGetValue,     sizeof(gTypefaceI),     &gTypefaceI },
+        { kWindowInterfaceV1_ANPGetValue,       sizeof(gWindowI),       &gWindowI },
+        { kNativeWindowInterfaceV0_ANPGetValue, sizeof(gNativeWindowI), &gNativeWindowI },
     };
     for (size_t i = 0; i < ARRAY_COUNT(gPairs); i++) {
         gPairs[i].i->inSize = gPairs[i].size;
@@ -234,6 +234,9 @@
                 obj->pluginType = kVideo_PluginType;
                 obj->activePlugin = new VideoPlugin(instance);
             }
+            else {
+                gLogI.log(kError_ANPLogType, "PluginType %s unknown!", argv[i]);
+            }
             break;
         }
     }