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

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

Issue 558035: [GPU] Get GPU process running on the mac... (Closed) Base URL: svn://chrome-svn/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 37920)
+++ webkit/tools/pepper_test_plugin/plugin_object.cc (working copy)
@@ -34,8 +34,9 @@
#define CHECK(x)
#else
#include "base/logging.h"
+#include "build/build_config.h"
#include "gpu/command_buffer/client/gles2_demo_cc.h"
-#include "gpu/command_buffer/common/GLES2/gl2.h"
+#include <GLES2/gl2.h> // NOLINT
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
@@ -308,7 +309,10 @@
}
PluginObject::~PluginObject() {
+ // TODO(kbr): add audio portion of test
+#if !defined(OS_MACOSX)
deviceaudio_->destroyContext(npp_, &context_audio_);
+#endif
// FIXME(brettw) destroy the context.
browser->releaseobject(test_object_);
}
@@ -347,8 +351,11 @@
device3d_ = extensions->acquireDevice(npp_, NPPepper3DDevice);
CHECK(device3d_);
+ // TODO(kbr): add audio portion of test
+#if !defined(OS_MACOSX)
deviceaudio_ = extensions->acquireDevice(npp_, NPPepperAudioDevice);
CHECK(deviceaudio_);
+#endif
}
void PluginObject::SetWindow(const NPWindow& window) {
@@ -389,6 +396,8 @@
#endif
}
+ // TODO(kbr): put back in audio portion of test
+#if !defined(OS_MACOSX)
// testing any field would do
if (!context_audio_.config.callback) {
NPDeviceContextAudioConfig cfg;
@@ -401,6 +410,7 @@
cfg.callback = &SineWaveCallback<200, int16>;
deviceaudio_->initializeContext(npp_, &cfg, &context_audio_);
}
+#endif
}
void PluginObject::Draw3D() {
« 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