diff options
| author | Bart Sears <bsears@google.com> | 2011-11-30 22:15:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 22:15:27 -0800 |
| commit | 41a7fe011424009cab6bf4b472d6184f82088d3d (patch) | |
| tree | ffbab1b5ece0241c559846d8068f6572629f9fb0 | |
| parent | ef549edc53ec7f2fb9435ff597ada16e2df6830a (diff) | |
| parent | 42e973186ecf6f1a040f14b7169bb99e0f100563 (diff) | |
| download | external_webkit-41a7fe011424009cab6bf4b472d6184f82088d3d.zip external_webkit-41a7fe011424009cab6bf4b472d6184f82088d3d.tar.gz external_webkit-41a7fe011424009cab6bf4b472d6184f82088d3d.tar.bz2 | |
am 42e97318: Merge "A WAR to enable the slider touch event on youtube.com" into ics-mr1
* commit '42e973186ecf6f1a040f14b7169bb99e0f100563':
A WAR to enable the slider touch event on youtube.com
| -rw-r--r-- | Source/WebCore/rendering/RenderBox.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp index 80d5699..fb1dd2c 100644 --- a/Source/WebCore/rendering/RenderBox.cpp +++ b/Source/WebCore/rendering/RenderBox.cpp @@ -1562,6 +1562,13 @@ void RenderBox::computeLogicalWidth() // https://bugs.webkit.org/show_bug.cgi?id=46418 if (hasOverrideSize() && parent()->style()->boxOrient() == HORIZONTAL && parent()->isFlexibleBox() && parent()->isFlexingChildren()) { +#if PLATFORM(ANDROID) + // Strangely, the slider is get overrided as width 0 on youtube.com + // The wrong width will cause the touch hit test for the slider failed. + // This WAR should be safe since it is only targeted to slider. + // TODO: root cause this and see if any webkit update fix this. + if (!(isSlider() && overrideSize() == 0)) +#endif setLogicalWidth(overrideSize()); return; } |