summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/html/HTMLMediaElement.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix the duration value for the html5 inline videoTeng-Hui Zhu2011-08-251-0/+5
| | | | | | bug:4600281 Change-Id: Ied1cd64744b59b9b272547656bc250c9eea5ed9e
* Fix the mouse handling for the video controlTeng-Hui Zhu2011-08-221-4/+6
| | | | | bug:5137664 Change-Id: I0f2b1a84beebe03d4282e728bb26ec70d05bf813
* Show/hide HTML5 video control properly according to the touch eventTeng-Hui Zhu2011-08-191-2/+20
| | | | | | | | | Due to the webkit merge, some code of handling touch and control is gone. Now basically add this functionality back. Refer to the original CL : c/101875 bug:5137664 Change-Id: I951c88cf8fa86061a13465f966fb291706104d8f
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-141-8/+7
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Merge WebKit at r84325: Fix MediaControls.Ben Murdoch2011-06-101-0/+5
| | | | | | | | | | | | | | Shadow DOM work needs to be applied to our local edits to make SliderThumb work with touch events. Several upstream changes are relevant... http://trac.webkit.org/changeset/83256 http://trac.webkit.org/changeset/83397 http://trac.webkit.org/changeset/83545 http://trac.webkit.org/changeset/84222 Change-Id: Ie653c87e6e1d823c50ee22c406aaa79a22bcf530
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-21/+110
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081-18/+52
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Fix conflicts.Ben Murdoch2011-06-021-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android.jscbindings.mk 79223 Conflict due to http://trac.webkit.org/changeset/79223 Android.mk Conflicts due to http://trac.webkit.org/changeset/79825 and http://trac.webkit.org/changeset/79978 Android.v8bindings.mk 80367 Conflicts due to http://trac.webkit.org/changeset/80103 and http://trac.webkit.org/changeset/80367 HTMLMediaElement.cpp Conflicts due to http://trac.webkit.org/changeset/80030 and local TOUCH_EVENTS modifications. HTMLDocumentParser.cpp Conflict due to http://trac.webkit.org/changeset/79772 and local ANDROID_INSTRUMENT modifications. CachedResourceLoader.cpp|h Conflicts due to http://trac.webkit.org/changeset/78602 and ANDROID_BLOCK_NETWORK_IMAGE. MemoryCache.h Conflicts due to http://trac.webkit.org/changeset/78848 and ANDROID_INSTRUMENT. FrameView.cpp Conflict due to http://trac.webkit.org/changeset/78928 and locally added updatePositionedObjects function. NetworkStateNotifier JobjectWrapper.cpp Git seems to have got confused with a rename here in JobjectWrapper.cpp, keep ours. Conflicts due to http://trac.webkit.org/changeset/79563 and local Android additions. PluginViewNone.cpp 79904 Conflicts due to http://trac.webkit.org/changeset/79904 and local cherry pick of http://trac.webkit.org/changeset/79988 RenderBox.cpp Conflicts due to http://trac.webkit.org/changeset/79467 and local android modifications. Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021-11/+55
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241-2/+20
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231-0/+5
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+2521
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84