summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/renderer/webplugin_delegate_pepper.cc3
-rw-r--r--gpu/command_buffer/common/gles2_cmd_format.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc
index b1d090c..e934737 100644
--- a/chrome/renderer/webplugin_delegate_pepper.cc
+++ b/chrome/renderer/webplugin_delegate_pepper.cc
@@ -871,6 +871,9 @@ WebPluginDelegatePepper::WebPluginDelegatePepper(
plugin_(NULL),
instance_(instance),
nested_delegate_(NULL),
+#if defined(ENABLE_GPU)
+ command_buffer_(NULL),
+#endif
method_factory3d_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
// For now we keep a window struct, although it isn't used.
memset(&window_, 0, sizeof(window_));
diff --git a/gpu/command_buffer/common/gles2_cmd_format.h b/gpu/command_buffer/common/gles2_cmd_format.h
index 7660eb5..965c212 100644
--- a/gpu/command_buffer/common/gles2_cmd_format.h
+++ b/gpu/command_buffer/common/gles2_cmd_format.h
@@ -21,6 +21,8 @@
#include <GLES2/gl2types.h> // NOLINT
#endif
+#include <string.h>
+
#include "../common/types.h"
#include "../common/bitfield_helpers.h"
#include "../common/cmd_buffer_common.h"