Title: [119034] branches/safari-536-branch/Source/WebCore
- Revision
- 119034
- Author
- [email protected]
- Date
- 2012-05-30 20:16:42 -0700 (Wed, 30 May 2012)
Log Message
Merged r118411 -> <rdar://problem/11350416>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (119033 => 119034)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-31 03:15:06 UTC (rev 119033)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-31 03:16:42 UTC (rev 119034)
@@ -1,5 +1,24 @@
2012-05-30 Lucas Forschler <[email protected]>
+ Merge 118411
+
+ 2012-05-24 Jer Noble <[email protected]>
+
+ MediaControlTimelineElement is adjusting time 3 times per click
+ https://bugs.webkit.org/show_bug.cgi?id=58160
+
+ Reviewed by Eric Carlson.
+
+ No new tests; we intentionally throttle timeupdate events for the same
+ movie time, so there is no way to write a layout test for this case.
+
+ Only call setCurrentTime() on mousedown or mousemove events.
+
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlTimelineElement::defaultEventHandler):
+
+2012-05-30 Lucas Forschler <[email protected]>
+
Merge 118314
2012-05-23 Jer Noble <[email protected]>
Modified: branches/safari-536-branch/Source/WebCore/html/shadow/MediaControlElements.cpp (119033 => 119034)
--- branches/safari-536-branch/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-05-31 03:15:06 UTC (rev 119033)
+++ branches/safari-536-branch/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-05-31 03:16:42 UTC (rev 119034)
@@ -836,8 +836,7 @@
return;
float time = narrowPrecisionToFloat(value().toDouble());
- if (time != mediaController()->currentTime()) {
- // FIXME: This is fired 3 times on every click. We should not be doing that <http:/webkit.org/b/58160>.
+ if (event->type() == eventNames().inputEvent && time != mediaController()->currentTime()) {
ExceptionCode ec;
mediaController()->setCurrentTime(time, ec);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
