summaryrefslogtreecommitdiffstats
path: root/WebCore/bridge/npapi.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-1/+1
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Fix build by removing PLATFORM macro from npapi.Andrei Popescu2010-03-301-1/+1
| | | | Change-Id: I57d350a8933a1a4825cebb7c81d4ae944375f258
* Ask the plugin how long to wait before calling NPN_WriteReady() again.Andrei Popescu2010-03-301-2/+7
| | | | Change-Id: I46b25a5869e91e0075913caca5e57380f72f6107
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-14/+24
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.Steve Block2009-10-281-0/+1
| | | | | | | | The files in question are npapi.h and npruntime.h. The Android versions at V8Bindings/npapi/ are identical to the WebKit versions, other than a couple of trivial changes, which are accounted for in this patch. Change-Id: I998a5863181283aa6153c84a745b1923d9b5721b
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-0/+15
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-8/+0
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-0/+8
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-2/+0
|
* Get WebKit r44544.Feng Qian2009-06-171-1/+15
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-9/+24
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-1/+1
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+838
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-838/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-0/+838