diff options
| author | dspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 01:01:46 +0000 |
|---|---|---|
| committer | dspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 01:01:46 +0000 |
| commit | 1c4a27a1e520211657891fc91eb2ece2a1340e7b (patch) | |
| tree | 11b20c0909d9448d999c9e0cddcb6591c1046149 /chrome/renderer/webplugin_delegate_pepper.cc | |
| parent | 62c6a8ac898529eb0bcf711cad499bf2618c851d (diff) | |
| download | chromium_src-1c4a27a1e520211657891fc91eb2ece2a1340e7b.zip chromium_src-1c4a27a1e520211657891fc91eb2ece2a1340e7b.tar.gz chromium_src-1c4a27a1e520211657891fc91eb2ece2a1340e7b.tar.bz2 | |
Add #include <string.h> so that the 64-bit nacl-g++ compiler has a definition
for memcpy in gles2_cmd_format.h. This fixes a build breakage in native
client.
Initialize |command_buffer_| to NULL to prevent a random crash during load of
a Pepper plugin on the Mac.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/777003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/webplugin_delegate_pepper.cc')
| -rw-r--r-- | chrome/renderer/webplugin_delegate_pepper.cc | 3 |
1 files changed, 3 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_)); |