Make the Pepper test run on the mac.

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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * 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 <cmath>
 #include <limits>
-#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 {
   ID_PROPERTY_PROPERTY = 0,
   ID_PROPERTY_TEST_OBJECT,
   NUM_PROPERTY_IDENTIFIERS
 };
 
 static NPIdentifier plugin_property_identifiers[NUM_PROPERTY_IDENTIFIERS];
-static const NPUTF8* plugin_property_identifier_names[NUM_PROPERTY_IDENTIFIERS] = {
+static const NPUTF8*
+    plugin_property_identifier_names[NUM_PROPERTY_IDENTIFIERS] = {
   "property",
   "testObject",
 };
 
 // Methods ---------------------------------------------------------------------
 
 enum {
   ID_TEST_GET_PROPERTY = 0,
   ID_SET_TEXT_BOX,
   NUM_METHOD_IDENTIFIERS
@@ skipping 323 matching lines @@
   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;
+  static const 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;
 }