From 1e64f02bf73558164cbfcc5e8ebd4cc5615f1a5e Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Fri, 7 Jan 2011 14:11:29 -0500 Subject: [PATCH] Add basic test for retrieving the plugin's visible rect. Change-Id: I32f80587438060ebaa0cbfb5f992fb4baadcdf67 --- samples/BrowserPlugin/jni/animation/AnimationPlugin.cpp | 7 ++++++- samples/BrowserPlugin/jni/main.cpp | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/samples/BrowserPlugin/jni/animation/AnimationPlugin.cpp b/samples/BrowserPlugin/jni/animation/AnimationPlugin.cpp index 58999adc4..f9af879db 100644 --- a/samples/BrowserPlugin/jni/animation/AnimationPlugin.cpp +++ b/samples/BrowserPlugin/jni/animation/AnimationPlugin.cpp @@ -34,7 +34,7 @@ extern ANPCanvasInterfaceV0 gCanvasI; extern ANPPaintInterfaceV0 gPaintI; extern ANPPathInterfaceV0 gPathI; extern ANPSystemInterfaceV0 gSystemI; -extern ANPWindowInterfaceV0 gWindowI; +extern ANPWindowInterfaceV1 gWindowI; static uint16_t rnd16(float x, int inset) { int ix = (int)roundf(x) + inset; @@ -119,6 +119,11 @@ void BallAnimation::showEntirePluginOnScreen() { PluginObject *obj = (PluginObject*) instance->pdata; NPWindow *window = obj->window; + // log the current visible rect + ANPRectI visibleRect = gWindowI.visibleRect(instance); + gLogI.log(kDebug_ANPLogType, "Current VisibleRect: (%d,%d,%d,%d)", + visibleRect.left, visibleRect.top, visibleRect.right, visibleRect.bottom); + ANPRectI visibleRects[1]; visibleRects[0].left = 0; diff --git a/samples/BrowserPlugin/jni/main.cpp b/samples/BrowserPlugin/jni/main.cpp index a2dd667a7..98548485a 100644 --- a/samples/BrowserPlugin/jni/main.cpp +++ b/samples/BrowserPlugin/jni/main.cpp @@ -76,7 +76,7 @@ ANPPathInterfaceV0 gPathI; ANPSurfaceInterfaceV0 gSurfaceI; ANPSystemInterfaceV0 gSystemI; ANPTypefaceInterfaceV0 gTypefaceI; -ANPWindowInterfaceV0 gWindowI; +ANPWindowInterfaceV1 gWindowI; ANPOpenGLInterfaceV0 gOpenGLI; #define ARRAY_COUNT(array) (sizeof(array) / sizeof(array[0])) @@ -125,7 +125,7 @@ NPError NP_Initialize(NPNetscapeFuncs* browserFuncs, NPPluginFuncs* pluginFuncs, { kSurfaceInterfaceV0_ANPGetValue, sizeof(gSurfaceI), &gSurfaceI }, { kSystemInterfaceV0_ANPGetValue, sizeof(gSystemI), &gSystemI }, { kTypefaceInterfaceV0_ANPGetValue, sizeof(gTypefaceI), &gTypefaceI }, - { kWindowInterfaceV0_ANPGetValue, sizeof(gWindowI), &gWindowI }, + { kWindowInterfaceV1_ANPGetValue, sizeof(gWindowI), &gWindowI }, { kOpenGLInterfaceV0_ANPGetValue, sizeof(gOpenGLI), &gOpenGLI }, }; for (size_t i = 0; i < ARRAY_COUNT(gPairs); i++) {