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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 if (event->type() == EventTypeNames::mouseup) | 367 if (event->type() == EventTypeNames::mouseup) |
368 mediaControls().endScrubbing(); | 368 mediaControls().endScrubbing(); |
369 | 369 |
370 MediaControlInputElement::defaultEventHandler(event); | 370 MediaControlInputElement::defaultEventHandler(event); |
371 | 371 |
372 if (event->type() == EventTypeNames::mouseover || event->type() == EventType
Names::mouseout || event->type() == EventTypeNames::mousemove) | 372 if (event->type() == EventTypeNames::mouseover || event->type() == EventType
Names::mouseout || event->type() == EventTypeNames::mousemove) |
373 return; | 373 return; |
374 | 374 |
375 double time = value().toDouble(); | 375 double time = value().toDouble(); |
376 if (event->type() == EventTypeNames::input) { | 376 if (event->type() == EventTypeNames::input) { |
| 377 // FIXME: This will need to take the timeline offset into consideration |
| 378 // once that concept is supported, see https://crbug.com/312699 |
377 if (mediaElement().controller()) | 379 if (mediaElement().controller()) |
378 mediaElement().controller()->setCurrentTime(time, IGNORE_EXCEPTION); | 380 mediaElement().controller()->setCurrentTime(time, IGNORE_EXCEPTION); |
379 else | 381 else |
380 mediaElement().setCurrentTime(time, IGNORE_EXCEPTION); | 382 mediaElement().setCurrentTime(time, IGNORE_EXCEPTION); |
381 } | 383 } |
382 | 384 |
383 RenderSlider* slider = toRenderSlider(renderer()); | 385 RenderSlider* slider = toRenderSlider(renderer()); |
384 if (slider && slider->inDragMode()) | 386 if (slider && slider->inDragMode()) |
385 mediaControls().updateCurrentTimeDisplay(); | 387 mediaControls().updateCurrentTimeDisplay(); |
386 } | 388 } |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
674 float fontSize = smallestDimension * 0.05f; | 676 float fontSize = smallestDimension * 0.05f; |
675 if (fontSize != m_fontSize) { | 677 if (fontSize != m_fontSize) { |
676 m_fontSize = fontSize; | 678 m_fontSize = fontSize; |
677 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue:
:CSS_PX); | 679 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue:
:CSS_PX); |
678 } | 680 } |
679 } | 681 } |
680 | 682 |
681 // ---------------------------- | 683 // ---------------------------- |
682 | 684 |
683 } // namespace WebCore | 685 } // namespace WebCore |
OLD | NEW |