summaryrefslogtreecommitdiffstats
path: root/WebCore/plugins/PluginView.h
Commit message (Collapse)AuthorAgeFilesLines
* Add initial support for OpenGL plugins.Derek Sollenberger2010-12-201-0/+2
| | | | | bug: 2907737 Change-Id: I6f4f21146c834554db5ecb67fed8994f1cdc2cfe
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-4/+25
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-2/+2
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-0/+3
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r66079 : Fix conflictsSteve Block2010-09-021-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | - WebCore/dom/Document.cpp Conflict due to Android guards around m_axObjectCache See http://trac.webkit.org/changeset/65787 - WebCore/dom/Document.h Conflict due to Android guards around m_axObjectCache whitespace diff See http://trac.webkit.org/changeset/65787 and http://trac.webkit.org/changeset/66037 - WebCore/html/HTMLDocumentParser.cpp Conflict due to ANDROID_INSTRUMENT See http://trac.webkit.org/changeset/65692 - WebCore/platform/image-decoders/ImageDecoder.cpp Conflict due to Android not implementing ImageDecoder::create() See http://trac.webkit.org/changeset/66039 - WebCore/plugins/PluginView.h Conflict due to PLUGIN_SCHEDULE_TIMER See http://trac.webkit.org/changeset/65697 Change-Id: I5dc94bad471ea566dbabf965425938b732735d02
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-4/+26
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-0/+10
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r60074: Fix conflictsSteve Block2010-05-271-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+5
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-1/+0
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Update Android to reflect upstreaming of PluginView JSC guards in WebKit ↵Steve Block2010-05-201-3/+3
| | | | | | | | change 59826 See http://trac.webkit.org/changeset/59826 Change-Id: Ia1e16f7fa71fe8b5740610e3caa4bfbf05391a0f
* 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-7/+8
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-2/+13
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-6/+7
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* In Android, as we always remap the plugin from pageGrace Kloba2010-03-261-0/+3
| | | | | | | | | space to view space, we do want to update when the rect in the page space changed. This should fix the bug where the plugin is inside a fixed position. So even its page coordinate changed when scrolling, its window coordinate didn't change. We missed the update. Fix http://b/issue?id=2542934
* Merge webkit.org at r54731 : Fix remaining merge conflictsSteve Block2010-02-161-5/+1
| | | | | | | | | | | | - AutoFillPopupMenuClient.h - Take theirs, git got confused - PluginView.h - Conflict due to new OS macro - Gradient.cpp - Conflict due to new argument due to setPlatformGradientSpaceTransform - Android.derived.v8bindings.mk - Keep ours - DragImage.h - Take both - V8DocumentCustom.cpp - Take theirs - XCode project - Take both to keep Android-addition of GeolocationPositionCache Change-Id: I3f294a71af93fb4e02b57e0169bd25143132df15
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-2/+12
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Use common version of PluginView::parentFrameSteve Block2010-02-151-1/+0
| | | | | | This was added in http://trac.webkit.org/changeset/42748 Change-Id: Ifcb9308d817203b6e23945ceedd83b9f9eb2e80f
* Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROIDSteve Block2010-02-041-13/+5
| | | | | | See http://trac.webkit.org/changeset/52791 Change-Id: I0e1a6ae16f93cdbb12ae5770607a220079451cb8
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-8/+20
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Changing plugin setwindow() to use page coordinateGrace Kloba2010-01-201-1/+1
| | | | | | | | | | | | | | 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.
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-8/+0
| | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-7/+24
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-10/+5
| | | | | | | 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-4/+21
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* changing how plugins gain/lose focus.Derek Sollenberger2009-10-271-0/+1
| | | | | | | | | | 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
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-4/+22
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Fixes a bunch of WebKit whitespace discrepancies between Android and ↵Steve Block2009-10-141-1/+1
| | | | | | | | 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.
* r47029: Merges WebCore/page, plugins and storage.Ben Murdoch2009-08-121-3/+0
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-3/+19
|
* Merge commit 'goog/master' into webkit_mergeFeng Qian2009-06-181-0/+9
|\ | | | | | | | | | | | | | | 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/+9
| |
* | Get WebKit r44544.Feng Qian2009-06-171-5/+12
|/
* Add plugin plumbing with V8 binding.Feng Qian2009-05-011-0/+4
| | | | | 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-0/+4
| | | | Picked up several new files from Chrome port.
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-9/+3
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-9/+36
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+320
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-320/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-42/+132
|
* Initial ContributionThe Android Open Source Project2008-10-211-3/+16
|
* external/webkit r30707Upstream1970-01-121-0/+217
generated by cgit v1.1 at 2024-08-08 02:45:05 +0000