summaryrefslogtreecommitdiffstats
path: root/WebCore/bridge/npapi.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-897/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-4/+2
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge Webkit at r68651 : Fix conflicts.Kristian Monsen2010-10-071-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChromeClient.h: Conflict due to ANDROID_INSTALLABLE_WEB_APPS http://trac.webkit.org/changeset/68031/trunk/WebCore/page/ChromeClient.h CSSParser.cpp: Conflict due to ANDROID_INSTRUMENT http://trac.webkit.org/changeset/68521/trunk/WebCore/css/CSSParser.cpp Node.cpp: Conflict due to ANDROID_DOM_LOGGING http://trac.webkit.org/changeset/68541/trunk/WebCore/dom/Node.cpp npapi.h: Conflicts due to various #ifdef ANDROID http://trac.webkit.org/changeset/68390/trunk/WebCore/bridge/npapi.h PlatformTouchEvent.h: PlatformTouchEventAndroid.cpp: PlatformTouchPoint.h: Conflicts due to new BREWMP code next to changed Android code Initial webkit CL: http://trac.webkit.org/changeset/68499 Later fix after merge revision, so cherry-picked: http://trac.webkit.org/changeset/69034 RenderBox.cpp: Several changes, conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68238#file2 http://trac.webkit.org/changeset/68239#file3 http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp The correct resolution here is unclear. A closer investiagtion by somebdoy more familiar with the code is tracked with b/3071198 RenderBox.h: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68417/trunk/WebCore/rendering/RenderBox.h RenderIFrame.cpp: Conflicts due to ANDROID_FLATTEN_IFRAME http://trac.webkit.org/changeset/68238/trunk/WebCore/rendering/RenderIFrame.cpp RenderTable.cpp: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68427/trunk/WebCore/rendering/RenderTable.cpp RenderView.cpp: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68436/trunk/WebCore/rendering/RenderView.cpp Settings.cpp: Settings.h: Conflicts due to ANDROID_PLUGINS and WEB_AUTOFILL http://trac.webkit.org/changeset/68166 Widget.cpp: http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.cpp Change-Id: I156f537ae0483b89e4c6b9fce0e7b2f931f957a2
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-0/+8
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r61871: Fix conflictsKristian Monsen2010-07-021-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | V8Proxy.cpp http://trac.webkit.org/changeset/61499 npapi.h: http://trac.webkit.org/changeset/61277 Document.cpp http://trac.webkit.org/changeset/61787 XMLDocumentParser.h: http://trac.webkit.org/changeset/61663 HTMLLinkElement.*: http://trac.webkit.org/changeset/61424 HTMLTableCellElement.cpp http://trac.webkit.org/changeset/61630 ResourceHandleAndroid.cpp: http://trac.webkit.org/changeset/61768 Change-Id: If991d3c112eeefd3098aa68b862c65798d505e1f
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-98/+194
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge WebKit at r59636: Fix Android ifdef, commas moved upstream.Kristian Monsen2010-05-251-2/+2
| | | | | | http://trac.webkit.org/changeset/59035/trunk/WebCore/bridge/npapi.h#file0 Change-Id: I03b28d93e229f5a0f7dbc918c0234a549bb73071
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-475/+418
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-82/+48
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* 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
generated by cgit v1.1 at 2025-03-14 02:03:49 +0000