Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Unified Diff: webkit/tools/pepper_test_plugin/plugin_object.cc

Issue 546041: Make the Pepper test run on the mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/tools/pepper_test_plugin/plugin_object.cc
===================================================================
--- webkit/tools/pepper_test_plugin/plugin_object.cc (revision 36261)
+++ webkit/tools/pepper_test_plugin/plugin_object.cc (working copy)
@@ -25,9 +25,9 @@
#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)
@@ -56,7 +56,8 @@
};
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",
};
@@ -400,12 +401,11 @@
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);
« no previous file with comments | « webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp ('k') | webkit/tools/pepper_test_plugin/test_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698