OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 Google Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
370 | 370 |
371 if (!inDocument() || !document().isActive()) | 371 if (!inDocument() || !document().isActive()) |
372 return; | 372 return; |
373 | 373 |
374 if (event->type() == EventTypeNames::mousedown) | 374 if (event->type() == EventTypeNames::mousedown) |
375 mediaControls().beginScrubbing(); | 375 mediaControls().beginScrubbing(); |
376 | 376 |
377 if (event->type() == EventTypeNames::mouseup) | 377 if (event->type() == EventTypeNames::mouseup) |
378 mediaControls().endScrubbing(); | 378 mediaControls().endScrubbing(); |
379 | 379 |
380 if (event->type() == EventTypeNames::touchmove) | |
381 mediaControls().timelineKnobDragged(); | |
philipj_slow
2015/02/16 10:45:18
Isn't this fixing an unrelated problem, perhaps th
Tima Vaisburd
2015/02/16 20:32:11
I might also say "related, but different problem".
philipj_slow
2015/02/17 02:37:24
My change was just cleanup, https://codereview.chr
| |
382 | |
380 MediaControlInputElement::defaultEventHandler(event); | 383 MediaControlInputElement::defaultEventHandler(event); |
381 | 384 |
382 if (event->type() == EventTypeNames::mouseover || event->type() == EventType Names::mouseout || event->type() == EventTypeNames::mousemove) | 385 if (event->type() == EventTypeNames::mouseover || event->type() == EventType Names::mouseout || event->type() == EventTypeNames::mousemove) |
383 return; | 386 return; |
384 | 387 |
385 double time = value().toDouble(); | 388 double time = value().toDouble(); |
386 if (event->type() == EventTypeNames::input) { | 389 if (event->type() == EventTypeNames::input) { |
387 // FIXME: This will need to take the timeline offset into consideration | 390 // FIXME: This will need to take the timeline offset into consideration |
388 // once that concept is supported, see https://crbug.com/312699 | 391 // once that concept is supported, see https://crbug.com/312699 |
389 if (mediaElement().controller()) { | 392 if (mediaElement().controller()) { |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
709 float fontSize = smallestDimension * 0.05f; | 712 float fontSize = smallestDimension * 0.05f; |
710 if (fontSize != m_fontSize) { | 713 if (fontSize != m_fontSize) { |
711 m_fontSize = fontSize; | 714 m_fontSize = fontSize; |
712 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX); | 715 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX); |
713 } | 716 } |
714 } | 717 } |
715 | 718 |
716 // ---------------------------- | 719 // ---------------------------- |
717 | 720 |
718 } // namespace blink | 721 } // namespace blink |
OLD | NEW |