summaryrefslogtreecommitdiffstats
path: root/WebCore/plugins/PluginView.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-0/+4
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-0/+10
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-1/+5
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r60074: Fix conflictsSteve Block2010-05-271-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | DeviceOrientation - WebCore/Android.derived.jscbindings.mk - WebCore/Android.derived.v8bindings.mk - WebCore/page/Page.cpp Trivial - WebCore/css/CSSParser.cpp - WebCore/page/Settings.cpp - WebCore/page/Settings.h - WebCore/rendering/style/RenderStyle.h Code deletion - See http://trac.webkit.org/changeset/59749 - WebCore/html/HTMLTokenizer.cpp PluginView JSC guards uspstreaming - WebCore/plugins/PluginView.cpp - WebCore/plugins/PluginView.h Refactoring, see http://trac.webkit.org/changeset/59784 - WebCore/rendering/RenderLayer.cpp RenderBlock::columnGap() and columnRects() are now public, see http://trac.webkit.org/changeset/59784 - WebCore/rendering/RenderBlock.h Change-Id: I409c68d334d60c3854b4b0365c18e6f63884afa6
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-0/+8
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-15/+6
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Update Android to reflect upstreaming of PluginView JSC guards in WebKit ↵Steve Block2010-05-201-33/+9
| | | | | | | | change 59826 See http://trac.webkit.org/changeset/59826 Change-Id: Ia1e16f7fa71fe8b5740610e3caa4bfbf05391a0f
* Adds missing ENABLE(TOUCH_EVENTS) guards to Android-specific codeSteve Block2010-05-181-0/+2
| | | | | | | This will allow us to build with touch events disabled once we've merged https://bugs.webkit.org/show_bug.cgi?id=39222 Change-Id: Ia665e5e6c3b4169b6c5576aa26721d95e72934e9
* Merge Webkit at r58956: Update plugin code to use C99 types. See ↵Ben Murdoch2010-05-141-3/+3
| | | | | | http://trac.webkit.org/changeset/58590 Change-Id: I73f3f008a88e69962de831a98d40e8d23c3cce30
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-8/+6
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Add JSC guards around calls to JSLockSteve Block2010-05-111-0/+4
| | | | | | | This was added to WebKit in http://trac.webkit.org/changeset/55433. It does not cause problems on Chromium as they exclude this file from the build. Change-Id: I77e94d5c18d99fb24578416ef31e559f35386372
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-5/+93
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Fix merge conflictsSteve Block2010-04-271-30/+9
| | | | | | | | | | - Android.v8bindings.mk - Keep ours, conflict due to upstreaming of using DerivedSourcesAllInOne.cpp - V8Index.h - Keep ours, conflict due to upstreaming of touch events - GeolocationService.h - Take both, conflict due to Android-specific change for pausing service - PluginView.cpp - Take both, conflict due to Android-specific change to guard JSC headers - V8DOMWrapper.cpp - Keep ours, conflict due to addition of WORKERS guards Change-Id: Ib640e64caecbb8cb31272dbfbc18d95f32f9d126
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-7/+36
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Fill in appropriate referer URL plugin initiated resource loading.Shimeng (Simon) Wang2010-03-181-0/+16
| | | | | | | Didn't think of better way to code in the common code. Bug:2512527 Change-Id: Ie656ce1c399f238187045be41ece1fc2feefab90
* Fix the V8 NPObject reference count problem.Grace Kloba2010-03-161-1/+3
| | | | | | | | | | To match JSC version, after getNPObject() is called, the object should have ref count 2. One will be released in ~PluginView(). Another one will be released by the plugin. This should fix the crash of Flash using V8. Fix http://b/issue?id=2511963
* Actually call the script when plugins try to invoke scripts from v8Leon Clarke2010-03-111-5/+13
| | | | http://b/issue?id=2506729
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-5/+46
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Fix final trivial mergesSteve Block2010-02-041-7/+2
| | | | Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33
* Merge webkit.org at r54127 : Resolve conflicts in WebCore/bridgeSteve Block2010-02-041-3/+0
| | | | | | | | 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
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-10/+23
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Changes to make Bridge.h script-engine independent are completeSteve Block2010-01-271-5/+0
| | | | | | See https://bugs.webkit.org/show_bug.cgi?id=32154 Change-Id: I76355f3e002af505560a8a8cfce1c98322f66230
* Changing plugin setwindow() to use page coordinateGrace Kloba2010-01-201-7/+0
| | | | | | | | | | | | | | instead of frame as it is what Flash expects. For other port like Mac, it passes the window coordinate to the plugin. In Android, plugin always sees the full page and we use the visible screen rect to indicate whether it is visible. Change to use page coordinate across PluginView and PluginWidget for consistency. This should fix the problem Ben saw with plugin inside iframe (which is caused by a race condition) and the cnnn ad problem Adobe has.
* Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵Steve Block2010-01-191-1/+6
| | | | | | | | | | | | 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
* Don't call setNPWindowRect unless the plugin hasGrace Kloba2010-01-181-1/+1
| | | | started. Otherwise the plugin won't get the rect later as it thinks it is not changed.
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-7/+12
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-4/+0
| | | | | | | Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor. See http://trac.webkit.org/changeset/49608 Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-5/+11
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* changing how plugins gain/lose focus.Derek Sollenberger2009-10-271-0/+4
| | | | | | | | | | Previously we were keeping our own state in the UI thread to determine when to send events to the plugin. This change removes that logic and uses the document focus to determine when events are to be sent. This also fixes problems with the plugins occasionally not receiving lose focus events. see bug http://b/2033843
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-8/+6
| | | | | | | | | | | | | webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
* Merge webkit.org at R49305 : PluginView::init and destructor have been moved ↵Steve Block2009-10-201-0/+5
| | | | | | | | to common code. See http://trac.webkit.org/changeset/47966 and http://trac.webkit.org/changeset/47967 Change-Id: If5b9594b032d5a7d456fe3bb6092eafef3655c34
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-201-9/+1
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-31/+130
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Fixes a bunch of WebKit whitespace discrepancies between Android and ↵Steve Block2009-10-141-3/+3
| | | | | | | | webkit.org. Do not merge. This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org. This has already been submitted to master branch.
* Fix first set of linker errors.Ben Murdoch2009-08-171-2/+2
|
* PluginView.cpp fixAndrei Popescu2009-08-171-2/+2
|
* r47029: Merges WebCore/page, plugins and storage.Ben Murdoch2009-08-121-10/+2
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-16/+230
|
* Merge commit 'goog/master' into webkit_mergeFeng Qian2009-06-181-0/+8
|\ | | | | | | | | | | | | | | Resolved conflicts: WebCore/Android.mk WebCore/storage/LocalStorageArea.h WebCore/storage/SessionStorageArea.cpp WebCore/storage/StorageEvent.cpp
| * Adding touch events for plugins.Derek Sollenberger2009-06-181-0/+8
| |
* | Get WebKit r44544.Feng Qian2009-06-171-4/+12
|/
* Add plugin plumbing with V8 binding.Feng Qian2009-05-011-0/+29
| | | | | Hook up plugin with V8 binding. You can take the patch and play on your local machine. It is almost there, I need do more testing.
* Make WebCore built with V8.Feng Qian2009-04-241-6/+23
| | | | Picked up several new files from Chrome port.
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-5/+2
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-10/+59
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+922
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-922/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-0/+922
generated by cgit v1.1 at 2025-05-20 18:06:35 +0000