A few small changes to make npapi header files useful in the...

A few small changes to make npapi header files useful in the
native client build (and in the toolchain, which is where the
#ifdef stuff comes from).


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=30759

[sehr (please use chromium), 2009-11-02 18:39:31]

John, Darin,

I have moved NaCl to use the Chrome NPAPI headers, but needed a few small
changes to work (1) with our warning-as-error level, and (2) with our exporter
into the NaCl SDK.  I'm open to alternative solutions, but since the changes for
(2) seemed only to be in Google modifications, I didn't think it was a big
problem.  Perhaps a more interesting problem is that changes to these header
files will then run the risk of breaking NaCl, but I think that's not a big
problem.

David

[darin (slow to review), 2009-11-02 18:51:42]

it seems like a good goal to not require consumers to have included any other
particular headers before npapi.h or npruntime.h.

http://codereview.chromium.org/342079/diff/1/3
File third_party/npapi/bindings/npapi.h (right):

http://codereview.chromium.org/342079/diff/1/3#newcode49
Line 49: #ifndef __native_client__
nit: should we include something for nacl that similarly defines int32, etc.?

http://codereview.chromium.org/342079/diff/1/2
File third_party/npapi/bindings/npruntime.h (right):

http://codereview.chromium.org/342079/diff/1/2#newcode77
Line 77: #include "bindings/npapi.h"
it might be nicer to just #include "npapi.h" outside of #ifdefs.

perhaps something like this:

#include "npapi.h"
#ifndef __native_client__
typedef uint8 uint8_t;
...
#endif

^^^ inherits base/basictypes.h from npapi.h

[sehr (please use chromium), 2009-11-02 19:00:38]

Thanks for the review.  Updated version uploaded.

http://codereview.chromium.org/342079/diff/1/3
File third_party/npapi/bindings/npapi.h (right):

http://codereview.chromium.org/342079/diff/1/3#newcode49
Line 49: #ifndef __native_client__
On 2009/11/02 18:51:42, darin wrote:
> nit: should we include something for nacl that similarly defines int32, etc.?

Since __native_client__ is only defined if we are in untrusted code, we can
include <stdint.h> here, which I have done.

http://codereview.chromium.org/342079/diff/1/2
File third_party/npapi/bindings/npruntime.h (right):

http://codereview.chromium.org/342079/diff/1/2#newcode77
Line 77: #include "bindings/npapi.h"
On 2009/11/02 18:51:42, darin wrote:
> it might be nicer to just #include "npapi.h" outside of #ifdefs.
> 
> perhaps something like this:
> 
> #include "npapi.h"
> #ifndef __native_client__
> typedef uint8 uint8_t;
> ...
> #endif
> 
> ^^^ inherits base/basictypes.h from npapi.h

I have hoisted the include of npapi.h outside of the ifdefs and included
<stdint.h> for the native client side.

[darin (slow to review), 2009-11-02 19:11:39]

LGTM

http://codereview.chromium.org/342079/diff/3001/4001
File third_party/npapi/bindings/npruntime.h (right):

http://codereview.chromium.org/342079/diff/3001/4001#newcode77
Line 77: #include "base/basictypes.h"
this line and the #include <stdint.h> are technically redundant since npapi.h is
included.  perhaps you are including them again just to be more explicit about
what this header file requires?

[sehr (please use chromium), 2009-11-02 19:18:40]

Thanks again.  Waiting for trybots to complete...

http://codereview.chromium.org/342079/diff/3001/4001
File third_party/npapi/bindings/npruntime.h (right):

http://codereview.chromium.org/342079/diff/3001/4001#newcode77
Line 77: #include "base/basictypes.h"
On 2009/11/02 19:11:39, darin wrote:
> this line and the #include <stdint.h> are technically redundant since npapi.h
is
> included.  perhaps you are including them again just to be more explicit about
> what this header file requires?

Good point.  Excessive inclusions removed.