| d29efd6d376d29ec2695f8d3bc093d683f5dd119 |
|
25-Aug-2011 |
Teng-Hui Zhu <ztenghui@google.com> |
Fix the duration value for the html5 inline video
bug:4600281
Change-Id: Ied1cd64744b59b9b272547656bc250c9eea5ed9e
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| b96809187131720dd04bfca638ae069459878157 |
|
22-Aug-2011 |
Teng-Hui Zhu <ztenghui@google.com> |
Fix the mouse handling for the video control
bug:5137664
Change-Id: I0f2b1a84beebe03d4282e728bb26ec70d05bf813
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| 0676d61efc26679f7a1ba9e9a72daf8e802d978c |
|
19-Aug-2011 |
Teng-Hui Zhu <ztenghui@google.com> |
Show/hide HTML5 video control properly according to the touch event
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
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 |
|
10-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| 0d60bcd000865d49c38ca619815d4cd7b2afc87a |
|
10-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Fix MediaControls.
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
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 |
|
02-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| 2bde8e466a4451c7319e3a072d118917957d6554 |
|
25-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| 9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 |
|
01-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Fix conflicts.
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
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| 81bc750723a18f21cd17d1b173cd2a4dda9cea6e |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| 2fc2651226baac27029e38c9d6ef883fa32084db |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb |
|
16-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|
| cad810f21b803229eb11403f9209855525a25d57 |
|
06-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
/external/webkit/Source/WebCore/html/HTMLMediaElement.cpp
|