Revert 35649 - Make Pepper plugins work on Linux....

webkit/tools/pepper_test_plugin/plugin_object.cc

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "webkit/tools/pepper_test_plugin/plugin_object.h"
 
 #include <stdio.h>
 #include <string>
 
-#if defined(INDEPENDENT_PLUGIN)
-#define CHECK(x)
-#else
 #include "base/logging.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/client/gles2_demo_cc.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
-#endif
 #include "webkit/tools/pepper_test_plugin/event_handler.h"
 #include "webkit/tools/pepper_test_plugin/test_object.h"
 
 NPNetscapeFuncs* browser;
 
 namespace {
 
 // Properties ------------------------------------------------------------------
 
 enum {
@@ skipping 156 matching lines @@
   PluginHasMethod,
   PluginInvoke,
   PluginInvokeDefault,
   PluginHasProperty,
   PluginGetProperty,
   PluginSetProperty,
 };
 
 // Bitmap painting -------------------------------------------------------------
 
-#if defined(INDEPENDENT_PLUGIN)
-void DrawSampleBitmap(void *region, int width, int height) {
-  int32 *bitmap = reinterpret_cast<int32 *>(region);
-
-  for (int h = 0; h < height; ++h) {
-    uint8 opacity = (h * 0xff) / height;
-    for (int w = 0; w < width; ++w) {
-      // kudos to apatrick for noticing we're using premultiplied alpha
-      uint8 greenness = (w * opacity) / width;
-      *bitmap++ = (opacity << 24) | (greenness << 8);
-    }
-  }
-}
-#else
-void DrawSampleBitmap(void *region, int width, int height) {
-  SkBitmap bitmap;
-  bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
-  bitmap.setPixels(region);
-
-  SkCanvas canvas(bitmap);
+void DrawSampleBitmap(SkCanvas& canvas, int width, int height) {
   SkRect rect;
   rect.set(SkIntToScalar(0), SkIntToScalar(0),
            SkIntToScalar(width), SkIntToScalar(height));
   SkPath path;
   path.addOval(rect);
 
   // Create a gradient shader going from opaque green to transparent.
   SkPaint paint;
   paint.setAntiAlias(true);
 
   SkColor grad_colors[2];
   grad_colors[0] = SkColorSetARGB(0xFF, 0x00, 0xFF, 0x00);
   grad_colors[1] = SkColorSetARGB(0x00, 0x00, 0xFF, 0x00);
   SkPoint grad_points[2];
   grad_points[0].set(SkIntToScalar(0), SkIntToScalar(0));
   grad_points[1].set(SkIntToScalar(0), SkIntToScalar(height));
   paint.setShader(SkGradientShader::CreateLinear(
       grad_points, grad_colors, NULL, 2, SkShader::kRepeat_TileMode))
       ->safeUnref();
 
   canvas.drawPath(path, paint);
 }
-#endif
+
 void FlushCallback(NPP instance, NPDeviceContext* context,
                    NPError err, void* user_data) {
 }
 
 NPExtensions* extensions = NULL;
 
 }  // namespace
 
 
 // PluginObject ----------------------------------------------------------------
@@ skipping 36 matching lines @@
     browser->getvalue(npp_, NPNVPepperExtensions,
                       reinterpret_cast<void*>(&extensions));
     CHECK(extensions);
   }
   device2d_ = extensions->acquireDevice(npp_, NPPepper2DDevice);
   CHECK(device2d_);
 }
 
 void PluginObject::SetWindow(const NPWindow& window) {
   if (dimensions_ == 2) {
-    width_ = window.width;
-    height_ = window.height;
+    size_.set_width(window.width);
+    size_.set_height(window.height);
 
     NPDeviceContext2DConfig config;
     NPDeviceContext2D context;
     device2d_->initializeContext(npp_, &config, &context);
 
-    DrawSampleBitmap(context.region, width_, height_);
+    SkBitmap bitmap;
+    bitmap.setConfig(SkBitmap::kARGB_8888_Config, window.width, window.height);
+    bitmap.setPixels(context.region);
+
+    SkCanvas canvas(bitmap);
+    DrawSampleBitmap(canvas, window.width, window.height);
 
     // TODO(brettw) figure out why this cast is necessary, the functions seem to
     // match. Could be a calling convention mismatch?
     NPDeviceFlushContextCallbackPtr callback =
         reinterpret_cast<NPDeviceFlushContextCallbackPtr>(&FlushCallback);
     device2d_->flushContext(npp_, &context, callback, NULL);
   } else {
-#if !defined(INDEPENDENT_PLUGIN)
     if (!command_buffer_.get()) {
       if (!InitializeCommandBuffer())
         return;
     }
 
     gles2_implementation_->Viewport(0, 0, window.width, window.height);
 
     // Schedule the first call to Draw.
     browser->pluginthreadasynccall(npp_, Draw3DCallback, this);
-#endif
   }
 }
 
 void PluginObject::Draw3D() {
-#if !defined(INDEPENDENT_PLUGIN)
   // Render some stuff.
   gles2::g_gl_impl = gles2_implementation_.get();
   GLFromCPPTestFunction();
   gles2::GetGLContext()->SwapBuffers();
   helper_->Flush();
   gles2::g_gl_impl = NULL;
 
   // Schedule another call to Draw.
   browser->pluginthreadasynccall(npp_, Draw3DCallback, this);
-#endif
 }
 
 bool PluginObject::InitializeCommandBuffer() {
-#if !defined(INDEPENDENT_PLUGIN)
   const static int32 kCommandBufferSize = 512 * 1024;
   command_buffer_.reset(new CommandBufferPepper(npp_, browser));
   if (command_buffer_->Initialize(kCommandBufferSize)) {
     helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer_.get()));
     if (helper_->Initialize()) {
 
       const int32 kTransferBufferSize = 512 * 1024;
       int32 transfer_buffer_id =
           command_buffer_->CreateTransferBuffer(kTransferBufferSize);
       gpu::Buffer transfer_buffer =
           command_buffer_->GetTransferBuffer(transfer_buffer_id);
       if (transfer_buffer.ptr) {
         gles2_implementation_.reset(new gpu::gles2::GLES2Implementation(
             helper_.get(),
             transfer_buffer.size,
             transfer_buffer.ptr,
             transfer_buffer_id));
         return true;
       }
     }
 
     helper_.reset();
   }
 
   command_buffer_.reset();
-#endif
 
   return false;
 }