| 8a0914b749bbe7da7768e07a7db5c6d4bb09472b |
15-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54731 : Initial merge by git
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
etscapePluginHostProxy.mm
etscapePluginInstanceProxy.h
etscapePluginInstanceProxy.mm
roxyInstance.mm
ebHostedNetscapePluginView.mm
ebKitPluginClient.defs
|
| 5e2bc6953fe6923165b8a5d7679939693a1d58d6 |
05-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54340 : Initial merge by git
Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
etscapePluginInstanceProxy.mm
|
| e5261c62245272b7442a8c5135a2bf85202de0a4 |
02-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54127 : Resolve conflicts in WebCore/bridge
Keep ours for generic bridge code as this is a work in progress.
Take theirs for conflicts on other platforms due to bridge changes.
Take theirs for updates for recently moved JSC JNI bridge.
Change-Id: I7db68450a369bb652755cc4b9555083c76b07510
roxyInstance.h
|
| d0825bca7fe65beaee391d30da42e937db621564 |
02-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
ostedNetscapePluginStream.h
ostedNetscapePluginStream.mm
etscapePluginHostManager.h
etscapePluginHostManager.mm
etscapePluginHostProxy.h
etscapePluginHostProxy.mm
etscapePluginInstanceProxy.h
etscapePluginInstanceProxy.mm
roxyInstance.h
roxyInstance.mm
ebHostedNetscapePluginView.h
ebHostedNetscapePluginView.mm
ebKitPluginClient.defs
ebKitPluginHost.defs
|
| 1325a8463a7f9bc2ec969c7728aba33e3de91a17 |
19-Jan-2010 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to WebCore/bridge/Bridge
See http://trac.webkit.org/changeset/53464
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in
PluginView.cpp to add a temporary ANDROID guard.
Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4
roxyInstance.h
|
| cac0f67c402d107cdb10971b95719e2ff9c7c76b |
05-Nov-2009 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
etscapePluginHostManager.h
etscapePluginHostManager.mm
etscapePluginHostProxy.mm
etscapePluginInstanceProxy.h
etscapePluginInstanceProxy.mm
roxyInstance.mm
ebHostedNetscapePluginView.mm
ebKitPluginHost.defs
|
| 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf |
08-Oct-2009 |
Steve Block <steveblock@google.com> |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
ostedNetscapePluginStream.h
ostedNetscapePluginStream.mm
etscapePluginInstanceProxy.h
etscapePluginInstanceProxy.mm
roxyInstance.mm
ebHostedNetscapePluginView.mm
ebKitPluginHost.defs
|
| 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 |
11-Aug-2009 |
Ben Murdoch <benm@google.com> |
Merge in WebKit r47029.
ostedNetscapePluginStream.h
ostedNetscapePluginStream.mm
etscapePluginHostManager.h
etscapePluginHostManager.mm
etscapePluginHostProxy.h
etscapePluginHostProxy.mm
etscapePluginInstanceProxy.h
etscapePluginInstanceProxy.mm
roxyInstance.h
roxyInstance.mm
ebHostedNetscapePluginView.h
ebHostedNetscapePluginView.mm
ebKitPluginClient.defs
ebKitPluginHost.defs
ebKitPluginHostTypes.h
|
| 563af33bc48281d19dce701398dbb88cb54fd7ec |
14-Apr-2009 |
Cary Clark <> |
AI 146110: add missing files to webkit
brings it in sync with webkit svn cl 42046
Automated import of CL 146110
ostedNetscapePluginStream.mm
etscapePluginHostManager.h
etscapePluginHostManager.mm
etscapePluginHostProxy.h
etscapePluginHostProxy.mm
etscapePluginInstanceProxy.h
etscapePluginInstanceProxy.mm
roxyInstance.h
roxyInstance.mm
ebHostedNetscapePluginView.h
ebHostedNetscapePluginView.mm
ebKitPluginClient.defs
ebKitPluginHost.defs
ebTextInputWindowController.h
ebTextInputWindowController.m
|
| 5ec837f49e9c57d4394ce64b853fd86269c8b340 |
25-Mar-2009 |
Cary Clark <> |
Automated import from //branches/master/...@141953,141953
ostedNetscapePluginStream.h
ostedNetscapePluginStream.mm
etscapePluginHostManager.h
etscapePluginHostManager.mm
etscapePluginHostProxy.h
etscapePluginHostProxy.mm
etscapePluginInstanceProxy.h
etscapePluginInstanceProxy.mm
roxyInstance.h
roxyInstance.mm
ebHostedNetscapePluginView.h
ebHostedNetscapePluginView.mm
ebKitPluginAgent.defs
ebKitPluginAgentReply.defs
ebKitPluginClient.defs
ebKitPluginHost.defs
ebKitPluginHostTypes.defs
ebKitPluginHostTypes.h
|