diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-24 17:09:42 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 12:11:02 +0100 |
| commit | 54f544cbda37ca8c466cc37f8f13c7f2bd9f1dc1 (patch) | |
| tree | 81b57f4346057dbe4ea06f9ddd4437656eb41e07 /WebCore | |
| parent | 52ea66021a4090d8e3d781f980c2f8cf0cc4c703 (diff) | |
| download | external_webkit-54f544cbda37ca8c466cc37f8f13c7f2bd9f1dc1.zip external_webkit-54f544cbda37ca8c466cc37f8f13c7f2bd9f1dc1.tar.gz external_webkit-54f544cbda37ca8c466cc37f8f13c7f2bd9f1dc1.tar.bz2 | |
Merge WebKit at r59636: Fix Android ifdef, commas moved upstream.
http://trac.webkit.org/changeset/59035/trunk/WebCore/bridge/npapi.h#file0
Change-Id: I03b28d93e229f5a0f7dbc918c0234a549bb73071
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bridge/npapi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h index 54d01bd..c7705b7 100644 --- a/WebCore/bridge/npapi.h +++ b/WebCore/bridge/npapi.h @@ -340,10 +340,10 @@ typedef enum { /* Used when the plugin returns 0 from NPN_WriteReady and wishes the browser * to wait a certain amount of millis before calling NPN_WriteReady again. */ - NPPDataDeliveryDelayMs = 100, + , NPPDataDeliveryDelayMs = 100 // TODO(reed): upstream - NPPFakeValueToForce32Bits = 0x7FFFFFFF + , NPPFakeValueToForce32Bits = 0x7FFFFFFF #endif } NPPVariable; |