commit c0f26576955f8dd6ba7a58f9f55054fb3c0fa7d8
author Derek Sollenberger <djsollen@google.com> Thu Jul 16 11:38:02 2009 -0400
committer Derek Sollenberger <djsollen@google.com> Fri Jul 17 08:50:53 2009 -0400
tree cc3d116e100722f7dd1c92b0a0ca883b04159d9b
parent 7b627e8935bc6a63bd8ae1d7de056af9a4d0386e

Adding support for surface views. also removed subplugin's dependency on ANPCanvas.

samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp

diff --git a/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp b/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp
index 6e038f3..09f58cf 100644
--- a/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp
+++ b/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp
@@ -77,6 +77,20 @@
     return (model == kBitmap_ANPDrawingModel);
 }
 
+void BackgroundPlugin::drawPlugin(const ANPBitmap& bitmap, const ANPRectI& clip) {
+    ANPCanvas* canvas = gCanvasI.newCanvas(&bitmap);
+
+    ANPRectF clipR;
+    clipR.left = clip.left;
+    clipR.top = clip.top;
+    clipR.right = clip.right;
+    clipR.bottom = clip.bottom;
+    gCanvasI.clipRect(canvas, &clipR);
+
+    draw(canvas);
+    gCanvasI.deleteCanvas(canvas);
+}
+
 void BackgroundPlugin::draw(ANPCanvas* canvas) {
 
     gCanvasI.drawColor(canvas, 0xFFFFFFFF);
@@ -89,21 +103,6 @@
     gCanvasI.drawText(canvas, c, sizeof(c)-1, 10, -fm.fTop, m_paint);
 }
 
-static void drawPlugin(SubPlugin* plugin, const ANPBitmap& bitmap, const ANPRectI& clip) {
-
-   ANPCanvas* canvas = gCanvasI.newCanvas(&bitmap);
-
-    ANPRectF clipR;
-    clipR.left = clip.left;
-    clipR.top = clip.top;
-    clipR.right = clip.right;
-    clipR.bottom = clip.bottom;
-    gCanvasI.clipRect(canvas, &clipR);
-
-    plugin->draw(canvas);
-    gCanvasI.deleteCanvas(canvas);
-}
-
 int16 BackgroundPlugin::handleEvent(const ANPEvent* evt) {
     NPP instance = this->inst();
 
@@ -112,7 +111,7 @@
             switch (evt->data.draw.model) {
                 case kBitmap_ANPDrawingModel:
                     test_bitmap_transparency(evt);
-                    drawPlugin(this, evt->data.draw.data.bitmap, evt->data.draw.clip);
+                    drawPlugin(evt->data.draw.data.bitmap, evt->data.draw.clip);
                     return 1;
                 default:
                     break;   // unknown drawing model